--- ray/src/rt/rtrace.c	2005/06/10 16:49:42	2.45
+++ ray/src/rt/rtrace.c	2005/06/21 15:06:50	2.48
@@ -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.48 2005/06/21 15:06:50 greg Exp $";
 #endif
 /*
  *  rtrace.c - program and variables for individual ray tracing.
@@ -46,11 +46,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	1024		/* maximum number in trace set */
+#endif
 OBJECT	traset[MAXTSET+1]={0};		/* trace include/exclude set */
 
 int  hresolu = 0;			/* horizontal (scan) size */
@@ -193,7 +197,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);
@@ -634,12 +638,12 @@ oputW(				/* print contribution */
 	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]);
 }