--- ray/src/rt/rtrace.c	1997/07/09 11:25:49	2.24
+++ ray/src/rt/rtrace.c	2003/02/25 02:47:23	2.28
@@ -1,15 +1,12 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rtrace.c,v 2.28 2003/02/25 02:47:23 greg Exp $";
 #endif
-
 /*
  *  rtrace.c - program and variables for individual ray tracing.
- *
- *     6/11/86
  */
 
+#include "copyright.h"
+
 /*
  *  Input is in the form:
  *
@@ -26,22 +23,30 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #include  "ray.h"
 
-#include  "octree.h"
-
 #include  "otypes.h"
 
 #include  "resolu.h"
 
+CUBE  thescene;				/* our scene */
+OBJECT	nsceneobjs;			/* number of objects in our scene */
+
 int  dimlist[MAXDIM];			/* sampling dimensions */
 int  ndims = 0;				/* number of sampling dimensions */
 int  samplendx = 0;			/* index for this sample */
 
 int  imm_irrad = 0;			/* compute immediate irradiance? */
+int  lim_dist = 0;			/* limit distance? */
 
 int  inform = 'a';			/* input format */
 int  outform = 'a';			/* output format */
 char  *outvals = "v";			/* output specification */
 
+int  do_irrad = 0;			/* compute irradiance? */
+
+void  (*trace)() = NULL;		/* trace call */
+
+extern void  ambnotify(), tranotify();
+void  (*addobjnotify[])() = {ambnotify, tranotify, NULL};
 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 */
@@ -71,6 +76,7 @@ int  backvis = 1;			/* back face visibility */
 int  maxdepth = 6;			/* maximum recursion depth */
 double  minweight = 4e-3;		/* minimum ray weight */
 
+char  *ambfile = NULL;			/* ambient file name */
 COLOR  ambval = BLKCOLOR;		/* ambient value */
 int  ambvwt = 0;			/* initial weight for ambient value */
 double  ambacc = 0.2;			/* ambient accuracy */
@@ -81,22 +87,24 @@ int  ambounce = 0;			/* ambient bounces */
 char  *amblist[128];			/* ambient include/exclude list */
 int  ambincl = -1;			/* include == 1, exclude == 0 */
 
-extern OBJREC  Lamb;			/* a Lambertian surface */
 
 static RAY  thisray;			/* for our convenience */
 
-static int  oputo(), oputd(), oputv(), oputl(), oputL(),
+static void  oputo(), oputd(), oputv(), oputl(), oputL(),
 		oputp(), oputn(), oputN(), oputs(), oputw(), oputm();
 
-static int  ourtrace(), tabin();
-static int  (*ray_out[16])(), (*every_out[16])();
+static void  ourtrace(), tabin();
+static void  (*ray_out[16])(), (*every_out[16])();
 static int  castonly = 0;
 
-static int  puta(), putf(), putd();
+static void  puta(), putf(), putd();
 
-static int  (*putreal)();
+static void  (*putreal)();
 
+void	bogusray(), rad(), irrad(), printvals();
 
+
+void
 quit(code)			/* quit program */
 int  code;
 {
@@ -122,12 +130,14 @@ int  f;
 }
 
 
+void
 rtrace(fname)				/* trace rays from file */
 char  *fname;
 {
 	long  vcount = hresolu>1 ? hresolu*vresolu : vresolu;
 	long  nextflush = hresolu;
 	FILE  *fp;
+	double	d;
 	FVECT  orig, direc;
 					/* set up input */
 	if (fname == NULL)
@@ -162,9 +172,10 @@ char  *fname;
 	while (getvec(orig, inform, fp) == 0 &&
 			getvec(direc, inform, fp) == 0) {
 
-		if (normalize(direc) == 0.0) {		/* zero ==> flush */
+		d = normalize(direc);
+		if (d == 0.0) {				/* zero ==> flush */
 			bogusray();
-			if (--nextflush <= 0) {
+			if (--nextflush <= 0 || vcount <= 0) {
 				fflush(stdout);
 				nextflush = hresolu;
 			}
@@ -174,7 +185,7 @@ char  *fname;
 			if (imm_irrad)
 				irrad(orig, direc);
 			else
-				rad(orig, direc);
+				rad(orig, direc, lim_dist ? d : 0.0);
 							/* flush if time */
 			if (--nextflush == 0) {
 				fflush(stdout);
@@ -197,8 +208,8 @@ char  *fname;
 setoutput(vs)				/* set up output tables */
 register char  *vs;
 {
-	extern int  (*trace)();
-	register int (**table)() = ray_out;
+	extern void  (*trace)();
+	register void (**table)() = ray_out;
 
 	castonly = 1;
 	while (*vs)
@@ -250,6 +261,7 @@ register char  *vs;
 }
 
 
+void
 bogusray()			/* print out empty record */
 {
 	thisray.rorg[0] = thisray.rorg[1] = thisray.rorg[2] =
@@ -259,21 +271,29 @@ bogusray()			/* print out empty record */
 }
 
 
-rad(org, dir)			/* compute and print ray value(s) */
+void
+rad(org, dir, dmax)		/* compute and print ray value(s) */
 FVECT  org, dir;
+double	dmax;
 {
 	VCOPY(thisray.rorg, org);
 	VCOPY(thisray.rdir, dir);
-	thisray.rmax = 0.0;
+	thisray.rmax = dmax;
 	rayorigin(&thisray, NULL, PRIMARY, 1.0);
-	if (castonly)
-		localhit(&thisray, &thescene) || sourcehit(&thisray);
-	else
+	if (castonly) {
+		if (!localhit(&thisray, &thescene))
+			if (thisray.ro == &Aftplane) {	/* clipped */
+				thisray.ro = NULL;
+				thisray.rot = FHUGE;
+			} else
+				sourcehit(&thisray);
+	} else
 		rayvalue(&thisray);
 	printvals(&thisray);
 }
 
 
+void
 irrad(org, dir)			/* compute immediate irradiance value */
 FVECT  org, dir;
 {
@@ -296,10 +316,11 @@ FVECT  org, dir;
 }
 
 
+void
 printvals(r)			/* print requested ray values */
 RAY  *r;
 {
-	register int  (**tp)();
+	register void  (**tp)();
 
 	if (ray_out[0] == NULL)
 		return;
@@ -310,12 +331,12 @@ RAY  *r;
 }
 
 
+int
 getvec(vec, fmt, fp)		/* get a vector from fp */
 register FVECT  vec;
 int  fmt;
 FILE  *fp;
 {
-	extern char  *fgetword();
 	static float  vf[3];
 	static double  vd[3];
 	char  buf[32];
@@ -347,6 +368,7 @@ FILE  *fp;
 }
 
 
+void
 tranotify(obj)			/* record new modifier */
 OBJECT	obj;
 {
@@ -354,6 +376,11 @@ OBJECT	obj;
 	register OBJREC	 *o = objptr(obj);
 	register char  **tralp;
 
+	if (obj == OVOID) {		/* starting over */
+		traset[0] = 0;
+		hitlimit = 0;
+		return;
+	}
 	if (hitlimit || !ismodifier(o->otype))
 		return;
 	for (tralp = tralist; *tralp != NULL; tralp++)
@@ -369,11 +396,11 @@ OBJECT	obj;
 }
 
 
-static
+static void
 ourtrace(r)				/* print ray values */
 RAY  *r;
 {
-	register int  (**tp)();
+	register void  (**tp)();
 
 	if (every_out[0] == NULL)
 		return;
@@ -389,7 +416,7 @@ RAY  *r;
 }
 
 
-static
+static void
 tabin(r)				/* tab in appropriate amount */
 RAY  *r;
 {
@@ -400,7 +427,7 @@ RAY  *r;
 }
 
 
-static
+static void
 oputo(r)				/* print origin */
 register RAY  *r;
 {
@@ -410,7 +437,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputd(r)				/* print direction */
 register RAY  *r;
 {
@@ -420,7 +447,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputv(r)				/* print value */
 register RAY  *r;
 {
@@ -439,7 +466,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputl(r)				/* print effective distance */
 register RAY  *r;
 {
@@ -447,7 +474,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputL(r)				/* print single ray length */
 register RAY  *r;
 {
@@ -455,7 +482,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputp(r)				/* print point */
 register RAY  *r;
 {
@@ -471,7 +498,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputN(r)				/* print unperturbed normal */
 register RAY  *r;
 {
@@ -487,7 +514,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputn(r)				/* print perturbed normal */
 RAY  *r;
 {
@@ -506,7 +533,7 @@ RAY  *r;
 }
 
 
-static
+static void
 oputs(r)				/* print name */
 register RAY  *r;
 {
@@ -518,7 +545,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputw(r)				/* print weight */
 register RAY  *r;
 {
@@ -526,7 +553,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 oputm(r)				/* print modifier */
 register RAY  *r;
 {
@@ -541,7 +568,7 @@ register RAY  *r;
 }
 
 
-static
+static void
 puta(v)				/* print ascii value */
 double  v;
 {
@@ -549,7 +576,7 @@ double  v;
 }
 
 
-static
+static void
 putd(v)				/* print binary double */
 double  v;
 {
@@ -557,7 +584,7 @@ double  v;
 }
 
 
-static
+static void
 putf(v)				/* print binary float */
 double  v;
 {