346 |
|
} |
347 |
|
free(ohma); |
348 |
|
/* need incoming solid angles, too? */ |
349 |
< |
if (dp->ninc < dp->nout || dp->ib_ohm != dp->ob_ohm || |
350 |
< |
dp->ib_priv != dp->ob_priv) { |
349 |
> |
if ((dp->ib_ohm != dp->ob_ohm) | (dp->ib_priv != dp->ob_priv)) { |
350 |
|
double ohm; |
351 |
|
for (i = dp->ninc; i--; ) |
352 |
|
if ((ohm = mBSDF_incohm(dp,i)) < df->minProjSA) |
418 |
|
dp = SDnewMatrix(abase_list[inbi].nangles, abase_list[outbi].nangles); |
419 |
|
if (dp == NULL) |
420 |
|
return RC_MEMERR; |
421 |
< |
dp->ib_priv = (void *)&abase_list[inbi]; |
422 |
< |
dp->ob_priv = (void *)&abase_list[outbi]; |
421 |
> |
dp->ib_priv = &abase_list[inbi]; |
422 |
> |
dp->ob_priv = &abase_list[outbi]; |
423 |
|
if (df == sd->tf) { |
424 |
< |
dp->ib_vec = ab_getvecR; |
425 |
< |
dp->ib_ndx = ab_getndxR; |
426 |
< |
dp->ob_vec = ab_getvec; |
427 |
< |
dp->ob_ndx = ab_getndx; |
424 |
> |
dp->ib_vec = &ab_getvecR; |
425 |
> |
dp->ib_ndx = &ab_getndxR; |
426 |
> |
dp->ob_vec = &ab_getvec; |
427 |
> |
dp->ob_ndx = &ab_getndx; |
428 |
|
} else if (df == sd->rf) { |
429 |
< |
dp->ib_vec = ab_getvec; |
430 |
< |
dp->ib_ndx = ab_getndx; |
431 |
< |
dp->ob_vec = ab_getvec; |
432 |
< |
dp->ob_ndx = ab_getndx; |
429 |
> |
dp->ib_vec = &ab_getvec; |
430 |
> |
dp->ib_ndx = &ab_getndx; |
431 |
> |
dp->ob_vec = &ab_getvec; |
432 |
> |
dp->ob_ndx = &ab_getndx; |
433 |
|
} else /* df == sd->rb */ { |
434 |
< |
dp->ib_vec = ab_getvecR; |
435 |
< |
dp->ib_ndx = ab_getndxR; |
436 |
< |
dp->ob_vec = ab_getvecR; |
437 |
< |
dp->ob_ndx = ab_getndxR; |
434 |
> |
dp->ib_vec = &ab_getvecR; |
435 |
> |
dp->ib_ndx = &ab_getndxR; |
436 |
> |
dp->ob_vec = &ab_getvecR; |
437 |
> |
dp->ob_ndx = &ab_getndxR; |
438 |
|
} |
439 |
< |
dp->ib_ohm = ab_getohm; |
440 |
< |
dp->ob_ohm = ab_getohm; |
439 |
> |
dp->ib_ohm = &ab_getohm; |
440 |
> |
dp->ob_ohm = &ab_getohm; |
441 |
|
df->comp[0].cspec[0] = c_dfcolor; /* XXX monochrome for now */ |
442 |
|
df->comp[0].dist = dp; |
443 |
|
df->comp[0].func = &SDhandleMtx; |
589 |
|
SDqueryMtxProjSA(double *psa, const FVECT vec, int qflags, const void *dist) |
590 |
|
{ |
591 |
|
const SDMat *dp = (const SDMat *)dist; |
592 |
< |
|
593 |
< |
if (!(qflags & SDqueryInc+SDqueryOut)) |
592 |
> |
double inc_psa, out_psa; |
593 |
> |
/* check arguments */ |
594 |
> |
if ((psa == NULL) | (vec == NULL) | (dp == NULL)) |
595 |
|
return SDEargument; |
596 |
< |
if (qflags & SDqueryInc) { |
597 |
< |
double inc_psa = mBSDF_incohm(dp, mBSDF_incndx(dp, vec)); |
598 |
< |
if (inc_psa < .0) |
599 |
< |
return SDEinternal; |
600 |
< |
switch (qflags & SDqueryMin+SDqueryMax) { |
601 |
< |
case SDqueryMax: |
602 |
< |
if (inc_psa > psa[0]) |
603 |
< |
psa[0] = inc_psa; |
604 |
< |
break; |
605 |
< |
case SDqueryMin+SDqueryMax: |
606 |
< |
if (inc_psa > psa[1]) |
607 |
< |
psa[1] = inc_psa; |
608 |
< |
/* fall through */ |
609 |
< |
case SDqueryMin: |
610 |
< |
if (inc_psa < psa[0]) |
611 |
< |
psa[0] = inc_psa; |
612 |
< |
break; |
613 |
< |
case 0: |
596 |
> |
/* get projected solid angles */ |
597 |
> |
inc_psa = mBSDF_incohm(dp, mBSDF_incndx(dp, vec)); |
598 |
> |
out_psa = mBSDF_outohm(dp, mBSDF_outndx(dp, vec)); |
599 |
> |
|
600 |
> |
switch (qflags) { /* record based on flag settings */ |
601 |
> |
case SDqueryVal: |
602 |
> |
psa[0] = .0; |
603 |
> |
/* fall through */ |
604 |
> |
case SDqueryMax: |
605 |
> |
if (inc_psa > psa[0]) |
606 |
|
psa[0] = inc_psa; |
607 |
< |
break; |
608 |
< |
} |
607 |
> |
if (out_psa > psa[0]) |
608 |
> |
psa[0] = out_psa; |
609 |
> |
break; |
610 |
> |
case SDqueryMin+SDqueryMax: |
611 |
> |
if (inc_psa > psa[0]) |
612 |
> |
psa[1] = inc_psa; |
613 |
> |
if (out_psa > psa[0]) |
614 |
> |
psa[1] = out_psa; |
615 |
> |
/* fall through */ |
616 |
> |
case SDqueryMin: |
617 |
> |
if ((inc_psa > .0) & (inc_psa < psa[0])) |
618 |
> |
psa[0] = inc_psa; |
619 |
> |
if ((out_psa > .0) & (out_psa < psa[0])) |
620 |
> |
psa[0] = out_psa; |
621 |
> |
break; |
622 |
|
} |
623 |
< |
if (qflags & SDqueryOut) { |
624 |
< |
double out_psa = mBSDF_outohm(dp, mBSDF_outndx(dp, vec)); |
620 |
< |
if (out_psa < .0) |
621 |
< |
return SDEinternal; |
622 |
< |
switch (qflags & SDqueryMin+SDqueryMax) { |
623 |
< |
case SDqueryMax: |
624 |
< |
if (out_psa > psa[0]) |
625 |
< |
psa[0] = out_psa; |
626 |
< |
break; |
627 |
< |
case SDqueryMin+SDqueryMax: |
628 |
< |
if (out_psa > psa[1]) |
629 |
< |
psa[1] = out_psa; |
630 |
< |
/* fall through */ |
631 |
< |
case SDqueryMin: |
632 |
< |
if (out_psa < psa[0]) |
633 |
< |
psa[0] = out_psa; |
634 |
< |
break; |
635 |
< |
case 0: |
636 |
< |
psa[(qflags&SDqueryInc)!=0] = out_psa; |
637 |
< |
break; |
638 |
< |
} |
639 |
< |
} |
640 |
< |
return SDEnone; |
623 |
> |
/* make sure it's legal */ |
624 |
> |
return (psa[0] <= .0) ? SDEinternal : SDEnone; |
625 |
|
} |
626 |
|
|
627 |
|
/* Compute new cumulative distribution from BSDF */ |
663 |
|
int reverse; |
664 |
|
SDMatCDst myCD; |
665 |
|
SDMatCDst *cd, *cdlast; |
666 |
< |
|
667 |
< |
if (dp == NULL) |
666 |
> |
/* check arguments */ |
667 |
> |
if ((inVec == NULL) | (dp == NULL)) |
668 |
|
return NULL; |
669 |
|
memset(&myCD, 0, sizeof(myCD)); |
670 |
|
myCD.indx = mBSDF_incndx(dp, inVec); |
719 |
|
const SDMatCDst *mcd = (const SDMatCDst *)cdp; |
720 |
|
const unsigned target = randX*maxval; |
721 |
|
int i, iupper, ilower; |
722 |
+ |
/* check arguments */ |
723 |
+ |
if ((outVec == NULL) | (mcd == NULL)) |
724 |
+ |
return SDEargument; |
725 |
|
/* binary search to find index */ |
726 |
|
ilower = 0; iupper = mcd->calen; |
727 |
|
while ((i = (iupper + ilower) >> 1) != ilower) |