168 |
|
return lastErr; |
169 |
|
/* try loading variable resolution data */ |
170 |
|
lastErr = SDloadTre(sd, wtl); |
171 |
+ |
#if 0 |
172 |
|
/* check our result */ |
173 |
|
switch (lastErr) { |
174 |
|
case SDEformat: |
179 |
|
default: /* variable res. OK else serious error */ |
180 |
|
break; |
181 |
|
} |
182 |
+ |
#endif |
183 |
|
/* done with XML file */ |
184 |
|
ezxml_free(fl); |
185 |
|
|
435 |
|
if (ec) |
436 |
|
return ec; |
437 |
|
/* get BSDF color */ |
438 |
< |
n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist); |
438 |
> |
n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc); |
439 |
|
if (n <= 0) { |
440 |
|
strcpy(SDerrorDetail, "BSDF sample value error"); |
441 |
|
return SDEinternal; |
498 |
|
SDError ec; |
499 |
|
int i; |
500 |
|
/* check arguments */ |
501 |
< |
if ((projSA == NULL) | (v1 == NULL)) |
501 |
> |
if ((projSA == NULL) | (v1 == NULL) | (sd == NULL)) |
502 |
|
return SDEargument; |
503 |
|
/* initialize extrema */ |
504 |
|
switch (qflags) { |
518 |
|
rdf = sd->rf; |
519 |
|
else |
520 |
|
rdf = sd->rb; |
521 |
< |
tdf = NULL; /* transmitted component? */ |
522 |
< |
if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) { |
523 |
< |
rdf = NULL; |
524 |
< |
tdf = sd->tf; |
525 |
< |
} |
521 |
> |
tdf = sd->tf; |
522 |
> |
if (v2 != NULL) /* bidirectional? */ |
523 |
> |
if (v1[2] > 0 ^ v2[2] > 0) |
524 |
> |
rdf = NULL; |
525 |
> |
else |
526 |
> |
tdf = NULL; |
527 |
|
ec = SDEdata; /* run through components */ |
528 |
|
for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) { |
529 |
|
ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2, |
530 |
< |
qflags, rdf->comp[i].dist); |
530 |
> |
qflags, &rdf->comp[i]); |
531 |
|
if (ec) |
532 |
|
return ec; |
533 |
|
} |
534 |
|
for (i = (tdf==NULL) ? 0 : tdf->ncomp; i--; ) { |
535 |
|
ec = (*tdf->comp[i].func->queryProjSA)(projSA, v1, v2, |
536 |
< |
qflags, tdf->comp[i].dist); |
536 |
> |
qflags, &tdf->comp[i]); |
537 |
|
if (ec) |
538 |
|
return ec; |
539 |
|
} |
575 |
|
i = (sdf != NULL) ? sdf->ncomp : 0; |
576 |
|
while (i-- > 0) { |
577 |
|
nch = (*sdf->comp[i].func->getBSDFs)(coef, outVec, inVec, |
578 |
< |
sdf->comp[i].dist); |
578 |
> |
&sdf->comp[i]); |
579 |
|
while (nch-- > 0) { |
580 |
|
c_cmix(&sv->spec, sv->cieY, &sv->spec, |
581 |
|
coef[nch], &sdf->comp[i].cspec[nch]); |
718 |
|
if (ec) |
719 |
|
return ec; |
720 |
|
/* compute color */ |
721 |
< |
j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist); |
721 |
> |
j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc); |
722 |
|
if (j <= 0) { |
723 |
|
sprintf(SDerrorDetail, "BSDF \"%s\" sampling value error", |
724 |
|
sd->name); |