ViewVC Help

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

root/Development/ray/src/rt/rcontrib.c

Comparing ray/src/rt/rcontrib.c (file contents):
Revision 2.17 by greg, Thu Nov 15 15:26:52 2012 UTC vs.
Revision 2.19 by greg, Sat Jul 19 00:07:03 2014 UTC

#	Line 216 | Line 216 | static void
216		trace_contrib(RAY *r)
217		{
218		MODCONT *mp;
219	+	double  bval;
220		int     bn;
221		RREAL   contr[3];
222
#	Line 231 | Line 232 | trace_contrib(RAY *r)
232		return;
233
234		worldfunc(RCCONTEXT, r);                /* else get bin number */
235	<	bn = (int)(evalue(mp->binv) + .5);
236	<	if ((bn < 0) | (bn >= mp->nbins)) {
235	>	if ((bval = evalue(mp->binv)) <= -.5)
236	>	return;                         /* silently ignore */
237	>	if ((bn = (int)(bval + .5)) >= mp->nbins) {
238		error(WARNING, "bad bin number (ignored)");
239		return;
240		}
#	Line 326 | Line 328 | rcontrib()
328		lastray = lastdone = 0;
329		++lastray;
330		if (d == 0.0) {                         /* zero ==> flush */
331	<	if ((yres <= 0) | (xres <= 0))
331	>	if ((yres <= 0) | (xres <= 1))
332		waitflush = 1;          /* flush after */
333		if (nchild == -1)
334		account = 1;

Diff Legend

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