--- ray/src/rt/rtrace.c	2005/06/10 16:49:42	2.45
+++ ray/src/rt/rtrace.c	2009/07/17 06:21:29	2.56
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtrace.c,v 2.45 2005/06/10 16:49:42 greg Exp $";
+static const char	RCSid[] = "$Id: rtrace.c,v 2.56 2009/07/17 06:21:29 greg Exp $";
 #endif
 /*
  *  rtrace.c - program and variables for individual ray tracing.
@@ -29,6 +29,7 @@ static const char	RCSid[] = "$Id: rtrace.c,v 2.45 2005
 #include  "source.h"
 #include  "otypes.h"
 #include  "resolu.h"
+#include  "random.h"
 
 CUBE  thescene;				/* our scene */
 OBJECT	nsceneobjs;			/* number of objects in our scene */
@@ -46,11 +47,19 @@ char  *outvals = "v";			/* output specification */
 
 int  do_irrad = 0;			/* compute irradiance? */
 
+int  rand_samp = 1;			/* pure Monte Carlo sampling? */
+
 void  (*trace)() = NULL;		/* trace call */
 
-char  *tralist[128];			/* list of modifers to trace (or no) */
+#ifndef	MAXMODLIST
+#define	MAXMODLIST	1024		/* maximum modifiers we'll track */
+#endif
+
+char  *tralist[MAXMODLIST];		/* list of modifers to trace (or no) */
 int  traincl = -1;			/* include == 1, exclude == 0 */
-#define	 MAXTSET	511		/* maximum number in trace set */
+#ifndef  MAXTSET
+#define	 MAXTSET	8191		/* maximum number in trace set */
+#endif
 OBJECT	traset[MAXTSET+1]={0};		/* trace include/exclude set */
 
 int  hresolu = 0;			/* horizontal (scan) size */
@@ -96,7 +105,7 @@ typedef void putf_t(double v);
 static putf_t puta, putd, putf;
 
 typedef void oputf_t(RAY *r);
-static oputf_t  oputo, oputd, oputv, oputl, oputL, oputc, oputp,
+static oputf_t  oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp,
 		oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde;
 
 static void setoutput(char *vs);
@@ -210,7 +219,8 @@ rtrace(				/* trace rays from file */
 		if (vcount && !--vcount)		/* check for end */
 			break;
 	}
-	fflush(stdout);
+	if (fflush(stdout) < 0)
+		error(SYSTEM, "write error");
 	if (vcount)
 		error(USER, "unexpected EOF on input");
 	if (fname != NULL)
@@ -230,10 +240,10 @@ trace_sources(void)			/* trace rays to light sources, 
 
 static void
 setoutput(				/* set up output tables */
-	register char  *vs
+	char  *vs
 )
 {
-	register oputf_t **table = ray_out;
+	oputf_t **table = ray_out;
 
 	castonly = 1;
 	while (*vs)
@@ -259,6 +269,12 @@ setoutput(				/* set up output tables */
 			*table++ = oputv;
 			castonly = 0;
 			break;
+		case 'V':				/* contribution */
+			*table++ = oputV;
+			if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
+				error(WARNING,
+					"-otV accuracy depends on -aa 0 -as 0");
+			break;
 		case 'l':				/* effective distance */
 			*table++ = oputl;
 			castonly = 0;
@@ -347,20 +363,17 @@ irrad(			/* compute immediate irradiance value */
 	FVECT  dir
 )
 {
-	register int  i;
-
-	for (i = 0; i < 3; i++) {
-		thisray.rorg[i] = org[i] + dir[i];
-		thisray.rdir[i] = -dir[i];
-	}
+	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);
 					/* pretend we hit surface */
-	thisray.rot = 1.0-1e-4;
+	thisray.rot = 1e-5;
 	thisray.rod = 1.0;
 	VCOPY(thisray.ron, dir);
-	for (i = 0; i < 3; i++)		/* fudge factor */
-		thisray.rop[i] = org[i] + 1e-4*dir[i];
+	VSUM(thisray.rop, org, dir, 1e-4);
 					/* compute and print */
 	(*ofun[Lamb.otype].funp)(&Lamb, &thisray);
 	printvals(&thisray);
@@ -372,7 +385,7 @@ printvals(			/* print requested ray values */
 	RAY  *r
 )
 {
-	register oputf_t **tp;
+	oputf_t **tp;
 
 	if (ray_out[0] == NULL)
 		return;
@@ -385,7 +398,7 @@ printvals(			/* print requested ray values */
 
 static int
 getvec(		/* get a vector from fp */
-	register FVECT  vec,
+	FVECT  vec,
 	int  fmt,
 	FILE  *fp
 )
@@ -393,7 +406,7 @@ getvec(		/* get a vector from fp */
 	static float  vf[3];
 	static double  vd[3];
 	char  buf[32];
-	register int  i;
+	int  i;
 
 	switch (fmt) {
 	case 'a':					/* ascii */
@@ -427,8 +440,8 @@ tranotify(			/* record new modifier */
 )
 {
 	static int  hitlimit = 0;
-	register OBJREC	 *o = objptr(obj);
-	register char  **tralp;
+	OBJREC	 *o = objptr(obj);
+	char  **tralp;
 
 	if (obj == OVOID) {		/* starting over */
 		traset[0] = 0;
@@ -455,7 +468,7 @@ ourtrace(				/* print ray values */
 	RAY  *r
 )
 {
-	register oputf_t **tp;
+	oputf_t **tp;
 
 	if (every_out[0] == NULL)
 		return;
@@ -526,6 +539,21 @@ oputv(				/* print value */
 
 
 static void
+oputV(				/* print value contribution */
+	RAY *r
+)
+{
+	double	contr[3];
+
+	raycontrib(contr, r, PRIMARY);
+	multcolor(contr, r->rcol);
+	(*putreal)(contr[RED]);
+	(*putreal)(contr[GRN]);
+	(*putreal)(contr[BLU]);
+}
+
+
+static void
 oputl(				/* print effective distance */
 	RAY  *r
 )
@@ -630,16 +658,16 @@ oputw(				/* print weight */
 
 
 static void
-oputW(				/* print contribution */
+oputW(				/* print coefficient */
 	RAY  *r
 )
 {
-	COLOR	contr;
+	double	contr[3];
 
 	raycontrib(contr, r, PRIMARY);
-	(*putreal)(colval(contr,RED));
-	(*putreal)(colval(contr,GRN));
-	(*putreal)(colval(contr,BLU));
+	(*putreal)(contr[RED]);
+	(*putreal)(contr[GRN]);
+	(*putreal)(contr[BLU]);
 }