154 |
|
eval_bsdf(const char *fname) |
155 |
|
{ |
156 |
|
ANGLE_BASIS *abp = get_basis(kbasis); |
157 |
+ |
float *trans_mtx = NULL; |
158 |
|
SDData bsd; |
159 |
|
SDError ec; |
160 |
|
FVECT vin, vout; |
210 |
|
} |
211 |
|
/* front transmission */ |
212 |
|
if (bsd.tf != NULL || bsd.tLamb.cieY > .002) { |
213 |
+ |
if (bsd.tb == NULL) |
214 |
+ |
trans_mtx = (float *)malloc(sizeof(float) * |
215 |
+ |
abp->nangles*abp->nangles); |
216 |
|
input_orient = 1; output_orient = -1; |
217 |
|
data_prologue(); |
218 |
|
for (j = 0; j < abp->nangles; j++) { |
227 |
|
sum += sv.cieY; |
228 |
|
} |
229 |
|
printf("\t%.3e\n", sum/npsamps); |
230 |
+ |
if (trans_mtx != NULL) |
231 |
+ |
trans_mtx[j*abp->nangles + i] = sum/npsamps; |
232 |
|
} |
233 |
|
putchar('\n'); /* extra space between rows */ |
234 |
|
} |
235 |
|
data_epilogue(); |
236 |
|
} |
237 |
|
/* back transmission */ |
238 |
< |
if (bsd.tb != NULL) { |
238 |
> |
if (bsd.tb != NULL || trans_mtx != NULL) { |
239 |
> |
if (bsd.tf == NULL) |
240 |
> |
trans_mtx = (float *)malloc(sizeof(float) * |
241 |
> |
abp->nangles*abp->nangles); |
242 |
|
input_orient = -1; output_orient = 1; |
243 |
|
data_prologue(); |
244 |
|
for (j = 0; j < abp->nangles; j++) { |
245 |
< |
for (i = 0; i < abp->nangles; i++) { |
246 |
< |
sum = 0; /* average over patches */ |
247 |
< |
for (n = npsamps; n-- > 0; ) { |
248 |
< |
fo_getvec(vout, j+(n+frandom())/npsamps, abp); |
249 |
< |
bi_getvec(vin, i+urand(n), abp); |
250 |
< |
ec = SDevalBSDF(&sv, vout, vin, &bsd); |
251 |
< |
if (ec != SDEnone) |
245 |
> |
for (i = 0; i < abp->nangles; i++) |
246 |
> |
if (bsd.tb != NULL) { /* use tb if we have it */ |
247 |
> |
sum = 0; /* average over patches */ |
248 |
> |
for (n = npsamps; n-- > 0; ) { |
249 |
> |
fo_getvec(vout, j+(n+frandom())/npsamps, abp); |
250 |
> |
bi_getvec(vin, i+urand(n), abp); |
251 |
> |
ec = SDevalBSDF(&sv, vout, vin, &bsd); |
252 |
> |
if (ec != SDEnone) |
253 |
|
goto err; |
254 |
< |
sum += sv.cieY; |
254 |
> |
sum += sv.cieY; |
255 |
> |
} |
256 |
> |
printf("\t%.3e\n", sum/npsamps); |
257 |
> |
if (trans_mtx != NULL) |
258 |
> |
trans_mtx[i*abp->nangles + j] = sum/npsamps; |
259 |
> |
} else { /* else transpose tf */ |
260 |
> |
printf("\t%.3e\n", trans_mtx[i*abp->nangles + j]); |
261 |
|
} |
246 |
– |
printf("\t%.3e\n", sum/npsamps); |
247 |
– |
} |
262 |
|
putchar('\n'); /* extra space between rows */ |
263 |
|
} |
264 |
|
data_epilogue(); |
265 |
|
} |
266 |
+ |
/* derived front transmission */ |
267 |
+ |
if (bsd.tf == NULL && trans_mtx != NULL) { |
268 |
+ |
input_orient = 1; output_orient = -1; |
269 |
+ |
data_prologue(); |
270 |
+ |
for (j = 0; j < abp->nangles; j++) { |
271 |
+ |
for (i = 0; i < abp->nangles; i++) |
272 |
+ |
printf("\t%.3e\n", trans_mtx[j*abp->nangles + i]); |
273 |
+ |
putchar('\n'); /* extra space between rows */ |
274 |
+ |
} |
275 |
+ |
data_epilogue(); |
276 |
+ |
} |
277 |
|
SDfreeBSDF(&bsd); /* all done */ |
278 |
+ |
if (trans_mtx != NULL) |
279 |
+ |
free(trans_mtx); |
280 |
|
return; |
281 |
|
err: |
282 |
|
SDreportError(ec, stderr); |
288 |
|
eval_function(char *funame) |
289 |
|
{ |
290 |
|
ANGLE_BASIS *abp = get_basis(kbasis); |
291 |
+ |
int assignD = (fundefined(funame) < 6); |
292 |
|
double iovec[6]; |
293 |
|
double sum; |
294 |
|
int i, j, n; |
309 |
|
else |
310 |
|
bi_getvec(iovec, i+urand(n), abp); |
311 |
|
|
312 |
+ |
if (assignD) { |
313 |
+ |
varset("Dx", '=', -iovec[3]); |
314 |
+ |
varset("Dy", '=', -iovec[4]); |
315 |
+ |
varset("Dz", '=', -iovec[5]); |
316 |
+ |
++eclock; |
317 |
+ |
} |
318 |
|
sum += funvalue(funame, 6, iovec); |
319 |
|
} |
320 |
|
printf("\t%.3e\n", sum/npsamps); |
420 |
|
fprintf(stderr, |
421 |
|
"%s: need single function with 6 arguments: bsdf(ix,iy,iz,ox,oy,oz)\n", |
422 |
|
progname); |
423 |
+ |
fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n", |
424 |
+ |
progname); |
425 |
|
goto userr; |
426 |
|
} |
427 |
+ |
++eclock; |
428 |
|
xml_header(argc, argv); /* start XML output */ |
429 |
|
xml_prologue(NULL); |
430 |
|
if (dofwd) { |