--- ray/src/rt/rtrace.c	1994/12/20 20:18:34	2.17
+++ ray/src/rt/rtrace.c	1997/07/09 11:25:49	2.24
@@ -1,7 +1,7 @@
-/* Copyright (c) 1994 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
 
 /*
@@ -53,21 +53,29 @@ 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  directvis = 1;			/* sources visible? */
-double  srcsizerat = .25;		/* maximum ratio source size/dist. */
+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 */
@@ -155,19 +163,23 @@ char  *fname;
 			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
-			rad(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");
@@ -238,6 +250,15 @@ register char  *vs;
 }
 
 
+bogusray()			/* 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);
+	printvals(&thisray);
+}
+
+
 rad(org, dir)			/* compute and print ray value(s) */
 FVECT  org, dir;
 {
@@ -510,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');