196 |
|
for (n = npsamps; n-- > 0; ) { |
197 |
|
fo_getvec(vout, j+(n+frandom())/npsamps, abp); |
198 |
|
fi_getvec(vin, i+urand(n), abp); |
199 |
< |
ec = SDevalBSDF(&sdv, vout, vin, &bsd); |
199 |
> |
ec = SDevalBSDF(&sdv, vin, vout, &bsd); |
200 |
|
if (ec != SDEnone) |
201 |
|
goto err; |
202 |
|
sum += sdv.cieY; |
245 |
|
for (n = npsamps; n-- > 0; ) { |
246 |
|
bo_getvec(vout, j+(n+frandom())/npsamps, abp); |
247 |
|
bi_getvec(vin, i+urand(n), abp); |
248 |
< |
ec = SDevalBSDF(&sdv, vout, vin, &bsd); |
248 |
> |
ec = SDevalBSDF(&sdv, vin, vout, &bsd); |
249 |
|
if (ec != SDEnone) |
250 |
|
goto err; |
251 |
|
sum += sdv.cieY; |
277 |
|
} |
278 |
|
} |
279 |
|
/* front transmission */ |
280 |
< |
if (bsd.tf != NULL || bsd.tLamb.cieY > .002) { |
280 |
> |
if (bsd.tf != NULL || bsd.tLambFront.cieY > .002) { |
281 |
|
input_orient = 1; output_orient = -1; |
282 |
|
cfp[CIE_Y] = open_component_file(CIE_Y); |
283 |
|
if (bsd.tf != NULL && bsd.tf->comp[0].cspec[2].flags) { |
293 |
|
for (n = npsamps; n-- > 0; ) { |
294 |
|
bo_getvec(vout, j+(n+frandom())/npsamps, abp); |
295 |
|
fi_getvec(vin, i+urand(n), abp); |
296 |
< |
ec = SDevalBSDF(&sdv, vout, vin, &bsd); |
296 |
> |
ec = SDevalBSDF(&sdv, vin, vout, &bsd); |
297 |
|
if (ec != SDEnone) |
298 |
|
goto err; |
299 |
|
sum += sdv.cieY; |
342 |
|
for (n = npsamps; n-- > 0; ) { |
343 |
|
fo_getvec(vout, j+(n+frandom())/npsamps, abp); |
344 |
|
bi_getvec(vin, i+urand(n), abp); |
345 |
< |
ec = SDevalBSDF(&sdv, vout, vin, &bsd); |
345 |
> |
ec = SDevalBSDF(&sdv, vin, vout, &bsd); |
346 |
|
if (ec != SDEnone) |
347 |
|
goto err; |
348 |
|
sum += sdv.cieY; |
639 |
|
single_plane_incident = 0; |
640 |
|
break; |
641 |
|
case 'f': |
642 |
< |
if (!argv[i][2]) { |
642 |
> |
if ((argv[i][0] == '-') & !argv[i][2]) { |
643 |
|
if (strchr(argv[++i], '=') != NULL) { |
644 |
|
add_wbsdf("-f", 1); |
645 |
|
add_wbsdf(argv[i], 1); |
700 |
|
fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n"); |
701 |
|
goto userr; |
702 |
|
} |
703 |
+ |
doptimize(1); /* optimize definitions */ |
704 |
|
++eclock; |
705 |
|
if (dofwd) { |
706 |
|
input_orient = -1; |