--- ray/src/rt/rcontrib.c	2016/04/27 21:11:32	2.28
+++ ray/src/rt/rcontrib.c	2020/09/09 21:28:19	2.37
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcontrib.c,v 2.28 2016/04/27 21:11:32 greg Exp $";
+static const char RCSid[] = "$Id: rcontrib.c,v 2.37 2020/09/09 21:28:19 greg Exp $";
 #endif
 /*
  * Accumulate ray contributions for a set of materials
@@ -21,15 +21,14 @@ int	dimlist[MAXDIM];		/* sampling dimensions */
 int	ndims = 0;			/* number of sampling dimensions */
 int	samplendx = 0;			/* index for this sample */
 
-static void	trace_contrib(RAY *r);	/* our trace callback */
-void	(*trace)() = trace_contrib;
+void	(*trace)() = NULL;		/* trace call (NULL before rcinit) */
 
 int	do_irrad = 0;			/* compute irradiance? */
 
 int	rand_samp = 1;			/* pure Monte Carlo sampling? */
 
 double	dstrsrc = 0.9;			/* square source distribution */
-double	shadthresh = .03;		/* shadow threshold */
+double	shadthresh = 0.;		/* shadow threshold */
 double	shadcert = .75;			/* shadow certainty */
 int	directrelay = 3;		/* number of source relays */
 int	vspretest = 512;		/* virtual source pretest density */
@@ -41,7 +40,7 @@ COLOR	salbedo = BLKCOLOR;		/* global scattering albedo
 double	seccg = 0.;			/* global scattering eccentricity */
 double	ssampdist = 0.;			/* scatter sampling distance */
 
-double	specthresh = .15;		/* specular sampling threshold */
+double	specthresh = .02;		/* specular sampling threshold */
 double	specjitter = 1.;		/* specular sampling jitter */
 
 int	backvis = 1;			/* back face visibility */
@@ -52,7 +51,7 @@ double	minweight = 2e-3;		/* minimum ray weight */
 char	*ambfile = NULL;		/* ambient file name */
 COLOR	ambval = BLKCOLOR;		/* ambient value */
 int	ambvwt = 0;			/* initial weight for ambient value */
-double	ambacc = 0;			/* ambient accuracy */
+double	ambacc = 0.;			/* ambient accuracy */
 int	ambres = 256;			/* ambient resolution */
 int	ambdiv = 350;			/* ambient divisions */
 int	ambssamp = 0;			/* ambient super-samples */
@@ -67,6 +66,8 @@ long	waitflush;			/* how long until next flush */
 RNUMBER	lastray = 0;			/* last ray number sent */
 RNUMBER	lastdone = 0;			/* last ray output */
 
+static void	trace_contrib(RAY *r);	/* our trace callback */
+
 static void mcfree(void *p) { epfree((*(MODCONT *)p).binv); free(p); }
 
 LUTAB	modconttab = LU_SINIT(NULL,mcfree);	/* modifier lookup table */
@@ -135,11 +136,15 @@ addmodifier(char *modn, char *outf, char *prms, char *
 	mp->modname = modn;		/* XXX assumes static string */
 	mp->params = prms;		/* XXX assumes static string */
 	mp->binv = ebinv;
+	mp->bin0 = 0;
 	mp->nbins = bincnt;
 	memset(mp->cbin, 0, sizeof(DCOLOR)*bincnt);
-					/* allocate output streams */
-	for (i = bincnt; i-- > 0; )
-		getostream(mp->outspec, mp->modname, i, 1);
+					/* figure out starting bin */
+	while (!getostream(mp->outspec, mp->modname, mp->bin0, 1))
+		mp->bin0++;
+					/* allocate other output streams */
+	for (i = 0; ++i < mp->nbins; )
+		getostream(mp->outspec, mp->modname, mp->bin0+i, 1);
 	lep->data = (char *)mp;
 	return(mp);
 }
@@ -167,13 +172,42 @@ addmodfile(char *fname, char *outf, char *prms, char *
 }
 
 
+/* Check if we have any more rays left (and report progress) */
+int
+morays(void)
+{
+	static RNUMBER	total_rays;
+	static time_t	tstart, last_report;
+	time_t		tnow;
+
+	if (!raysleft)
+		return(1);	/* unknown total, so nothing to do or say */
+
+	if (report_intvl > 0 && (tnow = time(0)) >= last_report+report_intvl) {
+		if (!total_rays) {
+			total_rays = raysleft;
+			tstart = tnow;
+		}
+		sprintf(errmsg, "%.2f%% done after %.3f hours",
+				100.-100.*raysleft/total_rays,
+				(1./3600.)*(tnow - tstart));
+		eputs(errmsg);
+		last_report = tnow;
+	}
+	return(--raysleft);
+}
+
+
+/* Quit program */
 void
-quit(			/* quit program */
+quit(
 	int  code
 )
 {
 	if (nchild > 0)		/* close children if any */
 		end_children(code != 0);
+	else if (nchild < 0)
+		_exit(code);	/* avoid flush() in child */
 	exit(code);
 }
 
@@ -192,6 +226,7 @@ rcinit(void)
 					/* set shared memory boundary */
 		shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY");
 	}
+	trace = trace_contrib;		/* set up trace call-back */
 	for (i = 0; i < nsources; i++)	/* tracing to sources as well */
 		source[i].sflags |= SFOLLOW;
 	if (yres > 0) {			/* set up flushing & ray counts */
@@ -275,7 +310,7 @@ eval_irrad(FVECT org, FVECT dir)
 	thisray.rmax = 0.0;
 	rayorigin(&thisray, PRIMARY, NULL, NULL);
 					/* pretend we hit surface */
-	thisray.rt = thisray.rot = 1e-5;
+	thisray.rxt = thisray.rot = 1e-5;
 	thisray.rod = 1.0;
 	VCOPY(thisray.ron, dir);
 	VSUM(thisray.rop, org, dir, 1e-4);
@@ -356,7 +391,7 @@ rcontrib(void)
 		}
 		done_contrib();		/* accumulate/output */
 		++lastdone;
-		if (raysleft && !--raysleft)
+		if (!morays())
 			break;		/* preemptive EOI */
 	}
 	if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) {