ViewVC Help

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

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

Comparing ray/src/cv/bsdf2ttree.c (file contents):
Revision 2.27 by greg, Wed Mar 12 22:24:59 2014 UTC vs.
Revision 2.28 by greg, Mon Mar 24 03:50:28 2014 UTC

#	Line 25 | Line 25 | int                    samp_order = 6;
25		/* super-sampling threshold */
26		const double            ssamp_thresh = 0.35;
27		/* number of super-samples */
28	<	const int               nssamp = 100;
28	>	#ifndef NSSAMP
29	>	#define NSSAMP          100
30	>	#endif
31		/* limit on number of RBF lobes */
32		static int              lobe_lim = 15000;
33		/* progress bar length */
#	Line 200 | Line 202 | eval_isotropic(char *funame)
202		bsdf = eval_rbfrep(rbf, iovec+3) *
203		output_orient/iovec[5];
204		else {
203	–	double      ssa[3], ssvec[6], sum;
204	–	int         ssi;
205		if (assignD) {
206		varset("Dx", '=', -iovec[3]);
207		varset("Dy", '=', -iovec[4]);
#	Line 209 | Line 209 | eval_isotropic(char *funame)
209		++eclock;
210		}
211		bsdf = funvalue(funame, 6, iovec);
212	+	#if (NSSAMP > 0)
213		if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) {
214	<	sum = 0;        /* super-sample voxel */
215	<	for (ssi = nssamp; ssi--; ) {
216	<	SDmultiSamp(ssa, 3, (ssi+frandom())/nssamp);
214	>	int     ssi;
215	>	double  ssa[3], ssvec[6], sum = 0;
216	>	/* super-sample voxel */
217	>	for (ssi = NSSAMP; ssi--; ) {
218	>	SDmultiSamp(ssa, 3, (ssi+frandom()) *
219	>	(1./NSSAMP));
220		ssvec[0] = 2.*(ix+ssa[0])/sqres - 1.;
221		ssvec[1] = .0;
222		ssvec[2] = input_orient *
#	Line 223 | Line 227 | eval_isotropic(char *funame)
227		sqrt(1. - ssvec[3]*ssvec[3] -
228		ssvec[4]*ssvec[4]);
229		if (assignD) {
230	<	varset("Dx", '=', -iovec[3]);
231	<	varset("Dy", '=', -iovec[4]);
232	<	varset("Dz", '=', -iovec[5]);
230	>	varset("Dx", '=', -ssvec[3]);
231	>	varset("Dy", '=', -ssvec[4]);
232	>	varset("Dz", '=', -ssvec[5]);
233		++eclock;
234		}
235		sum += funvalue(funame, 6, ssvec);
236		}
237	<	bsdf = sum/nssamp;
237	>	bsdf = sum/NSSAMP;
238		}
239	+	#endif
240		}
241		if (pctcull >= 0)
242		fwrite(&bsdf, sizeof(bsdf), 1, ofp);
#	Line 311 | Line 316 | eval_anisotropic(char *funame)
316		bsdf = eval_rbfrep(rbf, iovec+3) *
317		output_orient/iovec[5];
318		else {
314	–	double      ssa[4], ssvec[6], sum;
315	–	int         ssi;
319		if (assignD) {
320		varset("Dx", '=', -iovec[3]);
321		varset("Dy", '=', -iovec[4]);
#	Line 320 | Line 323 | eval_anisotropic(char *funame)
323		++eclock;
324		}
325		bsdf = funvalue(funame, 6, iovec);
326	+	#if (NSSAMP > 0)
327		if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) {
328	<	sum = 0;        /* super-sample voxel */
329	<	for (ssi = nssamp; ssi--; ) {
330	<	SDmultiSamp(ssa, 4, (ssi+frandom())/nssamp);
328	>	int     ssi;
329	>	double  ssa[4], ssvec[6], sum = 0;
330	>	/* super-sample voxel */
331	>	for (ssi = NSSAMP; ssi--; ) {
332	>	SDmultiSamp(ssa, 4, (ssi+frandom()) *
333	>	(1./NSSAMP));
334		SDsquare2disk(ssvec, 1.-(ix+ssa[0])/sqres,
335		1.-(iy+ssa[1])/sqres);
336	<	ssvec[2] = output_orient *
336	>	ssvec[2] = input_orient *
337		sqrt(1. - ssvec[0]*ssvec[0] -
338		ssvec[1]*ssvec[1]);
339		SDsquare2disk(ssvec+3, (ox+ssa[2])/sqres,
#	Line 335 | Line 342 | eval_anisotropic(char *funame)
342		sqrt(1. - ssvec[3]*ssvec[3] -
343		ssvec[4]*ssvec[4]);
344		if (assignD) {
345	<	varset("Dx", '=', -iovec[3]);
346	<	varset("Dy", '=', -iovec[4]);
347	<	varset("Dz", '=', -iovec[5]);
345	>	varset("Dx", '=', -ssvec[3]);
346	>	varset("Dy", '=', -ssvec[4]);
347	>	varset("Dz", '=', -ssvec[5]);
348		++eclock;
349		}
350		sum += funvalue(funame, 6, ssvec);
351		}
352	<	bsdf = sum/nssamp;
352	>	bsdf = sum/NSSAMP;
353		}
354	+	#endif
355		}
356		if (pctcull >= 0)
357		fwrite(&bsdf, sizeof(bsdf), 1, ofp);

Diff Legend

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