ViewVC Help

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

root/radiance/src/cv/bsdf2rad.c

Comparing src/cv/bsdf2rad.c (file contents):
Revision 2.8 by greg, Mon Mar 24 05:36:40 2014 UTC vs.
Revision 2.13 by greg, Mon Sep 15 00:54:03 2014 UTC

#	Line 22 | Line 22 | const float    colarr[6][3] = {
22		.5, 1., 1.
23		};
24
25	+	#ifdef _WIN32
26	+	char    validf[] = "-e \"valid(s,t)=X`SYS(s,t)^2+Y`SYS(s,t)^2+Z`SYS(s,t)^2-1e-7\"";
27	+	#else
28	+	char    validf[] = "-e 'valid(s,t)=X`SYS(s,t)^2+Y`SYS(s,t)^2+Z`SYS(s,t)^2-1e-7'";
29	+	#endif
30	+
31		char    *progname;
32
33		/* Produce a Radiance model plotting the indicated incident direction(s) */
#	Line 94 | Line 100 | main(int argc, char *argv[])
100		min_log = log(bsdf_min*.5 + 1e-5);
101		/* output BSDF rep. */
102		for (n = 0; (n < 6) & (2*n+3 < argc); n++) {
103	<	double  theta = atof(argv[2*n+2]);
103	>	double  theta = (M_PI/180.)*atof(argv[2*n+2]);
104	>	double  phi = (M_PI/180.)*atof(argv[2*n+3]);
105	>	if (theta < -FTINY) {
106	>	fprintf(stderr, "%s: theta values must be positive\n",
107	>	progname);
108	>	return(1);
109	>	}
110		if (inpXML) {
111	<	input_orient = (theta <= 90.) ? 1 : -1;
111	>	input_orient = (theta <= M_PI/2.) ? 1 : -1;
112		output_orient = doTrans ? -input_orient : input_orient;
113		}
114	<	idir[2] = sin((M_PI/180.)*theta);
115	<	idir[0] = idir[2] * cos((M_PI/180.)*atof(argv[2*n+3]));
116	<	idir[1] = idir[2] * sin((M_PI/180.)*atof(argv[2*n+3]));
114	>	idir[2] = sin(theta);
115	>	idir[0] = idir[2] * cos(phi);
116	>	idir[1] = idir[2] * sin(phi);
117		idir[2] = input_orient * sqrt(1. - idir[2]*idir[2]);
118		#ifdef DEBUG
119		fprintf(stderr, "Computing BSDF for incident direction (%.1f,%.1f)\n",
#	Line 112 | Line 124 | main(int argc, char *argv[])
124		#ifdef DEBUG
125		if (inpXML)
126		fprintf(stderr, "Hemispherical %s: %.3f\n",
127	<	(output_orient > 0 ? "reflection" : "transmission"),
127	>	(output_orient > 0 ^ input_orient > 0 ?
128	>	"transmission" : "reflection"),
129		SDdirectHemi(idir, SDsampSp|SDsampDf |
130	<	(output_orient > 0 ?
131	<	SDsampR : SDsampT), &myBSDF));
130	>	(output_orient > 0 ^ input_orient > 0 ?
131	>	SDsampT : SDsampR), &myBSDF));
132		else if (rbf == NULL)
133		fputs("Empty RBF\n", stderr);
134		else
135		fprintf(stderr, "Hemispherical %s: %.3f\n",
136	<	(output_orient > 0 ? "reflection" : "transmission"),
136	>	(output_orient > 0 ^ input_orient > 0 ?
137	>	"transmission" : "reflection"),
138		rbf->vtotal);
139		#endif
140		printf("void trans tmat\n0\n0\n7 %f %f %f .04 .04 .9 1\n",
#	Line 130 | Line 144 | main(int argc, char *argv[])
144		1.-colarr[n][0], 1.-colarr[n][1], 1.-colarr[n][2]);
145		for (i = 0; i < rbf->nrbf; i++) {
146		ovec_from_pos(odir, rbf->rbfa[i].gx, rbf->rbfa[i].gy);
147	<	bsdf = eval_rbfrep(rbf, odir) / (output_orient*odir[2]);
147	>	bsdf = eval_rbfrep(rbf, odir);
148		bsdf = log(bsdf + 1e-5) - min_log;
149		printf("pmat sphere p%d\n0\n0\n4 %f %f %f %f\n",
150		i+1, odir[0]*bsdf, odir[1]*bsdf, odir[2]*bsdf,
#	Line 138 | Line 152 | main(int argc, char *argv[])
152		}
153		}
154		fflush(stdout);
155	<	sprintf(buf, "gensurf tmat bsdf%d - - - %d %d", n+1,
156	<	GRIDRES-1, GRIDRES-1);
155	>	sprintf(buf, "gensurf tmat bsdf%d - - - %d %d %s", n+1,
156	>	GRIDRES-1, GRIDRES-1, validf);
157		fp = popen(buf, "w");
158		if (fp == NULL) {
159		fprintf(stderr, "%s: cannot open '| %s'\n", progname, buf);
#	Line 155 | Line 169 | main(int argc, char *argv[])
169		return(1);
170		bsdf = sval.cieY;
171		} else
172	<	bsdf = eval_rbfrep(rbf, odir) /
159	<	(output_orient*odir[2]);
172	>	bsdf = eval_rbfrep(rbf, odir);
173		bsdf = log(bsdf + 1e-5) - min_log;
174		fprintf(fp, "%.8e %.8e %.8e\n",
175		odir[0]*bsdf, odir[1]*bsdf, odir[2]*bsdf);

Diff Legend

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