ViewVC Help

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

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

Comparing ray/src/cv/bsdf2rad.c (file contents):
Revision 2.20 by greg, Mon Apr 10 06:09:14 2017 UTC vs.
Revision 2.31 by greg, Wed May 31 02:41:52 2017 UTC

#	Line 26 | Line 26 | double overall_max = .0;               /* overall maximum BSDF valu
26
27		char    ourTempDir[TEMPLEN] = "";       /* our temporary directory */
28
29	<	const FVECT     Yaxis = {0., 1., 0.};
30	<
31	<	const char      frpref[] = "frefl";
32	<	const char      ftpref[] = "ftrans";
33	<	const char      brpref[] = "brefl";
34	<	const char      btpref[] = "btrans";
29	>	const char      frpref[] = "rf";
30	>	const char      ftpref[] = "tf";
31	>	const char      brpref[] = "rb";
32	>	const char      btpref[] = "tb";
33		const char      dsuffix[] = ".txt";
34
35	<	const char      sph_mat[] = "BSDFmat";
35	>	const char      sph_fmat[] = "fBSDFmat";
36	>	const char      sph_bmat[] = "bBSDFmat";
37		const double    sph_rad = 10.;
38		const double    sph_xoffset = 15.;
39
#	Line 43 | Line 42 | const double   sph_xoffset = 15.;
42
43		#define FEQ(a,b)        ((a)-(b) <= 1e-7 && (b)-(a) <= 1e-7)
44
45	<	#define set_minlog()    (min_log10 = log10(overall_min + 1e-5) - .1)
45	>	#define set_minlog()    overall_min = (overall_min < 1e-5) ? 1e-5 : overall_min; \
46	>	min_log10 = log10(overall_min) - .1
47
48		char    *progname;
49
#	Line 271 | Line 271 | build_wRBF(void)
271
272		/* Put out mirror arrow for the given incident vector */
273		static void
274	<	put_mirror_arrow(const FVECT ivec, int inc_side)
274	>	put_mirror_arrow(const FVECT origin, const FVECT nrm)
275		{
276		const double    arrow_len = 1.2*bsdf_rad;
277		const double    tip_len = 0.2*bsdf_rad;
278	<	FVECT           origin, refl;
278	>	FVECT           refl;
279		int             i;
280
281	<	cvt_sposition(origin, ivec, inc_side);
281	>	refl[0] = 2.*nrm[2]*nrm[0];
282	>	refl[1] = 2.*nrm[2]*nrm[1];
283	>	refl[2] = 2.*nrm[2]*nrm[2] - 1.;
284
283	–	refl[0] = -2.*ivec[2]*ivec[0];
284	–	refl[1] = -2.*ivec[2]*ivec[1];
285	–	refl[2] = 2.*ivec[2]*ivec[2] - 1.;
286	–
285		printf("\n# Mirror arrow\n");
286	<	printf("\narrow_mat cylinder inc_dir\n0\n0\n7");
286	>	printf("\nshaft_mat cylinder inc_dir\n0\n0\n7");
287		printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
288		origin[0], origin[1], origin[2]+arrow_len,
289		origin[0], origin[1], origin[2],
290		arrow_rad);
291	<	printf("\narrow_mat cylinder mir_dir\n0\n0\n7");
291	>	printf("\nshaft_mat cylinder mir_dir\n0\n0\n7");
292		printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
293		origin[0], origin[1], origin[2],
294		origin[0] + arrow_len*refl[0],
295		origin[1] + arrow_len*refl[1],
296		origin[2] + arrow_len*refl[2],
297		arrow_rad);
298	<	printf("\narrow_mat cone mir_tip\n0\n0\n8");
298	>	printf("\ntip_mat cone mir_tip\n0\n0\n8");
299		printf("\n\t%f %f %f\n\t%f %f %f\n\t%f 0\n",
300		origin[0] + (arrow_len-.5*tip_len)*refl[0],
301		origin[1] + (arrow_len-.5*tip_len)*refl[1],
#	Line 310 | Line 308 | put_mirror_arrow(const FVECT ivec, int inc_side)
308
309		/* Put out transmitted direction arrow for the given incident vector */
310		static void
311	<	put_trans_arrow(const FVECT ivec, int inc_side)
311	>	put_trans_arrow(const FVECT origin)
312		{
313		const double    arrow_len = 1.2*bsdf_rad;
314		const double    tip_len = 0.2*bsdf_rad;
317	–	FVECT           origin;
315		int             i;
316
320	–	cvt_sposition(origin, ivec, inc_side);
321	–
317		printf("\n# Transmission arrow\n");
318	<	printf("\narrow_mat cylinder trans_dir\n0\n0\n7");
318	>	printf("\nshaft_mat cylinder trans_dir\n0\n0\n7");
319		printf("\n\t%f %f %f\n\t%f %f %f\n\t%f\n",
320		origin[0], origin[1], origin[2],
321		origin[0], origin[1], origin[2]-arrow_len,
322		arrow_rad);
323	<	printf("\narrow_mat cone trans_tip\n0\n0\n8");
323	>	printf("\ntip_mat cone trans_tip\n0\n0\n8");
324		printf("\n\t%f %f %f\n\t%f %f %f\n\t%f 0\n",
325		origin[0], origin[1], origin[2]-arrow_len+.5*tip_len,
326		origin[0], origin[1], origin[2]-arrow_len-.5*tip_len,
#	Line 373 | Line 368 | static int
368		put_BSDFs(void)
369		{
370		const double    scalef = bsdf_rad/(log10(overall_max) - min_log10);
371	<	FVECT           ivec, sorg;
371	>	FVECT           ivec, sorg, nrm, upv;
372		RREAL           vMtx[3][3];
373		char            *fname;
374		char            cmdbuf[256];
375	<	char            xfargs[128];
376	<	int             nxfa;
375	>	char            rotargs[64];
376	>	int             nrota;
377		int             i;
378
379		printf("\n# Gensurf output corresponding to %d incident directions\n",
380		NINCIDENT);
381
382	<	printf("\nvoid glow arrow_glow\n0\n0\n4 1 0 1 0\n");
383	<	printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void 0.5 .\n0\n0\n");
382	>	printf("\nvoid glow tip_mat\n0\n0\n4 1 0 1 0\n");
383	>	printf("\nvoid mixfunc shaft_mat\n4 tip_mat void 0.25 .\n0\n0\n");
384
385	<	if (front_comp & SDsampR)                       /* front reflection */
386	<	for (i = 0; i < NINCIDENT; i++) {
387	<	get_ivector(ivec, i);
388	<	put_mirror_arrow(ivec, 1);
385	>	for (i = 0; i < NINCIDENT; i++) {
386	>	get_ivector(ivec, i);
387	>	nrm[0] = -ivec[0]; nrm[1] = -ivec[1]; nrm[2] = ivec[2];
388	>	upv[0] = nrm[0]*nrm[1]*(nrm[2] - 1.);
389	>	upv[1] = nrm[0]*nrm[0] + nrm[1]*nrm[1]*nrm[2];
390	>	upv[2] = -nrm[1]*(nrm[0]*nrm[0] + nrm[1]*nrm[1]);
391	>	if (SDcompXform(vMtx, nrm, upv) != SDEnone)
392	>	continue;
393	>	nrota = addrot(rotargs, vMtx[0], vMtx[1], vMtx[2]);
394	>	if (front_comp) {
395		cvt_sposition(sorg, ivec, 1);
395	–	ivec[0] = -ivec[0]; ivec[1] = -ivec[1]; /* normal */
396	–	sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
397	–	sorg[0], sorg[1], sorg[2]);
398	–	nxfa = 6;
396		printf("\nvoid colorfunc scale_pat\n");
397	<	printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
398	<	4+nxfa, xfargs);
397	>	printf("10 bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n");
398	>	printf("\t-s %f -t %f %f %f\n0\n0\n",
399	>	bsdf_rad, sorg[0], sorg[1], sorg[2]);
400		printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
401	<	SDcompXform(vMtx, ivec, Yaxis);
402	<	nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
403	<	sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
406	<	scalef, sorg[0], sorg[1], sorg[2]);
407	<	nxfa += 6;
401	>	}
402	>	if (front_comp & SDsampR) {
403	>	put_mirror_arrow(sorg, nrm);
404		fname = tfile_name(frpref, dsuffix, i);
405	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform %s",
405	>	sprintf(cmdbuf,
406	>	"gensurf scale_mat %s%d %s %s %s %d %d | xform %s -s %f -t %f %f %f",
407		frpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
408	<	xfargs);
408	>	rotargs, scalef, sorg[0], sorg[1], sorg[2]);
409		if (!run_cmd(cmdbuf))
410		return(0);
411		}
412	<	if (front_comp & SDsampT)                       /* front transmission */
413	<	for (i = 0; i < NINCIDENT; i++) {
417	<	get_ivector(ivec, i);
418	<	put_trans_arrow(ivec, 1);
419	<	cvt_sposition(sorg, ivec, 1);
420	<	ivec[0] = -ivec[0]; ivec[1] = -ivec[1]; /* normal */
421	<	sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
422	<	sorg[0], sorg[1], sorg[2]);
423	<	nxfa = 6;
424	<	printf("\nvoid colorfunc scale_pat\n");
425	<	printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
426	<	4+nxfa, xfargs);
427	<	printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
428	<	SDcompXform(vMtx, ivec, Yaxis);
429	<	nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
430	<	sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
431	<	scalef, sorg[0], sorg[1], sorg[2]);
432	<	nxfa += 6;
412	>	if (front_comp & SDsampT) {
413	>	put_trans_arrow(sorg);
414		fname = tfile_name(ftpref, dsuffix, i);
415	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I %s",
415	>	sprintf(cmdbuf,
416	>	"gensurf scale_mat %s%d %s %s %s %d %d | xform -I %s -s %f -t %f %f %f",
417		ftpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
418	<	xfargs);
418	>	rotargs, scalef, sorg[0], sorg[1], sorg[2]);
419		if (!run_cmd(cmdbuf))
420		return(0);
421		}
422	<	if (back_comp & SDsampR)                        /* rear reflection */
441	<	for (i = 0; i < NINCIDENT; i++) {
442	<	get_ivector(ivec, i);
443	<	put_mirror_arrow(ivec, -1);
422	>	if (back_comp) {
423		cvt_sposition(sorg, ivec, -1);
445	–	ivec[0] = -ivec[0]; ivec[1] = -ivec[1]; /* normal */
446	–	sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
447	–	sorg[0], sorg[1], sorg[2]);
448	–	nxfa = 6;
424		printf("\nvoid colorfunc scale_pat\n");
425	<	printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
426	<	4+nxfa, xfargs);
425	>	printf("10 bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n");
426	>	printf("\t-s %f -t %f %f %f\n0\n0\n",
427	>	bsdf_rad, sorg[0], sorg[1], sorg[2]);
428		printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
429	<	SDcompXform(vMtx, ivec, Yaxis);
430	<	nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
431	<	sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
456	<	scalef, sorg[0], sorg[1], sorg[2]);
457	<	nxfa += 6;
429	>	}
430	>	if (back_comp & SDsampR) {
431	>	put_mirror_arrow(sorg, nrm);
432		fname = tfile_name(brpref, dsuffix, i);
433	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I -ry 180 %s",
433	>	sprintf(cmdbuf,
434	>	"gensurf scale_mat %s%d %s %s %s %d %d | xform -I -ry 180 %s -s %f -t %f %f %f",
435		brpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
436	<	xfargs);
436	>	rotargs, scalef, sorg[0], sorg[1], sorg[2]);
437		if (!run_cmd(cmdbuf))
438		return(0);
439		}
440	<	if (back_comp & SDsampT)                        /* rear transmission */
441	<	for (i = 0; i < NINCIDENT; i++) {
467	<	get_ivector(ivec, i);
468	<	put_trans_arrow(ivec, -1);
469	<	cvt_sposition(sorg, ivec, -1);
470	<	ivec[0] = -ivec[0]; ivec[1] = -ivec[1]; /* normal */
471	<	sprintf(xfargs, "-s %f -t %f %f %f", bsdf_rad,
472	<	sorg[0], sorg[1], sorg[2]);
473	<	nxfa = 6;
474	<	printf("\nvoid colorfunc scale_pat\n");
475	<	printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
476	<	4+nxfa, xfargs);
477	<	printf("\nscale_pat glow scale_mat\n0\n0\n4 1 1 1 0\n");
478	<	SDcompXform(vMtx, ivec, Yaxis);
479	<	nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
480	<	sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
481	<	scalef, sorg[0], sorg[1], sorg[2]);
482	<	nxfa += 6;
440	>	if (back_comp & SDsampT) {
441	>	put_trans_arrow(sorg);
442		fname = tfile_name(btpref, dsuffix, i);
443	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -ry 180 %s",
443	>	sprintf(cmdbuf,
444	>	"gensurf scale_mat %s%d %s %s %s %d %d | xform -ry 180 %s -s %f -t %f %f %f",
445		btpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
446	<	xfargs);
446	>	rotargs, scalef, sorg[0], sorg[1], sorg[2]);
447		if (!run_cmd(cmdbuf))
448		return(0);
449		}
450	+	}
451		return(1);
452		}
453
#	Line 501 | Line 462 | put_matBSDF(const char *XMLfile)
462		printf("\nvoid brightfunc latlong\n2 latlong bsdf2rad.cal\n0\n0\n");
463		if ((front_comp|back_comp) & SDsampT)
464		printf("\nlatlong trans %s\n0\n0\n7 .75 .75 .75 0 .04 .5 .8\n",
465	<	sph_mat);
465	>	sph_fmat);
466		else
467		printf("\nlatlong plastic %s\n0\n0\n5 .5 .5 .5 0 0\n",
468	<	sph_mat);
468	>	sph_fmat);
469	>	printf("\ninherit alias %s %s\n", sph_bmat, sph_fmat);
470		return;
471		}
472		switch (XMLfile[0]) {           /* avoid RAYPATH search */
473		case '.':
474	+	case '~':
475		CASEDIRSEP:
476		curdir = "";
477		break;
#	Line 517 | Line 480 | put_matBSDF(const char *XMLfile)
480		exit(1);
481		break;
482		}
483	<	printf("\n# Actual BSDF material for rendering the hemispheres\n");
484	<	printf("\nvoid BSDF BSDFmat\n6 0 \"%s%s\" 0 1 0 .\n0\n0\n",
483	>	printf("\n# Actual BSDF materials for rendering the hemispheres\n");
484	>	printf("\nvoid BSDF BSDF_f\n6 0 \"%s%s\" upx upy upz bsdf2rad.cal\n0\n0\n",
485		curdir, XMLfile);
486		printf("\nvoid plastic black\n0\n0\n5 0 0 0 0 0\n");
487	<	printf("\nvoid mixfunc %s\n4 BSDFmat black latlong bsdf2rad.cal\n0\n0\n",
488	<	sph_mat);
487	>	printf("\nvoid mixfunc %s\n4 BSDF_f black latlong bsdf2rad.cal\n0\n0\n",
488	>	sph_fmat);
489	>	printf("\nvoid BSDF BSDF_b\n8 0 \"%s%s\" upx upy upz bsdf2rad.cal -ry 180\n0\n0\n",
490	>	curdir, XMLfile);
491	>	printf("\nvoid mixfunc %s\n4 BSDF_b black latlong bsdf2rad.cal\n0\n0\n",
492	>	sph_bmat);
493		}
494
495		/* Put out overhead parallel light source */
#	Line 540 | Line 507 | put_source(void)
507		static void
508		put_hemispheres(void)
509		{
510	+	const int       nsegs = 131;
511	+
512		printf("\n# Hemisphere(s) for showing BSDF appearance (if XML file)\n");
544	–	printf("\nvoid antimatter anti_sph\n2 void %s\n0\n0\n", sph_mat);
513		if (front_comp) {
514	<	printf("\n%s sphere Front\n0\n0\n4 %f 0 0 %f\n",
515	<	sph_mat, sph_xoffset, sph_rad);
516	<	printf("\n!genbox anti_sph sph_eraser %f %f %f | xform -t %f %f %f\n",
549	<	2.02*sph_rad, 2.02*sph_rad, 1.02*sph_rad,
550	<	-1.01*sph_rad + sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
514	>	printf(
515	>	"\n!genrev %s Front \"R*sin(A*t)\" \"R*cos(A*t)\" %d -e \"R:%g;A:%f\" -s | xform -t %g 0 0\n",
516	>	sph_fmat, nsegs, sph_rad, 0.5*PI, sph_xoffset);
517		printf("\nvoid brighttext front_text\n3 helvet.fnt . FRONT\n0\n");
518		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
519		-.22*sph_rad + sph_xoffset, -1.4*sph_rad,
#	Line 561 | Line 527 | put_hemispheres(void)
527		.25*sph_rad + sph_xoffset, -1.3*sph_rad );
528		}
529		if (back_comp) {
530	<	printf("\n%s bubble Back\n0\n0\n4 %f 0 0 %f\n",
531	<	sph_mat, -sph_xoffset, sph_rad);
532	<	printf("\n!genbox anti_sph sph_eraser %f %f %f | xform -t %f %f %f\n",
567	<	2.02*sph_rad, 2.02*sph_rad, 1.02*sph_rad,
568	<	-1.01*sph_rad - sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
530	>	printf(
531	>	"\n!genrev %s Back \"R*cos(A*t)\" \"R*sin(A*t)\" %d -e \"R:%g;A:%f\" -s | xform -t %g 0 0\n",
532	>	sph_bmat, nsegs, sph_rad, 0.5*PI, -sph_xoffset);
533		printf("\nvoid brighttext back_text\n3 helvet.fnt . BACK\n0\n");
534		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
535		-.22*sph_rad - sph_xoffset, -1.4*sph_rad,
#	Line 787 | Line 751 | main(int argc, char *argv[])
751		strcpy(bsdf_manuf, myBSDF.makr);
752		put_matBSDF(argv[1]);
753		} else {
754	<	FILE    *fp;
754	>	FILE    *fp[4];
755	>	if (argc > 5) {
756	>	fprintf(stderr, "%s: more than 4 hemispheres!\n", progname);
757	>	return(1);
758	>	}
759		for (n = 1; n < argc; n++) {
760	<	fp = fopen(argv[n], "rb");
761	<	if (fp == NULL) {
760	>	fp[n-1] = fopen(argv[n], "rb");
761	>	if (fp[n-1] == NULL) {
762		fprintf(stderr, "%s: cannot open BSDF interpolant '%s'\n",
763		progname, argv[n]);
764		return(1);
765		}
766	<	if (getheader(fp, rbf_headline, NULL) < 0) {
766	>	if (getheader(fp[n-1], rbf_headline, NULL) < 0) {
767		fprintf(stderr, "%s: bad BSDF interpolant '%s'\n",
768		progname, argv[n]);
769		return(1);
770		}
803	–	fclose(fp);
771		}
772		set_minlog();
773		for (n = 1; n < argc; n++) {
774	<	fp = fopen(argv[n], "rb");
775	<	if (!load_bsdf_rep(fp))
774	>	if (fseek(fp[n-1], 0L, SEEK_SET) < 0) {
775	>	fprintf(stderr, "%s: cannot seek on '%s'\n",
776	>	progname, argv[n]);
777		return(1);
778	<	fclose(fp);
778	>	}
779	>	if (!load_bsdf_rep(fp[n-1]))
780	>	return(1);
781	>	fclose(fp[n-1]);
782		if (!build_wRBF())
783		return(1);
784		}
#	Line 818 | Line 789 | main(int argc, char *argv[])
789		put_scale();
790		if (inpXML && myBSDF.mgf)
791		convert_mgf(myBSDF.mgf);
792	<	if (!put_BSDFs())
792	>	if (!put_BSDFs())               /* most of the output happens here */
793		return(1);
794		cleanup_tmp();
795		return(0);

Diff Legend

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