--- ray/src/rt/rtrace.c	2004/03/30 16:13:01	2.37
+++ ray/src/rt/rtrace.c	2006/04/05 14:30:38	2.54
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtrace.c,v 2.37 2004/03/30 16:13:01 schorsch Exp $";
+static const char	RCSid[] = "$Id: rtrace.c,v 2.54 2006/04/05 14:30:38 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.37 2004
 #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 = 1;			/* 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 */
@@ -74,7 +79,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 */
@@ -85,7 +90,7 @@ int  ambres = 256;			/* ambient resolution */
 int  ambdiv = 1024;			/* ambient divisions */
 int  ambssamp = 512;			/* ambient super-samples */
 int  ambounce = 0;			/* ambient bounces */
-char  *amblist[128];			/* ambient include/exclude list */
+char  *amblist[AMBLLEN];		/* ambient include/exclude list */
 int  ambincl = -1;			/* include == 1, exclude == 0 */
 
 static int  castonly = 0;
@@ -96,8 +101,8 @@ 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, oputn, oputN, oputs, oputw, oputm;
+static oputf_t  oputo, oputd, oputv, oputV, oputl, oputL, oputc, oputp,
+		oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde;
 
 static void setoutput(char *vs);
 static void tranotify(OBJECT obj);
@@ -148,7 +153,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 +166,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,7 +193,7 @@ 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;
 			}
@@ -201,25 +205,36 @@ rtrace(				/* trace rays from file */
 			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 (fflush(stdout) < 0)
+		error(SYSTEM, "write error");
+	if (vcount)
+		error(USER, "unexpected EOF on input");
 	if (fname != NULL)
 		fclose(fp);
 }
 
 
 static void
+trace_sources(void)			/* trace rays to light sources, also */
+{
+	int	sn;
+	
+	for (sn = 0; sn < nsources; sn++)
+		source[sn].sflags |= SFOLLOW;
+}
+
+
+static void
 setoutput(				/* set up output tables */
 	register char  *vs
 )
@@ -229,7 +244,12 @@ setoutput(				/* set up output tables */
 	castonly = 1;
 	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;
@@ -245,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;
@@ -271,9 +297,21 @@ setoutput(				/* set up output tables */
 		case 'w':				/* weight */
 			*table++ = oputw;
 			break;
+		case 'W':				/* coefficient */
+			*table++ = oputW;
+			if (ambounce > 0 && (ambacc > FTINY || ambssamp > 0))
+				error(WARNING,
+					"-otW accuracy depends on -aa 0 -as 0");
+			break;
 		case 'm':				/* modifier */
 			*table++ = oputm;
 			break;
+		case 'M':				/* material */
+			*table++ = oputM;
+			break;
+		case '~':				/* tilde */
+			*table++ = oputtilde;
+			break;
 		}
 	*table = NULL;
 }
@@ -284,7 +322,8 @@ bogusray(void)			/* print out empty record */
 {
 	thisray.rorg[0] = thisray.rorg[1] = thisray.rorg[2] =
 	thisray.rdir[0] = thisray.rdir[1] = thisray.rdir[2] = 0.0;
-	rayorigin(&thisray, NULL, PRIMARY, 1.0);
+	thisray.rmax = 0.0;
+	rayorigin(&thisray, PRIMARY, NULL, NULL);
 	printvals(&thisray);
 }
 
@@ -299,7 +338,7 @@ rad(		/* compute and print ray value(s) */
 	VCOPY(thisray.rorg, org);
 	VCOPY(thisray.rdir, dir);
 	thisray.rmax = dmax;
-	rayorigin(&thisray, NULL, PRIMARY, 1.0);
+	rayorigin(&thisray, PRIMARY, NULL, NULL);
 	if (castonly) {
 		if (!localhit(&thisray, &thescene)) {
 			if (thisray.ro == &Aftplane) {	/* clipped */
@@ -326,7 +365,8 @@ irrad(			/* compute immediate irradiance value */
 		thisray.rorg[i] = org[i] + dir[i];
 		thisray.rdir[i] = -dir[i];
 	}
-	rayorigin(&thisray, NULL, PRIMARY, 1.0);
+	thisray.rmax = 0.0;
+	rayorigin(&thisray, PRIMARY, NULL, NULL);
 					/* pretend we hit surface */
 	thisray.rot = 1.0-1e-4;
 	thisray.rod = 1.0;
@@ -439,7 +479,8 @@ ourtrace(				/* print ray values */
 	tabin(r);
 	for (tp = every_out; *tp != NULL; tp++)
 		(**tp)(r);
-	putchar('\n');
+	if (outform == 'a')
+		putchar('\n');
 }
 
 
@@ -448,7 +489,7 @@ tabin(				/* tab in appropriate amount */
 	RAY  *r
 )
 {
-	register RAY  *rp;
+	const RAY  *rp;
 
 	for (rp = r->parent; rp != NULL; rp = rp->parent)
 		putchar('\t');
@@ -482,9 +523,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));
@@ -498,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
 )
@@ -602,6 +657,20 @@ oputw(				/* print weight */
 
 
 static void
+oputW(				/* print coefficient */
+	RAY  *r
+)
+{
+	double	contr[3];
+
+	raycontrib(contr, r, PRIMARY);
+	(*putreal)(contr[RED]);
+	(*putreal)(contr[GRN]);
+	(*putreal)(contr[BLU]);
+}
+
+
+static void
 oputm(				/* print modifier */
 	RAY  *r
 )
@@ -614,6 +683,33 @@ oputm(				/* print modifier */
 	else
 		putchar('*');
 	putchar('\t');
+}
+
+
+static void
+oputM(				/* print material */
+	RAY  *r
+)
+{
+	OBJREC	*mat;
+
+	if (r->ro != NULL) {
+		if ((mat = findmaterial(r->ro)) != NULL)
+			fputs(mat->oname, stdout);
+		else
+			fputs(VOIDID, stdout);
+	} else
+		putchar('*');
+	putchar('\t');
+}
+
+
+static void
+oputtilde(			/* output tilde (spacer) */
+	RAY  *r
+)
+{
+	fputs("~\t", stdout);
 }