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.8 by greg, Fri Aug 2 20:56:19 2013 UTC vs.
Revision 2.12 by greg, Thu Nov 21 20:09:06 2013 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
31		/* Return angle basis corresponding to the given name */
32		ANGLE_BASIS *
#	Line 56 | Line 58 | xml_header(int ac, char *av[])
58		static void
59		xml_prologue(const SDData *sd)
60		{
61	<	const char      *matn = (sd && sd->matn[0]) ? sd->matn : "Name";
62	<	const char      *makr = (sd && sd->makr[0]) ? sd->makr : "Manufacturer";
61	>	const char      *matn = (sd && sd->matn[0]) ? sd->matn :
62	>	bsdf_name[0] ? bsdf_name : "Unknown";
63	>	const char      *makr = (sd && sd->makr[0]) ? sd->makr :
64	>	bsdf_manuf[0] ? bsdf_manuf : "Unknown";
65		ANGLE_BASIS     *abp = get_basis(kbasis);
66		int             i;
67
#	Line 154 | Line 158 | static void
158		eval_bsdf(const char *fname)
159		{
160		ANGLE_BASIS     *abp = get_basis(kbasis);
157	–	float           *trans_mtx = NULL;
161		SDData          bsd;
162		SDError         ec;
163		FVECT           vin, vout;
#	Line 210 | Line 213 | eval_bsdf(const char *fname)
213		}
214		/* front transmission */
215		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++) {
#	Line 227 | Line 227 | eval_bsdf(const char *fname)
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;
230		}
231		putchar('\n');                  /* extra space between rows */
232		}
233		data_epilogue();
234		}
235		/* back transmission */
236	<	if (bsd.tb != NULL || trans_mtx != NULL) {
239	<	if (bsd.tf == NULL)
240	<	trans_mtx = (float *)malloc(sizeof(float) *
241	<	abp->nangles*abp->nangles);
236	>	if ((bsd.tb != NULL) | (bsd.tf != NULL)) {
237		input_orient = -1; output_orient = 1;
238		data_prologue();
239		for (j = 0; j < abp->nangles; j++) {
240	<	for (i = 0; i < abp->nangles; i++)
241	<	if (bsd.tb != NULL) {       /* use tb if we have it */
242	<	sum = 0;                /* average over patches */
243	<	for (n = npsamps; n-- > 0; ) {
244	<	fo_getvec(vout, j+(n+frandom())/npsamps, abp);
245	<	bi_getvec(vin, i+urand(n), abp);
246	<	ec = SDevalBSDF(&sv, vout, vin, &bsd);
252	<	if (ec != SDEnone)
240	>	for (i = 0; i < abp->nangles; i++) {
241	>	sum = 0;            /* average over patches */
242	>	for (n = npsamps; n-- > 0; ) {
243	>	fo_getvec(vout, j+(n+frandom())/npsamps, abp);
244	>	bi_getvec(vin, i+urand(n), abp);
245	>	ec = SDevalBSDF(&sv, vout, vin, &bsd);
246	>	if (ec != SDEnone)
247		goto err;
248	<	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]);
248	>	sum += sv.cieY;
249		}
250	+	printf("\t%.3e\n", sum/npsamps);
251	+	}
252		putchar('\n');                  /* extra space between rows */
253		}
254		data_epilogue();
255		}
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	–	}
256		SDfreeBSDF(&bsd);                       /* all done */
278	–	if (trans_mtx != NULL)
279	–	free(trans_mtx);
257		return;
258		err:
259		SDreportError(ec, stderr);
#	Line 346 | Line 323 | eval_rbf(void)
323		else
324		bi_getvec(vin, i+.5*(i>0), abp);
325
326	<	rbf = advect_rbf(vin);              /* compute radial basis func */
326	>	rbf = advect_rbf(vin, lobe_lim);    /* compute radial basis func */
327
328		for (j = 0; j < abp->nangles; j++) {
329		sum = 0;                        /* sample over exiting patch */
#	Line 356 | Line 333 | eval_rbf(void)
333		else
334		bo_getvec(vout, j+(n+frandom())/npsamps, abp);
335
336	<	sum += eval_rbfrep(rbf, vout) / vout[2];
336	>	sum += eval_rbfrep(rbf, vout);
337		}
338	<	bsdfarr[j*abp->nangles + i] = sum*output_orient/npsamps;
338	>	fo_getvec(vout, j+.5, abp);     /* use centered secant */
339	>	bsdfarr[j*abp->nangles + i] = sum / (npsamps*vout[2]);
340		}
341		if (rbf != NULL)
342		free(rbf);
#	Line 412 | Line 390 | main(int argc, char *argv[])
390		case 'q':
391		kbasis = "LBNL/Klems Quarter";
392		break;
393	+	case 'l':
394	+	lobe_lim = atoi(argv[++i]);
395	+	break;
396		default:
397		goto userr;
398		}
#	Line 483 | Line 464 | main(int argc, char *argv[])
464		return(0);
465		userr:
466		fprintf(stderr,
467	<	"Usage: %s [-n spp][-h|-q][bsdf.sir ..] > bsdf.xml\n", progname);
467	>	"Usage: %s [-n spp][-h|-q][-l maxlobes] [bsdf.sir ..] > bsdf.xml\n", progname);
468		fprintf(stderr,
469		"   or: %s [-n spp][-h|-q] bsdf_in.xml > bsdf_out.xml\n", progname);
470		fprintf(stderr,

Diff Legend

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