ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/bsdf2klems.c

Comparing ray/src/cv/bsdf2klems.c (file contents):
Revision 2.6 by greg, Sat Jun 29 21:03:25 2013 UTC vs.
Revision 2.17 by greg, Tue May 5 22:16:49 2015 UTC

#	Line 25 | Line 25 | char                   *progname;
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	+	static unsigned call_cnt = 0;
42	+	static char     lastc[] = "-\\|/";
43	+	char            pbar[256];
44	+	int             nchars;
45	+
46	+	if (do_prog <= 1) return;
47	+	if (do_prog > sizeof(pbar)-2)
48	+	do_prog = sizeof(pbar)-2;
49	+	if (frac < 0) frac = 0;
50	+	else if (frac >= 1) frac = .9999;
51	+	nchars = do_prog*frac;
52	+	pbar[0] = '\r';
53	+	memset(pbar+1, '*', nchars);
54	+	pbar[nchars+1] = lastc[call_cnt++ & 3];
55	+	memset(pbar+2+nchars, '-', do_prog-nchars-1);
56	+	pbar[do_prog+1] = '\0';
57	+	fputs(pbar, stderr);
58	+	}
59	+
60	+	/* Finish progress bar */
61	+	static void
62	+	prog_done(void)
63	+	{
64	+	int     n = do_prog;
65	+
66	+	if (n <= 1) return;
67	+	fputc('\r', stderr);
68	+	while (n--)
69	+	fputc(' ', stderr);
70	+	fputc('\r', stderr);
71	+	}
72	+
73		/* Return angle basis corresponding to the given name */
74	<	ANGLE_BASIS *
74	>	static ANGLE_BASIS *
75		get_basis(const char *bn)
76		{
77		int     n = nabases;
#	Line 56 | Line 100 | xml_header(int ac, char *av[])
100		static void
101		xml_prologue(const SDData *sd)
102		{
103	<	const char      *matn = (sd && sd->matn[0]) ? sd->matn : "Name";
104	<	const char      *makr = (sd && sd->makr[0]) ? sd->makr : "Manufacturer";
103	>	const char      *matn = (sd && sd->matn[0]) ? sd->matn :
104	>	bsdf_name[0] ? bsdf_name : "Unknown";
105	>	const char      *makr = (sd && sd->makr[0]) ? sd->makr :
106	>	bsdf_manuf[0] ? bsdf_manuf : "Unknown";
107		ANGLE_BASIS     *abp = get_basis(kbasis);
108		int             i;
109
#	Line 229 | Line 275 | eval_bsdf(const char *fname)
275		data_epilogue();
276		}
277		/* back transmission */
278	<	if (bsd.tb != NULL) {
278	>	if ((bsd.tb != NULL) | (bsd.tf != NULL)) {
279		input_orient = -1; output_orient = 1;
280		data_prologue();
281		for (j = 0; j < abp->nangles; j++) {
282		for (i = 0; i < abp->nangles; i++) {
283	<	sum = 0;                    /* average over patches */
283	>	sum = 0;            /* average over patches */
284		for (n = npsamps; n-- > 0; ) {
285		fo_getvec(vout, j+(n+frandom())/npsamps, abp);
286		bi_getvec(vin, i+urand(n), abp);
#	Line 261 | Line 307 | static void
307		eval_function(char *funame)
308		{
309		ANGLE_BASIS     *abp = get_basis(kbasis);
310	+	int             assignD = (fundefined(funame) < 6);
311		double          iovec[6];
312		double          sum;
313		int             i, j, n;
#	Line 281 | Line 328 | eval_function(char *funame)
328		else
329		bi_getvec(iovec, i+urand(n), abp);
330
331	+	if (assignD) {
332	+	varset("Dx", '=', -iovec[3]);
333	+	varset("Dy", '=', -iovec[4]);
334	+	varset("Dz", '=', -iovec[5]);
335	+	++eclock;
336	+	}
337		sum += funvalue(funame, 6, iovec);
338		}
339		printf("\t%.3e\n", sum/npsamps);
340		}
341		putchar('\n');
342	+	prog_show((j+1.)/abp->nangles);
343		}
344		data_epilogue();                        /* finish output */
345	+	prog_done();
346		}
347
348		/* Interpolate and output a radial basis function BSDF representation */
#	Line 312 | Line 367 | eval_rbf(void)
367		else
368		bi_getvec(vin, i+.5*(i>0), abp);
369
370	<	rbf = advect_rbf(vin);              /* compute radial basis func */
370	>	rbf = advect_rbf(vin, lobe_lim);    /* compute radial basis func */
371
372		for (j = 0; j < abp->nangles; j++) {
373		sum = 0;                        /* sample over exiting patch */
#	Line 322 | Line 377 | eval_rbf(void)
377		else
378		bo_getvec(vout, j+(n+frandom())/npsamps, abp);
379
380	<	sum += eval_rbfrep(rbf, vout) / vout[2];
380	>	sum += eval_rbfrep(rbf, vout);
381		}
382	<	bsdfarr[j*abp->nangles + i] = sum*output_orient/npsamps;
382	>	bsdfarr[j*abp->nangles + i] = sum / (double)npsamps;
383		}
384		if (rbf != NULL)
385		free(rbf);
386	+	prog_show((i+1.)/abp->nangles);
387		}
388		n = 0;                                  /* write out our matrix */
389		for (j = 0; j < abp->nangles; j++) {
#	Line 336 | Line 392 | eval_rbf(void)
392		putchar('\n');
393		}
394		data_epilogue();                        /* finish output */
395	+	prog_done();
396		}
397
398		/* Read in BSDF and interpolate as Klems matrix representation */
#	Line 378 | Line 435 | main(int argc, char *argv[])
435		case 'q':
436		kbasis = "LBNL/Klems Quarter";
437		break;
438	+	case 'l':
439	+	lobe_lim = atoi(argv[++i]);
440	+	break;
441	+	case 'p':
442	+	do_prog = atoi(argv[i]+2);
443	+	break;
444		default:
445		goto userr;
446		}
#	Line 386 | Line 449 | main(int argc, char *argv[])
449		fprintf(stderr,
450		"%s: need single function with 6 arguments: bsdf(ix,iy,iz,ox,oy,oz)\n",
451		progname);
452	+	fprintf(stderr, "\tor 3 arguments using Dx,Dy,Dz: bsdf(ix,iy,iz)\n");
453		goto userr;
454		}
455	+	++eclock;
456		xml_header(argc, argv);                 /* start XML output */
457		xml_prologue(NULL);
458		if (dofwd) {
459		input_orient = -1;
460		output_orient = -1;
461	<	eval_function(argv[i]);         /* outside reflectance */
461	>	prog_start("Evaluating outside reflectance");
462	>	eval_function(argv[i]);
463		output_orient = 1;
464	<	eval_function(argv[i]);         /* outside -> inside */
464	>	prog_start("Evaluating outside->inside transmission");
465	>	eval_function(argv[i]);
466		}
467		if (dobwd) {
468		input_orient = 1;
469		output_orient = 1;
470	<	eval_function(argv[i]);         /* inside reflectance */
470	>	prog_start("Evaluating inside reflectance");
471	>	eval_function(argv[i]);
472		output_orient = -1;
473	<	eval_function(argv[i]);         /* inside -> outside */
473	>	prog_start("Evaluating inside->outside transmission");
474	>	eval_function(argv[i]);
475		}
476		xml_epilogue();                 /* finish XML output & exit */
477		return(0);
#	Line 418 | Line 487 | main(int argc, char *argv[])
487		if (i < argc) {                         /* open input files if given */
488		int     nbsdf = 0;
489		for ( ; i < argc; i++) {        /* interpolate each component */
490	+	char    pbuf[256];
491		FILE    *fpin = fopen(argv[i], "rb");
492		if (fpin == NULL) {
493		fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n",
#	Line 431 | Line 501 | main(int argc, char *argv[])
501		xml_header(argc, argv);
502		xml_prologue(NULL);
503		}
504	+	sprintf(pbuf, "Interpolating component '%s'", argv[i]);
505	+	prog_start(pbuf);
506		eval_rbf();
507		}
508		xml_epilogue();                 /* finish XML output & exit */
#	Line 441 | Line 513 | main(int argc, char *argv[])
513		return(1);
514		xml_header(argc, argv);                 /* start XML output */
515		xml_prologue(NULL);
516	+	prog_start("Interpolating from standard input");
517		eval_rbf();                             /* resample dist. */
518		xml_epilogue();                         /* finish XML output & exit */
519		return(0);
520		userr:
521		fprintf(stderr,
522	<	"Usage: %s [-n spp][-h|-q][bsdf.sir ..] > bsdf.xml\n", progname);
522	>	"Usage: %s [-n spp][-h|-q][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", progname);
523		fprintf(stderr,
524		"   or: %s [-n spp][-h|-q] bsdf_in.xml > bsdf_out.xml\n", progname);
525		fprintf(stderr,

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)