--- ray/src/rt/rtrace.c	1992/10/15 21:13:21	2.8
+++ ray/src/rt/rtrace.c	1997/07/09 11:25:49	2.24
@@ -1,7 +1,7 @@
-/* Copyright (c) 1992 Regents of the University of California */
+/* Copyright (c) 1997 Silicon Graphics, Inc. */
 
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static char SCCSid[] = "$SunId$ SGI";
 #endif
 
 /*
@@ -42,27 +42,40 @@ int  inform = 'a';			/* input format */
 int  outform = 'a';			/* output format */
 char  *outvals = "v";			/* output specification */
 
+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 */
+OBJECT	traset[MAXTSET+1]={0};		/* trace include/exclude set */
+
 int  hresolu = 0;			/* horizontal (scan) size */
 int  vresolu = 0;			/* vertical resolution */
 
 double  dstrsrc = 0.0;			/* square source distribution */
 double  shadthresh = .05;		/* shadow threshold */
 double  shadcert = .5;			/* shadow certainty */
-int  directrelay = 1;			/* number of source relays */
+int  directrelay = 2;			/* number of source relays */
 int  vspretest = 512;			/* virtual source pretest density */
-int  directinvis = 0;			/* sources invisible? */
-double  srcsizerat = .25;		/* maximum ratio source size/dist. */
+int  directvis = 1;			/* sources visible? */
+double  srcsizerat = .2;		/* maximum ratio source size/dist. */
 
+COLOR  cextinction = BLKCOLOR;		/* global extinction coefficient */
+COLOR  salbedo = BLKCOLOR;		/* global scattering albedo */
+double  seccg = 0.;			/* global scattering eccentricity */
+double  ssampdist = 0.;			/* scatter sampling distance */
+
 double  specthresh = .15;		/* specular sampling threshold */
 double  specjitter = 1.;		/* specular sampling jitter */
 
+int  backvis = 1;			/* back face visibility */
+
 int  maxdepth = 6;			/* maximum recursion depth */
 double  minweight = 4e-3;		/* minimum ray weight */
 
 COLOR  ambval = BLKCOLOR;		/* ambient value */
+int  ambvwt = 0;			/* initial weight for ambient value */
 double  ambacc = 0.2;			/* ambient accuracy */
-int  ambres = 32;			/* ambient resolution */
-int  ambdiv = 128;			/* ambient divisions */
+int  ambres = 128;			/* ambient resolution */
+int  ambdiv = 512;			/* ambient divisions */
 int  ambssamp = 0;			/* ambient super-samples */
 int  ambounce = 0;			/* ambient bounces */
 char  *amblist[128];			/* ambient include/exclude list */
@@ -73,10 +86,11 @@ extern OBJREC  Lamb;			/* a Lambertian surface */
 static RAY  thisray;			/* for our convenience */
 
 static int  oputo(), oputd(), oputv(), oputl(), oputL(),
-		oputp(), oputn(), oputs(), oputw(), oputm();
+		oputp(), oputn(), oputN(), oputs(), oputw(), oputm();
 
-static int  (*ray_out[10])(), (*every_out[10])();
-static int  castonly;
+static int  ourtrace(), tabin();
+static int  (*ray_out[16])(), (*every_out[16])();
+static int  castonly = 0;
 
 static int  puta(), putf(), putd();
 
@@ -86,6 +100,10 @@ static int  (*putreal)();
 quit(code)			/* quit program */
 int  code;
 {
+#ifndef  NIX
+	headclean();		/* delete header file */
+	pfclean();		/* clean up persist files */
+#endif
 	exit(code);
 }
 
@@ -135,42 +153,51 @@ char  *fname;
 	default:
 		error(CONSISTENCY, "botched output format");
 	}
-	if (hresolu > 0 && vresolu > 0)
-		fprtresolu(hresolu, vresolu, stdout);
+	if (hresolu > 0) {
+		if (vresolu > 0)
+			fprtresolu(hresolu, vresolu, stdout);
+		fflush(stdout);
+	}
 					/* process file */
 	while (getvec(orig, inform, fp) == 0 &&
 			getvec(direc, inform, fp) == 0) {
 
 		if (normalize(direc) == 0.0) {		/* zero ==> flush */
-			fflush(stdout);
-			continue;
-		}
-		samplendx++;
+			bogusray();
+			if (--nextflush <= 0) {
+				fflush(stdout);
+				nextflush = hresolu;
+			}
+		} else {
+			samplendx++;
 							/* compute and print */
-		if (imm_irrad)
-			irrad(orig, direc);
-		else
-			traceray(orig, direc);
+			if (imm_irrad)
+				irrad(orig, direc);
+			else
+				rad(orig, direc);
 							/* flush if time */
-		if (--nextflush == 0) {
-			fflush(stdout);
-			nextflush = hresolu;
+			if (--nextflush == 0) {
+				fflush(stdout);
+				nextflush = hresolu;
+			}
 		}
 		if (ferror(stdout))
 			error(SYSTEM, "write error");
 		if (--vcount == 0)			/* check for end */
 			break;
 	}
+	fflush(stdout);
 	if (vcount > 0)
 		error(USER, "read error");
-	fclose(fp);
+	if (fname != NULL)
+		fclose(fp);
 }
 
 
 setoutput(vs)				/* set up output tables */
 register char  *vs;
 {
-	extern int  ourtrace(), (*trace)();
+	extern int  (*trace)();
 	register int (**table)() = ray_out;
 
 	castonly = 1;
@@ -202,9 +229,13 @@ register char  *vs;
 		case 'p':				/* point */
 			*table++ = oputp;
 			break;
-		case 'n':				/* normal */
+		case 'n':				/* perturbed normal */
 			*table++ = oputn;
+			castonly = 0;
 			break;
+		case 'N':				/* unperturbed normal */
+			*table++ = oputN;
+			break;
 		case 's':				/* surface */
 			*table++ = oputs;
 			break;
@@ -219,25 +250,27 @@ register char  *vs;
 }
 
 
-traceray(org, dir)		/* compute and print ray value(s) */
-FVECT  org, dir;
+bogusray()			/* print out empty record */
 {
-	register int  (**tp)();
+	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);
+	printvals(&thisray);
+}
 
+
+rad(org, dir)			/* compute and print ray value(s) */
+FVECT  org, dir;
+{
 	VCOPY(thisray.rorg, org);
 	VCOPY(thisray.rdir, dir);
+	thisray.rmax = 0.0;
 	rayorigin(&thisray, NULL, PRIMARY, 1.0);
 	if (castonly)
 		localhit(&thisray, &thescene) || sourcehit(&thisray);
 	else
 		rayvalue(&thisray);
-
-	if (ray_out[0] == NULL)
-		return;
-	for (tp = ray_out; *tp != NULL; tp++)
-		(**tp)(&thisray);
-	if (outform == 'a')
-		putchar('\n');
+	printvals(&thisray);
 }
 
 
@@ -252,14 +285,26 @@ FVECT  org, dir;
 	}
 	rayorigin(&thisray, NULL, PRIMARY, 1.0);
 					/* pretend we hit surface */
-	thisray.rot = 1.0;
+	thisray.rot = 1.0-1e-4;
 	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];
 					/* compute and print */
 	(*ofun[Lamb.otype].funp)(&Lamb, &thisray);
-	oputv(&thisray);
+	printvals(&thisray);
+}
+
+
+printvals(r)			/* print requested ray values */
+RAY  *r;
+{
+	register int  (**tp)();
+
+	if (ray_out[0] == NULL)
+		return;
+	for (tp = ray_out; *tp != NULL; tp++)
+		(**tp)(r);
 	if (outform == 'a')
 		putchar('\n');
 }
@@ -302,6 +347,28 @@ FILE  *fp;
 }
 
 
+tranotify(obj)			/* record new modifier */
+OBJECT	obj;
+{
+	static int  hitlimit = 0;
+	register OBJREC	 *o = objptr(obj);
+	register char  **tralp;
+
+	if (hitlimit || !ismodifier(o->otype))
+		return;
+	for (tralp = tralist; *tralp != NULL; tralp++)
+		if (!strcmp(o->oname, *tralp)) {
+			if (traset[0] >= MAXTSET) {
+				error(WARNING, "too many modifiers in trace list");
+				hitlimit++;
+				return;		/* should this be fatal? */
+			}
+			insertelem(traset, obj);
+			return;
+		}
+}
+
+
 static
 ourtrace(r)				/* print ray values */
 RAY  *r;
@@ -310,6 +377,11 @@ RAY  *r;
 
 	if (every_out[0] == NULL)
 		return;
+	if (r->ro == NULL) {
+		if (traincl == 1)
+			return;
+	} else if (traincl != -1 && traincl != inset(traset, r->ro->omod))
+		return;
 	tabin(r);
 	for (tp = every_out; *tp != NULL; tp++)
 		(**tp)(r);
@@ -400,7 +472,7 @@ register RAY  *r;
 
 
 static
-oputn(r)				/* print normal */
+oputN(r)				/* print unperturbed normal */
 register RAY  *r;
 {
 	if (r->rot < FHUGE) {
@@ -416,6 +488,25 @@ register RAY  *r;
 
 
 static
+oputn(r)				/* print perturbed normal */
+RAY  *r;
+{
+	FVECT  pnorm;
+
+	if (r->rot >= FHUGE) {
+		(*putreal)(0.0);
+		(*putreal)(0.0);
+		(*putreal)(0.0);
+		return;
+	}
+	raynormal(pnorm, r);
+	(*putreal)(pnorm[0]);
+	(*putreal)(pnorm[1]);
+	(*putreal)(pnorm[2]);
+}
+
+
+static
 oputs(r)				/* print name */
 register RAY  *r;
 {
@@ -440,7 +531,10 @@ oputm(r)				/* print modifier */
 register RAY  *r;
 {
 	if (r->ro != NULL)
-		fputs(objptr(r->ro->omod)->oname, stdout);
+		if (r->ro->omod != OVOID)
+			fputs(objptr(r->ro->omod)->oname, stdout);
+		else
+			fputs(VOIDID, stdout);
 	else
 		putchar('*');
 	putchar('\t');