--- ray/src/rt/rtrace.c	2005/04/19 01:15:06	2.40
+++ 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.40 2005/04/19 01:15:06 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 */
@@ -74,7 +78,7 @@ double  specjitter = 1.;		/* specular sampling jitter 
 
 int  backvis = 1;			/* back face visibility */
 
-int  maxdepth = 8;			/* maximum recursion depth */
+int  maxdepth = -10;			/* maximum recursion depth */
 double  minweight = 2e-3;		/* minimum ray weight */
 
 char  *ambfile = NULL;			/* ambient file name */
@@ -97,7 +101,7 @@ static putf_t puta, putd, putf;
 
 typedef void oputf_t(RAY *r);
 static oputf_t  oputo, oputd, oputv, oputl, oputL, oputc, oputp,
-		oputn, oputN, oputs, oputw, oputW, oputm, oputM;
+		oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde;
 
 static void setoutput(char *vs);
 static void tranotify(OBJECT obj);
@@ -148,7 +152,8 @@ rtrace(				/* trace rays from file */
 	char  *fname
 )
 {
-	long  vcount = hresolu>1 ? hresolu*vresolu : vresolu;
+	unsigned long  vcount = (hresolu > 1) ? (unsigned long)hresolu*vresolu
+					      : vresolu;
 	long  nextflush = hresolu;
 	FILE  *fp;
 	double	d;
@@ -160,10 +165,8 @@ rtrace(				/* trace rays from file */
 		sprintf(errmsg, "cannot open input file \"%s\"", fname);
 		error(SYSTEM, errmsg);
 	}
-#ifdef _WIN32
 	if (inform != 'a')
 		SET_FILE_BINARY(fp);
-#endif
 					/* set up output */
 	setoutput(outvals);
 	switch (outform) {
@@ -189,31 +192,31 @@ rtrace(				/* trace rays from file */
 		d = normalize(direc);
 		if (d == 0.0) {				/* zero ==> flush */
 			bogusray();
-			if (--nextflush <= 0 || vcount <= 0) {
+			if (--nextflush <= 0 || !vcount) {
 				fflush(stdout);
 				nextflush = hresolu;
 			}
 		} else {
-			samplendx++;
+			samplendx = rand_samp ? random() : samplendx+1;
 							/* compute and print */
 			if (imm_irrad)
 				irrad(orig, direc);
 			else
 				rad(orig, direc, lim_dist ? d : 0.0);
 							/* flush if time */
-			if (--nextflush == 0) {
+			if (!--nextflush) {
 				fflush(stdout);
 				nextflush = hresolu;
 			}
 		}
 		if (ferror(stdout))
 			error(SYSTEM, "write error");
-		if (--vcount == 0)			/* check for end */
+		if (vcount && !--vcount)		/* check for end */
 			break;
 	}
 	fflush(stdout);
-	if (vcount > 0)
-		error(USER, "read error");
+	if (vcount)
+		error(USER, "unexpected EOF on input");
 	if (fname != NULL)
 		fclose(fp);
 }
@@ -240,9 +243,11 @@ setoutput(				/* set up output tables */
 	while (*vs)
 		switch (*vs++) {
 		case 'T':				/* trace sources */
+			if (!*vs) break;
 			trace_sources();
 			/* fall through */
 		case 't':				/* trace */
+			if (!*vs) break;
 			*table = NULL;
 			table = every_out;
 			trace = ourtrace;
@@ -288,7 +293,7 @@ setoutput(				/* set up output tables */
 			*table++ = oputW;
 			if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
 				error(WARNING,
-					"-otW accuracy requires -aa 0 -as 0");
+					"-otW accuracy depends on -aa 0 -as 0");
 			break;
 		case 'm':				/* modifier */
 			*table++ = oputm;
@@ -296,6 +301,9 @@ setoutput(				/* set up output tables */
 		case 'M':				/* material */
 			*table++ = oputM;
 			break;
+		case '~':				/* tilde */
+			*table++ = oputtilde;
+			break;
 		}
 	*table = NULL;
 }
@@ -463,7 +471,8 @@ ourtrace(				/* print ray values */
 	tabin(r);
 	for (tp = every_out; *tp != NULL; tp++)
 		(**tp)(r);
-	putchar('\n');
+	if (outform == 'a')
+		putchar('\n');
 }
 
 
@@ -506,9 +515,8 @@ oputv(				/* print value */
 	RAY  *r
 )
 {
-	COLR  cout;
-	
 	if (outform == 'c') {
+		COLR  cout;
 		setcolr(cout,	colval(r->rcol,RED),
 				colval(r->rcol,GRN),
 				colval(r->rcol,BLU));
@@ -630,20 +638,12 @@ oputW(				/* print contribution */
 	RAY  *r
 )
 {
-	COLOR	contr;
-	COLR	cout;
+	double	contr[3];
 
 	raycontrib(contr, r, PRIMARY);
-	if (outform == 'c') {
-		setcolr(cout,	colval(contr,RED),
-				colval(contr,GRN),
-				colval(contr,BLU));
-		fwrite((char *)cout, sizeof(cout), 1, stdout);
-		return;
-	}
-	(*putreal)(colval(contr,RED));
-	(*putreal)(colval(contr,GRN));
-	(*putreal)(colval(contr,BLU));
+	(*putreal)(contr[RED]);
+	(*putreal)(contr[GRN]);
+	(*putreal)(contr[BLU]);
 }
 
 
@@ -678,6 +678,15 @@ oputM(				/* print material */
 	} else
 		putchar('*');
 	putchar('\t');
+}
+
+
+static void
+oputtilde(			/* output tilde (spacer) */
+	RAY  *r
+)
+{
+	fputs("~\t", stdout);
 }