--- ray/src/rt/rtrace.c	1993/01/22 09:51:20	2.12
+++ ray/src/rt/rtrace.c	1993/07/14 10:38:49	2.16
@@ -42,6 +42,11 @@ 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 */
 
@@ -75,8 +80,9 @@ static RAY  thisray;			/* for our convenience */
 static int  oputo(), oputd(), oputv(), oputl(), oputL(),
 		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();
 
@@ -157,7 +163,7 @@ char  *fname;
 		if (imm_irrad)
 			irrad(orig, direc);
 		else
-			traceray(orig, direc);
+			rad(orig, direc);
 							/* flush if time */
 		if (--nextflush == 0) {
 			fflush(stdout);
@@ -179,7 +185,7 @@ char  *fname;
 setoutput(vs)				/* set up output tables */
 register char  *vs;
 {
-	extern int  ourtrace(), (*trace)();
+	extern int  (*trace)();
 	register int (**table)() = ray_out;
 
 	castonly = 1;
@@ -232,11 +238,9 @@ register char  *vs;
 }
 
 
-traceray(org, dir)		/* compute and print ray value(s) */
+rad(org, dir)			/* compute and print ray value(s) */
 FVECT  org, dir;
 {
-	register int  (**tp)();
-
 	VCOPY(thisray.rorg, org);
 	VCOPY(thisray.rdir, dir);
 	rayorigin(&thisray, NULL, PRIMARY, 1.0);
@@ -244,13 +248,7 @@ FVECT  org, dir;
 		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);
 }
 
 
@@ -265,14 +263,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');
 }
@@ -315,6 +325,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;
@@ -322,6 +354,11 @@ RAY  *r;
 	register int  (**tp)();
 
 	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++)