--- ray/src/rt/rtrace.c	2005/06/10 16:49:42	2.45
+++ ray/src/rt/rtrace.c	2006/02/22 17:05:36	2.52
@@ -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.52 2006/02/22 17:05:36 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,15 @@ char  *outvals = "v";			/* output specification */
 
 int  do_irrad = 0;			/* compute irradiance? */
 
+int  rand_samp = 0;			/* pure Monte Carlo sampling? */
+
 void  (*trace)() = NULL;		/* trace call */
 
 char  *tralist[128];			/* 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	8192		/* maximum number in trace set */
+#endif
 OBJECT	traset[MAXTSET+1]={0};		/* trace include/exclude set */
 
 int  hresolu = 0;			/* horizontal (scan) size */
@@ -96,7 +101,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);
@@ -193,7 +198,7 @@ rtrace(				/* trace rays from file */
 				nextflush = hresolu;
 			}
 		} else {
-			samplendx++;
+			samplendx = rand_samp ? random() : samplendx+1;
 							/* compute and print */
 			if (imm_irrad)
 				irrad(orig, direc);
@@ -210,7 +215,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)
@@ -259,6 +265,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;
@@ -526,6 +538,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 +657,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]);
 }