ViewVC Help

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

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

Comparing ray/src/rt/rtrace.c (file contents):
Revision 2.84 by greg, Wed Aug 14 22:33:02 2019 UTC vs.
Revision 2.85 by greg, Sun Mar 1 05:38:22 2020 UTC

#	Line 117 | Line 117 | rtrace(                                /* trace rays from file */
117		{
118		unsigned long  vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu
119		: (unsigned long)vresolu;
120	<	long  nextflush = (vresolu > 0) & (hresolu > 1) ? 0 : hresolu;
120	>	long  nextflush = (!vresolu | (hresolu <= 1)) * hresolu;
121		int  something2flush = 0;
122		FILE  *fp;
123		double  d;
#	Line 168 | Line 168 | rtrace(                                /* trace rays from file */
168
169		d = normalize(direc);
170		if (d == 0.0) {                         /* zero ==> flush */
171	<	if ((--nextflush <= 0) | !vcount && something2flush) {
171	>	if (something2flush) {
172		if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
173		error(USER, "child(ren) died");
174		bogusray();
175		fflush(stdout);
176		something2flush = 0;
177	<	nextflush = (vresolu > 0) & (hresolu > 1) ? 0 :
178	<	hresolu;
177	>	nextflush = (!vresolu | (hresolu <= 1)) * hresolu;
178		} else
179		bogusray();
180		} else {                                /* compute and print */

Diff Legend

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