--- ray/src/rt/rcontrib.c	2012/07/13 05:07:06	2.15
+++ ray/src/rt/rcontrib.c	2016/09/12 20:31:34	2.29
@@ -1,11 +1,13 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcontrib.c,v 2.15 2012/07/13 05:07:06 greg Exp $";
+static const char RCSid[] = "$Id: rcontrib.c,v 2.29 2016/09/12 20:31:34 greg Exp $";
 #endif
 /*
  * Accumulate ray contributions for a set of materials
  * Initialization and calculation routines
  */
 
+#include "copyright.h"
+
 #include "rcontrib.h"
 #include "otypes.h"
 #include "source.h"
@@ -88,7 +90,7 @@ formstr(				/* return format identifier */
 
 /* Add modifier to our list to track */
 MODCONT *
-addmodifier(char *modn, char *outf, char *binv, int bincnt)
+addmodifier(char *modn, char *outf, char *prms, char *binv, int bincnt)
 {
 	LUENT	*lep = lu_find(&modconttab,modn);
 	MODCONT	*mp;
@@ -99,8 +101,14 @@ addmodifier(char *modn, char *outf, char *binv, int bi
 		sprintf(errmsg, "duplicate modifier '%s'", modn);
 		error(USER, errmsg);
 	}
-	if (nmods >= MAXMODLIST)
-		error(INTERNAL, "too many modifiers");
+	if (nmods >= MAXMODLIST) {
+		sprintf(errmsg, "too many modifiers (%d limit)", MAXMODLIST);
+		error(INTERNAL, errmsg);
+	}
+	if (!strcmp(modn, VOIDID)) {
+		sprintf(errmsg, "cannot track '%s' modifier", VOIDID);
+		error(USER, errmsg);
+	}
 	modname[nmods++] = modn;	/* XXX assumes static string */
 	lep->key = modn;		/* XXX assumes static string */
 	if (binv == NULL)
@@ -125,12 +133,17 @@ addmodifier(char *modn, char *outf, char *binv, int bi
 		error(SYSTEM, "out of memory in addmodifier");
 	mp->outspec = outf;		/* XXX assumes static string */
 	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);
 }
@@ -138,17 +151,23 @@ addmodifier(char *modn, char *outf, char *binv, int bi
 
 /* Add modifiers from a file list */
 void
-addmodfile(char *fname, char *outf, char *binv, int bincnt)
+addmodfile(char *fname, char *outf, char *prms, char *binv, int bincnt)
 {
 	char	*mname[MAXMODLIST];
 	int	i;
 					/* find the file & store strings */
-	if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) {
+	i = wordfile(mname, MAXMODLIST, getpath(fname, getrlibpath(), R_OK));
+	if (i < 0) {
 		sprintf(errmsg, "cannot find modifier file '%s'", fname);
 		error(SYSTEM, errmsg);
 	}
+	if (i >= MAXMODLIST-1) {
+		sprintf(errmsg, "too many modifiers (%d limit) in file '%s'",
+				MAXMODLIST-1, fname);
+		error(INTERNAL, errmsg);
+	}
 	for (i = 0; mname[i]; i++)	/* add each one */
-		addmodifier(mname[i], outf, binv, bincnt);
+		addmodifier(mname[i], outf, prms, binv, bincnt);
 }
 
 
@@ -165,7 +184,7 @@ quit(			/* quit program */
 
 /* Initialize our process(es) */
 static void
-rcinit()
+rcinit(void)
 {
 	int	i;
 
@@ -216,24 +235,28 @@ static void
 trace_contrib(RAY *r)
 {
 	MODCONT	*mp;
+	double	bval;
 	int	bn;
 	RREAL	contr[3];
 
 	if (r->ro == NULL || r->ro->omod == OVOID)
 		return;
+						/* shadow ray not on source? */
+	if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
+		return;
 
 	mp = (MODCONT *)lu_find(&modconttab,objptr(r->ro->omod)->oname)->data;
 
 	if (mp == NULL)				/* not in our list? */
 		return;
-						/* shadow ray not on source? */
-	if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
-		return;
 
-	worldfunc(RCCONTEXT, r);		/* else get bin number */
-	bn = (int)(evalue(mp->binv) + .5);
-	if ((bn < 0) | (bn >= mp->nbins)) {
-		error(WARNING, "bad bin number (ignored)");
+	worldfunc(RCCONTEXT, r);		/* else set context */
+	set_eparams((char *)mp->params);
+	if ((bval = evalue(mp->binv)) <= -.5)	/* and get bin number */
+		return;				/* silently ignore negatives */
+	if ((bn = (int)(bval + .5)) >= mp->nbins) {
+		sprintf(errmsg, "bad bin number (%d ignored)", bn);
+		error(WARNING, errmsg);
 		return;
 	}
 	raycontrib(contr, r, PRIMARY);		/* compute coefficient */
@@ -255,7 +278,8 @@ eval_irrad(FVECT org, FVECT dir)
 	thisray.rdir[2] = -dir[2];
 	thisray.rmax = 0.0;
 	rayorigin(&thisray, PRIMARY, NULL, NULL);
-	thisray.rot = 1e-5;		/* pretend we hit surface */
+					/* pretend we hit surface */
+	thisray.rt = thisray.rot = 1e-5;
 	thisray.rod = 1.0;
 	VCOPY(thisray.ron, dir);
 	VSUM(thisray.rop, org, dir, 1e-4);
@@ -281,7 +305,7 @@ eval_rad(FVECT org, FVECT dir, double dmax)
 
 /* Accumulate and/or output ray contributions (child or only process) */
 static void
-done_contrib()
+done_contrib(void)
 {
 	MODCONT	*mp;
 	int	i;
@@ -302,7 +326,7 @@ done_contrib()
 
 /* Principal calculation loop (called by main) */
 void
-rcontrib()
+rcontrib(void)
 {
 	static int	ignore_warning_given = 0;
 	FVECT		orig, direc;
@@ -315,7 +339,7 @@ rcontrib()
 #endif
 	while (getvec(orig) == 0 && getvec(direc) == 0) {
 		d = normalize(direc);
-		if (nchild != -1 && (d == 0.0) & (accumulate != 1)) {
+		if (nchild != -1 && (d == 0.0) & (accumulate == 0)) {
 			if (!ignore_warning_given++)
 				error(WARNING,
 				"dummy ray(s) ignored during accumulation\n");
@@ -325,9 +349,10 @@ rcontrib()
 			lastray = lastdone = 0;
 		++lastray;
 		if (d == 0.0) {				/* zero ==> flush */
-			if ((yres <= 0) | (xres <= 0))
-				waitflush = 1;		/* flush right after */
-			account = 1;
+			if ((yres <= 0) | (xres <= 1))
+				waitflush = 1;		/* flush after */
+			if (nchild == -1)
+				account = 1;
 		} else if (imm_irrad) {			/* else compute */
 			eval_irrad(orig, direc);
 		} else {