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) |
366 |
|
int i; |
367 |
|
/* allocate BSDF component */ |
368 |
|
sdata = ezxml_txt(ezxml_child(wdb, "WavelengthDataDirection")); |
369 |
< |
if (!strcasecmp(sdata, "Transmission Front")) { |
369 |
> |
if (!strcasecmp(sdata, "Transmission Back") || (sd->tf == NULL && |
370 |
> |
!strcasecmp(sdata, "Transmission Front"))) { |
371 |
|
if (sd->tf != NULL) |
372 |
|
SDfreeSpectralDF(sd->tf); |
373 |
|
if ((sd->tf = SDnewSpectralDF(1)) == NULL) |
374 |
|
return RC_MEMERR; |
375 |
|
df = sd->tf; |
376 |
|
} else if (!strcasecmp(sdata, "Reflection Front")) { |
377 |
< |
if (sd->rf != NULL) |
378 |
< |
SDfreeSpectralDF(sd->rf); |
379 |
< |
if ((sd->rf = SDnewSpectralDF(1)) == NULL) |
380 |
< |
return RC_MEMERR; |
381 |
< |
df = sd->rf; |
382 |
< |
} else if (!strcasecmp(sdata, "Reflection Back")) { |
383 |
< |
if (sd->rb != NULL) |
377 |
> |
if (sd->rb != NULL) /* note back-front reversal */ |
378 |
|
SDfreeSpectralDF(sd->rb); |
379 |
|
if ((sd->rb = SDnewSpectralDF(1)) == NULL) |
380 |
|
return RC_MEMERR; |
381 |
|
df = sd->rb; |
382 |
+ |
} else if (!strcasecmp(sdata, "Reflection Back")) { |
383 |
+ |
if (sd->rf != NULL) /* note front-back reversal */ |
384 |
+ |
SDfreeSpectralDF(sd->rf); |
385 |
+ |
if ((sd->rf = SDnewSpectralDF(1)) == NULL) |
386 |
+ |
return RC_MEMERR; |
387 |
+ |
df = sd->rf; |
388 |
|
} else |
389 |
|
return RC_FAIL; |
390 |
|
/* XXX should also check "ScatteringDataType" for consistency? */ |
419 |
|
dp = SDnewMatrix(abase_list[inbi].nangles, abase_list[outbi].nangles); |
420 |
|
if (dp == NULL) |
421 |
|
return RC_MEMERR; |
422 |
< |
dp->ib_priv = (void *)&abase_list[inbi]; |
423 |
< |
dp->ob_priv = (void *)&abase_list[outbi]; |
422 |
> |
dp->ib_priv = &abase_list[inbi]; |
423 |
> |
dp->ob_priv = &abase_list[outbi]; |
424 |
|
if (df == sd->tf) { |
425 |
< |
dp->ib_vec = ab_getvecR; |
426 |
< |
dp->ib_ndx = ab_getndxR; |
427 |
< |
dp->ob_vec = ab_getvec; |
428 |
< |
dp->ob_ndx = ab_getndx; |
425 |
> |
dp->ib_vec = &ab_getvecR; |
426 |
> |
dp->ib_ndx = &ab_getndxR; |
427 |
> |
dp->ob_vec = &ab_getvec; |
428 |
> |
dp->ob_ndx = &ab_getndx; |
429 |
|
} else if (df == sd->rf) { |
430 |
< |
dp->ib_vec = ab_getvec; |
431 |
< |
dp->ib_ndx = ab_getndx; |
432 |
< |
dp->ob_vec = ab_getvec; |
433 |
< |
dp->ob_ndx = ab_getndx; |
430 |
> |
dp->ib_vec = &ab_getvec; |
431 |
> |
dp->ib_ndx = &ab_getndx; |
432 |
> |
dp->ob_vec = &ab_getvec; |
433 |
> |
dp->ob_ndx = &ab_getndx; |
434 |
|
} else /* df == sd->rb */ { |
435 |
< |
dp->ib_vec = ab_getvecR; |
436 |
< |
dp->ib_ndx = ab_getndxR; |
437 |
< |
dp->ob_vec = ab_getvecR; |
438 |
< |
dp->ob_ndx = ab_getndxR; |
435 |
> |
dp->ib_vec = &ab_getvecR; |
436 |
> |
dp->ib_ndx = &ab_getndxR; |
437 |
> |
dp->ob_vec = &ab_getvecR; |
438 |
> |
dp->ob_ndx = &ab_getndxR; |
439 |
|
} |
440 |
< |
dp->ib_ohm = ab_getohm; |
441 |
< |
dp->ob_ohm = ab_getohm; |
440 |
> |
dp->ib_ohm = &ab_getohm; |
441 |
> |
dp->ob_ohm = &ab_getohm; |
442 |
|
df->comp[0].cspec[0] = c_dfcolor; /* XXX monochrome for now */ |
443 |
|
df->comp[0].dist = dp; |
444 |
|
df->comp[0].func = &SDhandleMtx; |
590 |
|
SDqueryMtxProjSA(double *psa, const FVECT vec, int qflags, const void *dist) |
591 |
|
{ |
592 |
|
const SDMat *dp = (const SDMat *)dist; |
593 |
< |
|
594 |
< |
if (!(qflags & SDqueryInc+SDqueryOut)) |
593 |
> |
double inc_psa, out_psa; |
594 |
> |
/* check arguments */ |
595 |
> |
if ((psa == NULL) | (vec == NULL) | (dp == NULL)) |
596 |
|
return SDEargument; |
597 |
< |
if (qflags & SDqueryInc) { |
598 |
< |
double inc_psa = mBSDF_incohm(dp, mBSDF_incndx(dp, vec)); |
599 |
< |
if (inc_psa < .0) |
600 |
< |
return SDEinternal; |
601 |
< |
switch (qflags & SDqueryMin+SDqueryMax) { |
602 |
< |
case SDqueryMax: |
603 |
< |
if (inc_psa > psa[0]) |
604 |
< |
psa[0] = inc_psa; |
605 |
< |
break; |
606 |
< |
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: |
597 |
> |
/* get projected solid angles */ |
598 |
> |
inc_psa = mBSDF_incohm(dp, mBSDF_incndx(dp, vec)); |
599 |
> |
out_psa = mBSDF_outohm(dp, mBSDF_outndx(dp, vec)); |
600 |
> |
|
601 |
> |
switch (qflags) { /* record based on flag settings */ |
602 |
> |
case SDqueryVal: |
603 |
> |
psa[0] = .0; |
604 |
> |
/* fall through */ |
605 |
> |
case SDqueryMax: |
606 |
> |
if (inc_psa > psa[0]) |
607 |
|
psa[0] = inc_psa; |
608 |
< |
break; |
609 |
< |
} |
608 |
> |
if (out_psa > psa[0]) |
609 |
> |
psa[0] = out_psa; |
610 |
> |
break; |
611 |
> |
case SDqueryMin+SDqueryMax: |
612 |
> |
if (inc_psa > psa[0]) |
613 |
> |
psa[1] = inc_psa; |
614 |
> |
if (out_psa > psa[0]) |
615 |
> |
psa[1] = out_psa; |
616 |
> |
/* fall through */ |
617 |
> |
case SDqueryMin: |
618 |
> |
if ((inc_psa > .0) & (inc_psa < psa[0])) |
619 |
> |
psa[0] = inc_psa; |
620 |
> |
if ((out_psa > .0) & (out_psa < psa[0])) |
621 |
> |
psa[0] = out_psa; |
622 |
> |
break; |
623 |
|
} |
624 |
< |
if (qflags & SDqueryOut) { |
625 |
< |
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; |
624 |
> |
/* make sure it's legal */ |
625 |
> |
return (psa[0] <= .0) ? SDEinternal : SDEnone; |
626 |
|
} |
627 |
|
|
628 |
|
/* Compute new cumulative distribution from BSDF */ |
664 |
|
int reverse; |
665 |
|
SDMatCDst myCD; |
666 |
|
SDMatCDst *cd, *cdlast; |
667 |
< |
|
668 |
< |
if (dp == NULL) |
667 |
> |
/* check arguments */ |
668 |
> |
if ((inVec == NULL) | (dp == NULL)) |
669 |
|
return NULL; |
670 |
|
memset(&myCD, 0, sizeof(myCD)); |
671 |
|
myCD.indx = mBSDF_incndx(dp, inVec); |
720 |
|
const SDMatCDst *mcd = (const SDMatCDst *)cdp; |
721 |
|
const unsigned target = randX*maxval; |
722 |
|
int i, iupper, ilower; |
723 |
+ |
/* check arguments */ |
724 |
+ |
if ((outVec == NULL) | (mcd == NULL)) |
725 |
+ |
return SDEargument; |
726 |
|
/* binary search to find index */ |
727 |
|
ilower = 0; iupper = mcd->calen; |
728 |
|
while ((i = (iupper + ilower) >> 1) != ilower) |