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.17 by greg, Sun Apr 9 22:06:07 2017 UTC vs.
Revision 2.20 by greg, Mon Apr 10 06:09:14 2017 UTC

#	Line 13 | Line 13 | static const char RCSid[] = "$Id$";
13		#include "resolu.h"
14		#include "bsdfrep.h"
15
16	<	#define NINCIDENT       25              /* number of samples/hemisphere */
16	>	#define NINCIDENT       37              /* number of samples/hemisphere */
17
18		#define GRIDSTEP        2               /* our grid step size */
19		#define SAMPRES         (GRIDRES/GRIDSTEP)
#	Line 26 | Line 26 | double overall_max = .0;               /* overall maximum BSDF valu
26
27		char    ourTempDir[TEMPLEN] = "";       /* our temporary directory */
28
29	–	const FVECT     Xaxis = {1., 0., 0.};
29		const FVECT     Yaxis = {0., 1., 0.};
31	–	const FVECT     Zaxis = {0., 0., 1.};
30
31		const char      frpref[] = "frefl";
32		const char      ftpref[] = "ftrans";
#	Line 50 | Line 48 | const double   sph_xoffset = 15.;
48		char    *progname;
49
50		/* Get Fibonacci sphere vector (0 to NINCIDENT-1) */
51	<	static void
51	>	static RREAL *
52		get_ivector(FVECT iv, int i)
53		{
56	–	const double    zstep = 1./(2*NINCIDENT-1);
54		const double    phistep = PI*(3. - 2.236067978);
55		double          r;
56
57	<	iv[2] = 1. - (i+.5)*zstep;
57	>	iv[2] = 1. - (i+.5)*(1./NINCIDENT);
58		r = sqrt(1. - iv[2]*iv[2]);
59		iv[0] = r * cos((i+1.)*phistep);
60		iv[1] = r * sin((i+1.)*phistep);
61	+
62	+	return(iv);
63		}
64
65	+	/* Convert incident vector into sphere position */
66	+	static RREAL *
67	+	cvt_sposition(FVECT sp, const FVECT iv, int inc_side)
68	+	{
69	+	sp[0] = -iv[0]*sph_rad + inc_side*sph_xoffset;
70	+	sp[1] = -iv[1]*sph_rad;
71	+	sp[2] = iv[2]*sph_rad;
72	+
73	+	return(sp);
74	+	}
75	+
76		/* Get temporary file name */
77		static char *
78		tfile_name(const char *prefix, const char *suffix, int i)
#	Line 249 | Line 259 | build_wRBF(void)
259		RBFNODE *rbf;
260		get_ivector(ivec, i);
261		if (input_orient < 0) {
262	<	ivec[0] = -ivec[0]; ivec[1] = -ivec[1]; ivec[2] = -ivec[2];
262	>	ivec[0] = -ivec[0]; ivec[2] = -ivec[2];
263		}
264		rbf = advect_rbf(ivec, 15000);
265		if (!plotRBF(tfile_name(pref, dsuffix, i), rbf))
#	Line 268 | Line 278 | put_mirror_arrow(const FVECT ivec, int inc_side)
278		FVECT           origin, refl;
279		int             i;
280
281	<	for (i = 3; i--; ) origin[i] = ivec[i]*sph_rad;
272	<	origin[0] -= inc_side*sph_xoffset;
281	>	cvt_sposition(origin, ivec, inc_side);
282
283	<	refl[0] = 2.*ivec[2]*ivec[0];
284	<	refl[1] = 2.*ivec[2]*ivec[1];
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
287		printf("\n# Mirror arrow\n");
#	Line 308 | Line 317 | put_trans_arrow(const FVECT ivec, int inc_side)
317		FVECT           origin;
318		int             i;
319
320	<	for (i = 3; i--; ) origin[i] = ivec[i]*sph_rad;
312	<	origin[0] -= inc_side*sph_xoffset;
320	>	cvt_sposition(origin, ivec, inc_side);
321
322		printf("\n# Transmission arrow\n");
323		printf("\narrow_mat cylinder trans_dir\n0\n0\n7");
#	Line 365 | Line 373 | static int
373		put_BSDFs(void)
374		{
375		const double    scalef = bsdf_rad/(log10(overall_max) - min_log10);
376	<	FVECT           ivec;
376	>	FVECT           ivec, sorg;
377		RREAL           vMtx[3][3];
378		char            *fname;
379		char            cmdbuf[256];
#	Line 377 | Line 385 | put_BSDFs(void)
385		NINCIDENT);
386
387		printf("\nvoid glow arrow_glow\n0\n0\n4 1 0 1 0\n");
388	<	printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void .5 .\n0\n0\n");
388	>	printf("\nvoid mixfunc arrow_mat\n4 arrow_glow void 0.5 .\n0\n0\n");
389
390	<	if (front_comp & SDsampR)
390	>	if (front_comp & SDsampR)                       /* front reflection */
391		for (i = 0; i < NINCIDENT; i++) {
392		get_ivector(ivec, i);
393		put_mirror_arrow(ivec, 1);
394	+	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	<	ivec[0]*sph_rad - sph_xoffset,
388	<	ivec[1]*sph_rad, ivec[2]*sph_rad);
397	>	sorg[0], sorg[1], sorg[2]);
398		nxfa = 6;
399		printf("\nvoid colorfunc scale_pat\n");
400		printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
#	Line 394 | Line 403 | put_BSDFs(void)
403		SDcompXform(vMtx, ivec, Yaxis);
404		nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
405		sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
406	<	scalef, ivec[0]*sph_rad - sph_xoffset,
398	<	ivec[1]*sph_rad, ivec[2]*sph_rad);
406	>	scalef, sorg[0], sorg[1], sorg[2]);
407		nxfa += 6;
408		fname = tfile_name(frpref, dsuffix, i);
409	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -mx -my %s",
410	<	frpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
409	>	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform %s",
410	>	frpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
411		xfargs);
412		if (!run_cmd(cmdbuf))
413		return(0);
414		}
415	<	if (front_comp & SDsampT)
415	>	if (front_comp & SDsampT)                       /* front transmission */
416		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	<	ivec[0]*sph_rad - sph_xoffset,
413	<	ivec[1]*sph_rad, ivec[2]*sph_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",
#	Line 419 | Line 428 | put_BSDFs(void)
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, ivec[0]*sph_rad - sph_xoffset,
423	<	ivec[1]*sph_rad, ivec[2]*sph_rad);
431	>	scalef, sorg[0], sorg[1], sorg[2]);
432		nxfa += 6;
433		fname = tfile_name(ftpref, dsuffix, i);
434	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I -mx -my %s",
435	<	ftpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
434	>	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I %s",
435	>	ftpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
436		xfargs);
437		if (!run_cmd(cmdbuf))
438		return(0);
439		}
440	<	if (back_comp & SDsampR)
440	>	if (back_comp & SDsampR)                        /* rear reflection */
441		for (i = 0; i < NINCIDENT; i++) {
442		get_ivector(ivec, i);
443		put_mirror_arrow(ivec, -1);
444	<	fname = tfile_name(brpref, dsuffix, i);
444	>	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	<	ivec[0]*sph_rad + sph_xoffset,
439	<	ivec[1]*sph_rad, ivec[2]*sph_rad);
447	>	sorg[0], sorg[1], sorg[2]);
448		nxfa = 6;
449		printf("\nvoid colorfunc scale_pat\n");
450		printf("%d bsdf_red bsdf_grn bsdf_blu bsdf2rad.cal\n\t%s\n0\n0\n",
#	Line 445 | Line 453 | put_BSDFs(void)
453		SDcompXform(vMtx, ivec, Yaxis);
454		nxfa = addrot(xfargs, vMtx[0], vMtx[1], vMtx[2]);
455		sprintf(xfargs+strlen(xfargs), " -s %f -t %f %f %f",
456	<	scalef, ivec[0]*sph_rad + sph_xoffset,
449	<	ivec[1]*sph_rad, ivec[2]*sph_rad);
456	>	scalef, sorg[0], sorg[1], sorg[2]);
457		nxfa += 6;
458		fname = tfile_name(brpref, dsuffix, i);
459	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I -ry 180 -mx -my %s",
460	<	brpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
459	>	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -I -ry 180 %s",
460	>	brpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
461		xfargs);
462		if (!run_cmd(cmdbuf))
463		return(0);
464		}
465	<	if (back_comp & SDsampT)
465	>	if (back_comp & SDsampT)                        /* rear transmission */
466		for (i = 0; i < NINCIDENT; i++) {
467		get_ivector(ivec, i);
468		put_trans_arrow(ivec, -1);
469	<	fname = tfile_name(btpref, dsuffix, i);
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	<	ivec[0]*sph_rad + sph_xoffset,
465	<	ivec[1]*sph_rad, ivec[2]*sph_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",
#	Line 471 | Line 478 | put_BSDFs(void)
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, ivec[0]*sph_rad + sph_xoffset,
475	<	ivec[1]*sph_rad, ivec[2]*sph_rad);
481	>	scalef, sorg[0], sorg[1], sorg[2]);
482		nxfa += 6;
483		fname = tfile_name(btpref, dsuffix, i);
484	<	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -ry 180 -mx -my %s",
485	<	btpref, i+1, fname, fname, fname, SAMPRES-1, SAMPRES-1,
484	>	sprintf(cmdbuf, "gensurf scale_mat %s%d %s %s %s %d %d | xform -ry 180 %s",
485	>	btpref, i, fname, fname, fname, SAMPRES-1, SAMPRES-1,
486		xfargs);
487		if (!run_cmd(cmdbuf))
488		return(0);
#	Line 494 | Line 500 | put_matBSDF(const char *XMLfile)
500		printf("\n# Simplified material because we have no XML input\n");
501		printf("\nvoid brightfunc latlong\n2 latlong bsdf2rad.cal\n0\n0\n");
502		if ((front_comp|back_comp) & SDsampT)
503	<	printf("\nlatlong trans %s\n0\n0\n7 .75 .75 .75 0 0 .5 .8\n",
503	>	printf("\nlatlong trans %s\n0\n0\n7 .75 .75 .75 0 .04 .5 .8\n",
504		sph_mat);
505		else
506		printf("\nlatlong plastic %s\n0\n0\n5 .5 .5 .5 0 0\n",
#	Line 524 | Line 530 | static void
530		put_source(void)
531		{
532		printf("\n# Overhead parallel light source\n");
533	<	printf("\nvoid light bright\n0\n0\n3 2000 2000 2000\n");
533	>	printf("\nvoid light bright\n0\n0\n3 2500 2500 2500\n");
534		printf("\nbright source light\n0\n0\n4 0 0 1 2\n");
535		printf("\n# Material used for labels\n");
536		printf("\nvoid trans vellum\n0\n0\n7 1 1 1 0 0 .5 0\n");
#	Line 538 | Line 544 | put_hemispheres(void)
544		printf("\nvoid antimatter anti_sph\n2 void %s\n0\n0\n", sph_mat);
545		if (front_comp) {
546		printf("\n%s sphere Front\n0\n0\n4 %f 0 0 %f\n",
547	<	sph_mat, -sph_xoffset, sph_rad);
547	>	sph_mat, sph_xoffset, sph_rad);
548		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);
550	>	-1.01*sph_rad + sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
551		printf("\nvoid brighttext front_text\n3 helvet.fnt . FRONT\n0\n");
552		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
553	<	-.22*sph_rad - sph_xoffset, -1.2*sph_rad,
553	>	-.22*sph_rad + sph_xoffset, -1.4*sph_rad,
554		.35/5.*sph_rad, -1.6*.35/5.*sph_rad);
555		printf("\nfront_text alias front_label_mat vellum\n");
556		printf("\nfront_label_mat polygon front_label\n0\n0\n12");
557		printf("\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n",
558	<	-.25*sph_rad - sph_xoffset, -1.1*sph_rad,
559	<	-.25*sph_rad - sph_xoffset, (-1.2-1.6*.35/5.-.1)*sph_rad,
560	<	.25*sph_rad - sph_xoffset, (-1.2-1.6*.35/5.-.1)*sph_rad,
561	<	.25*sph_rad - sph_xoffset, -1.1*sph_rad );
558	>	-.25*sph_rad + sph_xoffset, -1.3*sph_rad,
559	>	-.25*sph_rad + sph_xoffset, (-1.4-1.6*.35/5.-.1)*sph_rad,
560	>	.25*sph_rad + sph_xoffset, (-1.4-1.6*.35/5.-.1)*sph_rad,
561	>	.25*sph_rad + sph_xoffset, -1.3*sph_rad );
562		}
563		if (back_comp) {
564		printf("\n%s bubble Back\n0\n0\n4 %f 0 0 %f\n",
565	<	sph_mat, sph_xoffset, sph_rad);
565	>	sph_mat, -sph_xoffset, sph_rad);
566		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);
568	>	-1.01*sph_rad - sph_xoffset, -1.01*sph_rad, -1.01*sph_rad);
569		printf("\nvoid brighttext back_text\n3 helvet.fnt . BACK\n0\n");
570		printf("12\n\t%f %f 0\n\t%f 0 0\n\t0 %f 0\n\t.01 1 -.1\n",
571	<	-.22*sph_rad + sph_xoffset, -1.2*sph_rad,
571	>	-.22*sph_rad - sph_xoffset, -1.4*sph_rad,
572		.35/4.*sph_rad, -1.6*.35/4.*sph_rad);
573		printf("\nback_text alias back_label_mat vellum\n");
574		printf("\nback_label_mat polygon back_label\n0\n0\n12");
575		printf("\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n\t%f %f 0\n",
576	<	-.25*sph_rad + sph_xoffset, -1.1*sph_rad,
577	<	-.25*sph_rad + sph_xoffset, (-1.2-1.6*.35/4.-.1)*sph_rad,
578	<	.25*sph_rad + sph_xoffset, (-1.2-1.6*.35/4.-.1)*sph_rad,
579	<	.25*sph_rad + sph_xoffset, -1.1*sph_rad );
576	>	-.25*sph_rad - sph_xoffset, -1.3*sph_rad,
577	>	-.25*sph_rad - sph_xoffset, (-1.4-1.6*.35/4.-.1)*sph_rad,
578	>	.25*sph_rad - sph_xoffset, (-1.4-1.6*.35/4.-.1)*sph_rad,
579	>	.25*sph_rad - sph_xoffset, -1.3*sph_rad );
580		}
581		}
582
#	Line 579 | Line 585 | static void
585		put_scale(void)
586		{
587		const double    max_log10 = log10(overall_max);
588	<	const double    leg_width = 2.*.75*(sph_xoffset - sph_rad);
588	>	const double    leg_width = 2.*.75*(fabs(sph_xoffset) - sph_rad);
589		const double    leg_height = 2.*sph_rad;
590		const int       text_lines = 6;
591		const int       text_digits = 8;
#	Line 623 | Line 629 | put_scale(void)
629		return;
630		printf("\nvoid brighttext BSDFname\n3 helvet.fnt . \"%s\"\n0\n12\n", bsdf_name);
631		printf("\t%f %f 0\n", -.95*leg_width, -.6*leg_height);
632	<	printf("\t%f 0 0\n", .4/strlen(bsdf_name)*leg_width);
632	>	printf("\t%f 0 0\n", 1.8/strlen(bsdf_name)*leg_width);
633		printf("\t0 %f 0\n", -.1*leg_height);
634		printf("\t.01 1 -.1\n");
635		printf("\nBSDFname alias name_mat vellum\n");
#	Line 678 | Line 684 | convert_mgf(const char *mgfdata)
684		sprintf(cmdbuf, "xform -t %f %f %f -s %f -t %f %f 0 %s",
685		-.5*(xmin+xmax), -.5*(ymin+ymax), -zmax,
686		1.5*sph_rad/max_dim,
687	<	-sph_xoffset, -2.5*sph_rad,
687	>	sph_xoffset, -2.5*sph_rad,
688		radfn);
689		if (!run_cmd(cmdbuf))
690		return;
#	Line 688 | Line 694 | convert_mgf(const char *mgfdata)
694		sprintf(cmdbuf, "xform -t %f %f %f -s %f -ry 180 -t %f %f 0 %s",
695		-.5*(xmin+xmax), -.5*(ymin+ymax), -zmin,
696		1.5*sph_rad/max_dim,
697	<	sph_xoffset, -2.5*sph_rad,
697	>	-sph_xoffset, -2.5*sph_rad,
698		radfn);
699		if (!run_cmd(cmdbuf))
700		return;

Diff Legend

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