[ViewVC] Diff of: radiance/ray/src/rt/normal.c

Comparing ray/src/rt/normal.c (file contents):
Revision 2.58 by greg, Tue Oct 12 19:01:14 2010 UTC vs.
Revision 2.60 by greg, Fri Feb 18 00:40:25 2011 UTC

#	Line 405 \| Line 405 \| *gaussamp( / sample Gaussian specular /*
405		nstarget = 1;
406		}
407		setcolor(scol, 0., 0., 0.);
408	<	dimlist[ndims++] = (int)np->mp;
408	>	dimlist[ndims++] = (int)(size_t)np->mp;
409		maxiter = MAXITER*nstarget;
410		for (nstaken = ntrials = 0; nstaken < nstarget &&
411		ntrials < maxiter; ntrials++) {
#	Line 432 \| Line 432 \| *gaussamp( / sample Gaussian specular /*
432		continue;
433		checknorm(sr.rdir);
434		if (nstarget > 1) { /* W-G-M-D adjustment */
435	<	rayclear(&sr);
435	>	if (nstaken) rayclear(&sr);
436		rayvalue(&sr);
437		d = 2./(1. + r->rod/d);
438		scalecolor(sr.rcol, d);
#	Line 469 \| Line 469 \| *gaussamp( / sample Gaussian specular /*
469		} else
470		nstarget = 1;
471		}
472	<	dimlist[ndims++] = (int)np->mp;
472	>	dimlist[ndims++] = (int)(size_t)np->mp;
473		maxiter = MAXITER*nstarget;
474		for (nstaken = ntrials = 0; nstaken < nstarget &&
475		ntrials < maxiter; ntrials++) {
#	Line 493 \| Line 493 \| *gaussamp( / sample Gaussian specular /*
493		if (DOT(sr.rdir, r->ron) >= -FTINY)
494		continue;
495		normalize(sr.rdir); /* OK, normalize */
496	<	if (nstarget > 1) /* multi-sampling */
496	>	if (nstaken) /* multi-sampling */
497		rayclear(&sr);
498		rayvalue(&sr);
499		multcolor(sr.rcol, sr.rcoef);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines