433 |
|
if (ec) |
434 |
|
return ec; |
435 |
|
/* get BSDF color */ |
436 |
< |
n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist); |
436 |
> |
n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc); |
437 |
|
if (n <= 0) { |
438 |
|
strcpy(SDerrorDetail, "BSDF sample value error"); |
439 |
|
return SDEinternal; |
496 |
|
SDError ec; |
497 |
|
int i; |
498 |
|
/* check arguments */ |
499 |
< |
if ((projSA == NULL) | (v1 == NULL)) |
499 |
> |
if ((projSA == NULL) | (v1 == NULL) | (sd == NULL)) |
500 |
|
return SDEargument; |
501 |
|
/* initialize extrema */ |
502 |
|
switch (qflags) { |
516 |
|
rdf = sd->rf; |
517 |
|
else |
518 |
|
rdf = sd->rb; |
519 |
< |
tdf = NULL; /* transmitted component? */ |
520 |
< |
if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) { |
521 |
< |
rdf = NULL; |
522 |
< |
tdf = sd->tf; |
523 |
< |
} |
519 |
> |
tdf = sd->tf; |
520 |
> |
if (v2 != NULL) /* bidirectional? */ |
521 |
> |
if (v1[2] > 0 ^ v2[2] > 0) |
522 |
> |
rdf = NULL; |
523 |
> |
else |
524 |
> |
tdf = NULL; |
525 |
|
ec = SDEdata; /* run through components */ |
526 |
|
for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) { |
527 |
|
ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2, |
528 |
< |
qflags, rdf->comp[i].dist); |
528 |
> |
qflags, &rdf->comp[i]); |
529 |
|
if (ec) |
530 |
|
return ec; |
531 |
|
} |
532 |
|
for (i = (tdf==NULL) ? 0 : tdf->ncomp; i--; ) { |
533 |
|
ec = (*tdf->comp[i].func->queryProjSA)(projSA, v1, v2, |
534 |
< |
qflags, tdf->comp[i].dist); |
534 |
> |
qflags, &tdf->comp[i]); |
535 |
|
if (ec) |
536 |
|
return ec; |
537 |
|
} |
573 |
|
i = (sdf != NULL) ? sdf->ncomp : 0; |
574 |
|
while (i-- > 0) { |
575 |
|
nch = (*sdf->comp[i].func->getBSDFs)(coef, outVec, inVec, |
576 |
< |
sdf->comp[i].dist); |
576 |
> |
&sdf->comp[i]); |
577 |
|
while (nch-- > 0) { |
578 |
|
c_cmix(&sv->spec, sv->cieY, &sv->spec, |
579 |
|
coef[nch], &sdf->comp[i].cspec[nch]); |
716 |
|
if (ec) |
717 |
|
return ec; |
718 |
|
/* compute color */ |
719 |
< |
j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist); |
719 |
> |
j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc); |
720 |
|
if (j <= 0) { |
721 |
|
sprintf(SDerrorDetail, "BSDF \"%s\" sampling value error", |
722 |
|
sd->name); |