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.73 by greg, Tue Nov 13 19:58:33 2018 UTC vs.
Revision 2.74 by greg, Tue Jan 8 00:16:31 2019 UTC

#	Line 163 | Line 163 | rtrace(                                /* trace rays from file */
163		d = normalize(direc);
164		if (d == 0.0) {                         /* zero ==> flush */
165		if (--nextflush <= 0 || !vcount) {
166	<	if (nproc > 1 && ray_fifo_flush() < 0)
166	>	if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
167		error(USER, "child(ren) died");
168		bogusray();
169		fflush(stdout);
#	Line 175 | Line 175 | rtrace(                                /* trace rays from file */
175		rtcompute(orig, direc, lim_dist ? d : 0.0);
176		/* flush if time */
177		if (!--nextflush) {
178	<	if (nproc > 1 && ray_fifo_flush() < 0)
178	>	if (ray_pnprocs > 1 && ray_fifo_flush() < 0)
179		error(USER, "child(ren) died");
180		fflush(stdout);
181		nextflush = hresolu;
#	Line 186 | Line 186 | rtrace(                                /* trace rays from file */
186		if (vcount && !--vcount)                /* check for end */
187		break;
188		}
189	<	if (nproc > 1) {                                /* clean up children */
189	>	if (ray_pnprocs > 1) {                          /* clean up children */
190		if (ray_fifo_flush() < 0)
191		error(USER, "unable to complete processing");
192		ray_pclose(0);

Diff Legend

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