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.3 by greg, Mon Jun 11 05:07:55 2012 UTC vs.
Revision 2.5 by greg, Wed Jun 13 00:16:42 2012 UTC

#	Line 63 | Line 63 | int    account;                        /* current accumulation count */
63		RNUMBER raysleft;                       /* number of rays left to trace */
64		long    waitflush;                      /* how long until next flush */
65
66	<	int     lastray = 0;                    /* last ray number sent */
67	<	int     lastdone = 0;                   /* last ray output */
66	>	RNUMBER lastray = 0;                    /* last ray number sent */
67	>	RNUMBER lastdone = 0;                   /* last ray output */
68
69		static void mcfree(void *p) { epfree((*(MODCONT *)p).binv); free(p); }
70
#	Line 212 | Line 212 | rcinit()
212		if ((nproc > 1) & (accumulate <= 0))
213		put_zero_record(0);     /* prime our queue to accumulate */
214
215	–	if (recover) {                  /* recover previous output? */
216	–	if (accumulate <= 0) {
217	–	reload_output();
218	–	if (nproc > 1)
219	–	queue_modifiers();
220	–	} else
221	–	recover_output();
222	–	}
215		if (yres > 0) {                 /* set up flushing & ray counts */
216		if (xres > 0)
217		raysleft = (RNUMBER)xres*yres;
#	Line 234 | Line 226 | rcinit()
226		for (i = 0; i < nsources; i++)
227		source[i].sflags |= SFOLLOW;
228
229	<	if (nproc == 1 || in_rchild())  /* single process or child */
229	>	if (nproc > 1 && in_rchild())   /* forked child? */
230		return;                 /* return to main processing loop */
231
232	+	if (recover) {                  /* recover previous output? */
233	+	if (accumulate <= 0) {
234	+	reload_output();
235	+	if (nproc > 1)
236	+	queue_modifiers();
237	+	} else
238	+	recover_output();
239	+	}
240	+	if (nproc == 1)                 /* single process? */
241	+	return;
242	+
243		parental_loop();                /* else run controller */
244		quit(0);                        /* parent musn't return! */
245		}
#	Line 350 | Line 353 | rcontrib()
353		#endif
354		while (getvec(orig) == 0 && getvec(direc) == 0) {
355		d = normalize(direc);
356	<	if ((d == 0.0) & (accumulate != 1)) {
356	>	if (nchild != -1 && (d == 0.0) & (accumulate != 1)) {
357		if (!ignore_warning_given++)
358		error(WARNING,
359		"dummy ray(s) ignored during accumulation\n");
#	Line 362 | Line 365 | rcontrib()
365		if (d == 0.0) {                         /* zero ==> flush */
366		if ((yres <= 0) | (xres <= 0))
367		waitflush = 1;          /* flush right after */
368	+	account = 1;
369		} else {                                /* else compute */
370		eval_ray(orig, direc, lim_dist ? d : 0.0);
371		}
#	Line 370 | Line 374 | rcontrib()
374		if (raysleft && !--raysleft)
375		break;          /* preemptive EOI */
376		}
377	<	if (accumulate <= 0 || account < accumulate) {
377	>	if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) {
378		if (account < accumulate) {
379		error(WARNING, "partial accumulation in final record");
380		accumulate -= account;

Diff Legend

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