--- ray/src/rt/rcontrib.c	2012/06/15 00:57:40	2.6
+++ ray/src/rt/rcontrib.c	2012/06/16 17:30:13	2.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcontrib.c,v 2.6 2012/06/15 00:57:40 greg Exp $";
+static const char RCSid[] = "$Id: rcontrib.c,v 2.9 2012/06/16 17:30:13 greg Exp $";
 #endif
 /*
  * Accumulate ray contributions for a set of materials
@@ -27,7 +27,7 @@ int	do_irrad = 0;			/* compute irradiance? */
 
 int	rand_samp = 1;			/* pure Monte Carlo sampling? */
 
-double	dstrsrc = 0.0;			/* square source distribution */
+double	dstrsrc = 0.9;			/* square source distribution */
 double	shadthresh = .03;		/* shadow threshold */
 double	shadcert = .75;			/* shadow certainty */
 int	directrelay = 3;		/* number of source relays */
@@ -178,9 +178,6 @@ rcinit()
 					/* set shared memory boundary */
 		shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY");
 	}
-	if ((nproc > 1) & (accumulate <= 0))
-		put_zero_record(0);	/* prime our queue to accumulate */
-
 	if (yres > 0) {			/* set up flushing & ray counts */
 		if (xres > 0)
 			raysleft = (RNUMBER)xres*yres;
@@ -199,17 +196,18 @@ rcinit()
 		return;			/* return to main processing loop */
 
 	if (recover) {			/* recover previous output? */
-		if (accumulate <= 0) {
+		if (accumulate <= 0)
 			reload_output();
-			if (nproc > 1)
-				queue_modifiers();
-		} else
+		else
 			recover_output();
 	}
 	if (nproc == 1)			/* single process? */
 		return;
-
-	parental_loop();		/* else run controller */
+					/* else run appropriate controller */
+	if (accumulate <= 0)
+		feeder_loop();
+	else
+		parental_loop();
 	quit(0);			/* parent musn't return! */
 }
 
@@ -244,43 +242,36 @@ trace_contrib(RAY *r)
 }
 
 
+/* Evaluate irradiance contributions */
 static void
-rayirrad(			/* compute irradiance rather than radiance */
-	RAY *r
-)
+eval_irrad(FVECT org, FVECT dir)
 {
-	r->rot = 1e-5;			/* pretend we hit surface */
-	VSUM(r->rop, r->rorg, r->rdir, r->rot);
-	r->ron[0] = -r->rdir[0];
-	r->ron[1] = -r->rdir[1];
-	r->ron[2] = -r->rdir[2];
-	r->rod = 1.0;
-					/* compute result */
-	r->revf = raytrace;
-	(*ofun[Lamb.otype].funp)(&Lamb, r);
-	r->revf = rayirrad;
+	RAY	thisray;
+
+	VSUM(thisray.rorg, org, dir, 1.1e-4);
+	thisray.rdir[0] = -dir[0];
+	thisray.rdir[1] = -dir[1];
+	thisray.rdir[2] = -dir[2];
+	thisray.rmax = 0.0;
+	rayorigin(&thisray, PRIMARY, NULL, NULL);
+	thisray.rot = 1e-5;		/* pretend we hit surface */
+	thisray.rod = 1.0;
+	VSUM(thisray.rop, org, dir, 1e-4);
+	samplendx++;			/* compute result */
+	(*ofun[Lamb.otype].funp)(&Lamb, &thisray);
 }
 
 
-/* Evaluate ray contributions */
+/* Evaluate radiance contributions */
 static void
-eval_ray(FVECT  org, FVECT  dir, double	dmax)
+eval_rad(FVECT org, FVECT dir, double dmax)
 {
 	RAY	thisray;
 					/* set up ray */
+	VCOPY(thisray.rorg, org);
+	VCOPY(thisray.rdir, dir);
+	thisray.rmax = dmax;
 	rayorigin(&thisray, PRIMARY, NULL, NULL);
-	if (imm_irrad) {
-		VSUM(thisray.rorg, org, dir, 1.1e-4);
-		thisray.rdir[0] = -dir[0];
-		thisray.rdir[1] = -dir[1];
-		thisray.rdir[2] = -dir[2];
-		thisray.rmax = 0.0;
-		thisray.revf = rayirrad;
-	} else {
-		VCOPY(thisray.rorg, org);
-		VCOPY(thisray.rdir, dir);
-		thisray.rmax = dmax;
-	}
 	samplendx++;			/* call ray evaluation */
 	rayvalue(&thisray);
 }
@@ -335,15 +326,17 @@ rcontrib()
 			if ((yres <= 0) | (xres <= 0))
 				waitflush = 1;		/* flush right after */
 			account = 1;
-		} else {				/* else compute */
-			eval_ray(orig, direc, lim_dist ? d : 0.0);
+		} else if (imm_irrad) {			/* else compute */
+			eval_irrad(orig, direc);
+		} else {
+			eval_rad(orig, direc, lim_dist ? d : 0.0);
 		}
 		done_contrib();		/* accumulate/output */
 		++lastdone;
 		if (raysleft && !--raysleft)
 			break;		/* preemptive EOI */
 	}
-	if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) {
+	if ((accumulate <= 0) | (account < accumulate)) {
 		if (account < accumulate) {
 			error(WARNING, "partial accumulation in final record");
 			accumulate -= account;
@@ -351,7 +344,7 @@ rcontrib()
 		account = 1;		/* output accumulated totals */
 		done_contrib();
 	}
+	lu_done(&ofiletab);		/* close output files */
 	if (raysleft)
 		error(USER, "unexpected EOF on input");
-	lu_done(&ofiletab);		/* close output files */
 }