ViewVC Help

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

root/Development/ray/src/util/rsensor.c

Comparing ray/src/util/rsensor.c (file contents):
Revision 2.11 by greg, Mon Jun 20 23:08:43 2011 UTC vs.
Revision 2.14 by greg, Tue Sep 30 23:14:34 2014 UTC

#	Line 398 | Line 398 | init_ptable(
398		tvals[i] = 1. - ( (1.-frac)*cos(thdiv[t]) +
399		frac*cos(thdiv[t+1]) );
400		/* offset b/c sensor values are centered */
401	<	if (!t || (t < sntp[0]-1) & (frac >= 0.5))
401	>	if ((t < sntp[0]-1) & (!t | (frac >= 0.5))) {
402		frac -= 0.5;
403	<	else {
403	>	} else {
404		frac += 0.5;
405		--t;
406		}
#	Line 544 | Line 544 | comp_sensor(
544		continue;
545		}
546		rr.rmax = .0;
547	<	rayorigin(&rr, PRIMARY, NULL, NULL);
547	>	rayorigin(&rr, PRIMARY|SPECULAR, NULL, NULL);
548		scalecolor(rr.rcoef, sf);
549		if (ray_pqueue(&rr) == 1)
550		addcolor(vsum, rr.rcol);
#	Line 560 | Line 560 | comp_sensor(
560		continue;
561		}
562		rr.rmax = .0;
563	<	rayorigin(&rr, PRIMARY, NULL, NULL);
563	>	rayorigin(&rr, PRIMARY|SPECULAR, NULL, NULL);
564		scalecolor(rr.rcoef, sf);
565		if (ray_pqueue(&rr) == 1)
566		addcolor(vsum, rr.rcol);

Diff Legend

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