25 |
|
static const char *kbasis = "LBNL/Klems Full"; |
26 |
|
/* number of BSDF samples per patch */ |
27 |
|
static int npsamps = 256; |
28 |
+ |
/* limit on number of RBF lobes */ |
29 |
+ |
static int lobe_lim = 15000; |
30 |
+ |
/* progress bar length */ |
31 |
+ |
static int do_prog = 79; |
32 |
|
|
33 |
+ |
|
34 |
+ |
/* Start new progress bar */ |
35 |
+ |
#define prog_start(s) if (do_prog) fprintf(stderr, "%s: %s...\n", progname, s); else |
36 |
+ |
|
37 |
+ |
/* Draw progress bar of the appropriate length */ |
38 |
+ |
static void |
39 |
+ |
prog_show(double frac) |
40 |
+ |
{ |
41 |
+ |
char pbar[256]; |
42 |
+ |
int nchars; |
43 |
+ |
|
44 |
+ |
if (do_prog <= 1) return; |
45 |
+ |
if (do_prog > sizeof(pbar)-2) |
46 |
+ |
do_prog = sizeof(pbar)-2; |
47 |
+ |
if (frac < 0) frac = 0; |
48 |
+ |
else if (frac > 1) frac = 1; |
49 |
+ |
nchars = do_prog*frac + .5; |
50 |
+ |
pbar[0] = '\r'; |
51 |
+ |
memset(pbar+1, '*', nchars); |
52 |
+ |
memset(pbar+1+nchars, '-', do_prog-nchars); |
53 |
+ |
pbar[do_prog+1] = '\0'; |
54 |
+ |
fputs(pbar, stderr); |
55 |
+ |
} |
56 |
+ |
|
57 |
+ |
/* Finish progress bar */ |
58 |
+ |
static void |
59 |
+ |
prog_done(void) |
60 |
+ |
{ |
61 |
+ |
int n = do_prog; |
62 |
+ |
|
63 |
+ |
if (n <= 1) return; |
64 |
+ |
fputc('\r', stderr); |
65 |
+ |
while (n--) |
66 |
+ |
fputc(' ', stderr); |
67 |
+ |
fputc('\r', stderr); |
68 |
+ |
} |
69 |
+ |
|
70 |
|
/* Return angle basis corresponding to the given name */ |
71 |
< |
ANGLE_BASIS * |
71 |
> |
static ANGLE_BASIS * |
72 |
|
get_basis(const char *bn) |
73 |
|
{ |
74 |
|
int n = nabases; |
97 |
|
static void |
98 |
|
xml_prologue(const SDData *sd) |
99 |
|
{ |
100 |
< |
const char *matn = (sd && sd->matn[0]) ? sd->matn : "Name"; |
101 |
< |
const char *makr = (sd && sd->makr[0]) ? sd->makr : "Manufacturer"; |
100 |
> |
const char *matn = (sd && sd->matn[0]) ? sd->matn : |
101 |
> |
bsdf_name[0] ? bsdf_name : "Unknown"; |
102 |
> |
const char *makr = (sd && sd->makr[0]) ? sd->makr : |
103 |
> |
bsdf_manuf[0] ? bsdf_manuf : "Unknown"; |
104 |
|
ANGLE_BASIS *abp = get_basis(kbasis); |
105 |
|
int i; |
106 |
|
|
197 |
|
eval_bsdf(const char *fname) |
198 |
|
{ |
199 |
|
ANGLE_BASIS *abp = get_basis(kbasis); |
157 |
– |
float *trans_mtx = NULL; |
200 |
|
SDData bsd; |
201 |
|
SDError ec; |
202 |
|
FVECT vin, vout; |
252 |
|
} |
253 |
|
/* front transmission */ |
254 |
|
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); |
255 |
|
input_orient = 1; output_orient = -1; |
256 |
|
data_prologue(); |
257 |
|
for (j = 0; j < abp->nangles; j++) { |
266 |
|
sum += sv.cieY; |
267 |
|
} |
268 |
|
printf("\t%.3e\n", sum/npsamps); |
230 |
– |
if (trans_mtx != NULL) |
231 |
– |
trans_mtx[j*abp->nangles + i] = sum/npsamps; |
269 |
|
} |
270 |
|
putchar('\n'); /* extra space between rows */ |
271 |
|
} |
272 |
|
data_epilogue(); |
273 |
|
} |
274 |
|
/* back transmission */ |
275 |
< |
if (bsd.tb != NULL || trans_mtx != NULL) { |
239 |
< |
if (bsd.tf == NULL) |
240 |
< |
trans_mtx = (float *)malloc(sizeof(float) * |
241 |
< |
abp->nangles*abp->nangles); |
275 |
> |
if ((bsd.tb != NULL) | (bsd.tf != NULL)) { |
276 |
|
input_orient = -1; output_orient = 1; |
277 |
|
data_prologue(); |
278 |
|
for (j = 0; j < abp->nangles; j++) { |
279 |
< |
for (i = 0; i < abp->nangles; i++) |
280 |
< |
if (bsd.tb != NULL) { /* use tb if we have it */ |
281 |
< |
sum = 0; /* average over patches */ |
282 |
< |
for (n = npsamps; n-- > 0; ) { |
283 |
< |
fo_getvec(vout, j+(n+frandom())/npsamps, abp); |
284 |
< |
bi_getvec(vin, i+urand(n), abp); |
285 |
< |
ec = SDevalBSDF(&sv, vout, vin, &bsd); |
252 |
< |
if (ec != SDEnone) |
279 |
> |
for (i = 0; i < abp->nangles; i++) { |
280 |
> |
sum = 0; /* average over patches */ |
281 |
> |
for (n = npsamps; n-- > 0; ) { |
282 |
> |
fo_getvec(vout, j+(n+frandom())/npsamps, abp); |
283 |
> |
bi_getvec(vin, i+urand(n), abp); |
284 |
> |
ec = SDevalBSDF(&sv, vout, vin, &bsd); |
285 |
> |
if (ec != SDEnone) |
286 |
|
goto err; |
287 |
< |
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]); |
287 |
> |
sum += sv.cieY; |
288 |
|
} |
289 |
+ |
printf("\t%.3e\n", sum/npsamps); |
290 |
+ |
} |
291 |
|
putchar('\n'); /* extra space between rows */ |
292 |
|
} |
293 |
|
data_epilogue(); |
294 |
|
} |
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 |
– |
} |
295 |
|
SDfreeBSDF(&bsd); /* all done */ |
278 |
– |
if (trans_mtx != NULL) |
279 |
– |
free(trans_mtx); |
296 |
|
return; |
297 |
|
err: |
298 |
|
SDreportError(ec, stderr); |
304 |
|
eval_function(char *funame) |
305 |
|
{ |
306 |
|
ANGLE_BASIS *abp = get_basis(kbasis); |
307 |
+ |
int assignD = (fundefined(funame) < 6); |
308 |
|
double iovec[6]; |
309 |
|
double sum; |
310 |
|
int i, j, n; |
325 |
|
else |
326 |
|
bi_getvec(iovec, i+urand(n), abp); |
327 |
|
|
328 |
+ |
if (assignD) { |
329 |
+ |
varset("Dx", '=', -iovec[3]); |
330 |
+ |
varset("Dy", '=', -iovec[4]); |
331 |
+ |
varset("Dz", '=', -iovec[5]); |
332 |
+ |
++eclock; |
333 |
+ |
} |
334 |
|
sum += funvalue(funame, 6, iovec); |
335 |
|
} |
336 |
|
printf("\t%.3e\n", sum/npsamps); |
337 |
|
} |
338 |
|
putchar('\n'); |
339 |
+ |
prog_show((j+1.)/abp->nangles); |
340 |
|
} |
341 |
|
data_epilogue(); /* finish output */ |
342 |
+ |
prog_done(); |
343 |
|
} |
344 |
|
|
345 |
|
/* Interpolate and output a radial basis function BSDF representation */ |
364 |
|
else |
365 |
|
bi_getvec(vin, i+.5*(i>0), abp); |
366 |
|
|
367 |
< |
rbf = advect_rbf(vin); /* compute radial basis func */ |
367 |
> |
rbf = advect_rbf(vin, lobe_lim); /* compute radial basis func */ |
368 |
|
|
369 |
|
for (j = 0; j < abp->nangles; j++) { |
370 |
|
sum = 0; /* sample over exiting patch */ |
374 |
|
else |
375 |
|
bo_getvec(vout, j+(n+frandom())/npsamps, abp); |
376 |
|
|
377 |
< |
sum += eval_rbfrep(rbf, vout) / vout[2]; |
377 |
> |
sum += eval_rbfrep(rbf, vout); |
378 |
|
} |
379 |
< |
bsdfarr[j*abp->nangles + i] = sum*output_orient/npsamps; |
379 |
> |
bsdfarr[j*abp->nangles + i] = sum / (double)npsamps; |
380 |
|
} |
381 |
|
if (rbf != NULL) |
382 |
|
free(rbf); |
383 |
+ |
prog_show((i+1.)/abp->nangles); |
384 |
|
} |
385 |
|
n = 0; /* write out our matrix */ |
386 |
|
for (j = 0; j < abp->nangles; j++) { |
389 |
|
putchar('\n'); |
390 |
|
} |
391 |
|
data_epilogue(); /* finish output */ |
392 |
+ |
prog_done(); |
393 |
|
} |
394 |
|
|
395 |
|
/* Read in BSDF and interpolate as Klems matrix representation */ |
432 |
|
case 'q': |
433 |
|
kbasis = "LBNL/Klems Quarter"; |
434 |
|
break; |
435 |
+ |
case 'l': |
436 |
+ |
lobe_lim = atoi(argv[++i]); |
437 |
+ |
break; |
438 |
+ |
case 'p': |
439 |
+ |
do_prog = atoi(argv[i]+2); |
440 |
+ |
break; |
441 |
|
default: |
442 |
|
goto userr; |
443 |
|
} |
446 |
|
fprintf(stderr, |
447 |
|
"%s: need single function with 6 arguments: bsdf(ix,iy,iz,ox,oy,oz)\n", |
448 |
|
progname); |
449 |
+ |
fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n"); |
450 |
|
goto userr; |
451 |
|
} |
452 |
+ |
++eclock; |
453 |
|
xml_header(argc, argv); /* start XML output */ |
454 |
|
xml_prologue(NULL); |
455 |
|
if (dofwd) { |
456 |
|
input_orient = -1; |
457 |
|
output_orient = -1; |
458 |
< |
eval_function(argv[i]); /* outside reflectance */ |
458 |
> |
prog_start("Evaluating outside reflectance"); |
459 |
> |
eval_function(argv[i]); |
460 |
|
output_orient = 1; |
461 |
< |
eval_function(argv[i]); /* outside -> inside */ |
461 |
> |
prog_start("Evaluating outside->inside transmission"); |
462 |
> |
eval_function(argv[i]); |
463 |
|
} |
464 |
|
if (dobwd) { |
465 |
|
input_orient = 1; |
466 |
|
output_orient = 1; |
467 |
< |
eval_function(argv[i]); /* inside reflectance */ |
467 |
> |
prog_start("Evaluating inside reflectance"); |
468 |
> |
eval_function(argv[i]); |
469 |
|
output_orient = -1; |
470 |
< |
eval_function(argv[i]); /* inside -> outside */ |
470 |
> |
prog_start("Evaluating inside->outside transmission"); |
471 |
> |
eval_function(argv[i]); |
472 |
|
} |
473 |
|
xml_epilogue(); /* finish XML output & exit */ |
474 |
|
return(0); |
484 |
|
if (i < argc) { /* open input files if given */ |
485 |
|
int nbsdf = 0; |
486 |
|
for ( ; i < argc; i++) { /* interpolate each component */ |
487 |
+ |
char pbuf[256]; |
488 |
|
FILE *fpin = fopen(argv[i], "rb"); |
489 |
|
if (fpin == NULL) { |
490 |
|
fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n", |
498 |
|
xml_header(argc, argv); |
499 |
|
xml_prologue(NULL); |
500 |
|
} |
501 |
+ |
sprintf(pbuf, "Interpolating component '%s'", argv[i]); |
502 |
+ |
prog_start(pbuf); |
503 |
|
eval_rbf(); |
504 |
|
} |
505 |
|
xml_epilogue(); /* finish XML output & exit */ |
510 |
|
return(1); |
511 |
|
xml_header(argc, argv); /* start XML output */ |
512 |
|
xml_prologue(NULL); |
513 |
+ |
prog_start("Interpolating from standard input"); |
514 |
|
eval_rbf(); /* resample dist. */ |
515 |
|
xml_epilogue(); /* finish XML output & exit */ |
516 |
|
return(0); |
517 |
|
userr: |
518 |
|
fprintf(stderr, |
519 |
< |
"Usage: %s [-n spp][-h|-q][bsdf.sir ..] > bsdf.xml\n", progname); |
519 |
> |
"Usage: %s [-n spp][-h|-q][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", progname); |
520 |
|
fprintf(stderr, |
521 |
|
" or: %s [-n spp][-h|-q] bsdf_in.xml > bsdf_out.xml\n", progname); |
522 |
|
fprintf(stderr, |