--- ray/src/rt/raytrace.c	1991/05/02 11:58:20	1.16
+++ ray/src/rt/raytrace.c	1991/11/12 17:09:44	2.1
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -23,9 +23,10 @@ extern int  maxdepth;			/* maximum recursion depth */
 extern double  minweight;		/* minimum ray weight */
 extern int  do_irrad;			/* compute irradiance? */
 
-long  nrays = 0L;			/* number of rays traced */
+long  raynum = 0L;			/* next unique ray number */
+long  nrays = 0L;			/* number of calls to localhit */
 
-static double  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
+static FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
 OBJREC  Lamb = {
 	OVOID, MAT_PLASTIC, "Lambertian",
 	{0, 5, NULL, Lambfa}, NULL, -1,
@@ -47,6 +48,7 @@ double  rw;
 		r->crtype = r->rtype = rt;
 		r->rsrc = -1;
 		r->clipset = NULL;
+		r->revf = raytrace;
 	} else {				/* spawned ray */
 		r->rlvl = ro->rlvl;
 		if (rt & RAYREFL) {
@@ -57,11 +59,20 @@ double  rw;
 			r->rsrc = ro->rsrc;
 			r->clipset = ro->newcset;
 		}
+		r->revf = ro->revf;
 		r->rweight = ro->rweight * rw;
 		r->crtype = ro->crtype | (r->rtype = rt);
 		VCOPY(r->rorg, ro->rop);
 	}
-	r->rno = nrays;
+	rayclear(r);
+	return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
+}
+
+
+rayclear(r)			/* clear a ray for (re)evaluation */
+register RAY  *r;
+{
+	r->rno = raynum++;
 	r->newcset = r->clipset;
 	r->ro = NULL;
 	r->rot = FHUGE;
@@ -69,11 +80,10 @@ double  rw;
 	setcolor(r->pcol, 1.0, 1.0, 1.0);
 	setcolor(r->rcol, 0.0, 0.0, 0.0);
 	r->rt = 0.0;
-	return(r->rlvl <= maxdepth && r->rweight >= minweight ? 0 : -1);
 }
 
 
-rayvalue(r)			/* compute a ray's value */
+raytrace(r)			/* trace a ray and compute its value */
 RAY  *r;
 {
 	extern int  (*trace)();
@@ -121,6 +131,7 @@ int  mod;
 					/* check for infinite loop */
 	if (depth++ >= MAXLOOP)
 		objerror(r->ro, USER, "possible modifier loop");
+	r->rt = r->rot;			/* set effective ray length */
 	for ( ; mod != OVOID; mod = m->omod) {
 		m = objptr(mod);
 		/****** unnecessary test since modifier() is always called
@@ -136,7 +147,7 @@ int  mod;
 				raytrans(r);
 				return;
 			}
-			if (m->otype != MAT_ILLUM)
+			if (!islight(m->otype))
 				m = &Lamb;
 		}
 		(*ofun[m->otype].funp)(m, r);	/* execute function */
@@ -313,7 +324,6 @@ register CUBE  *scene;
 	register int  i;
 
 	nrays++;			/* increment trace counter */
-
 	sflags = 0;
 	for (i = 0; i < 3; i++) {
 		curpos[i] = r->rorg[i];
@@ -322,6 +332,8 @@ register CUBE  *scene;
 		else if (r->rdir[i] < -FTINY)
 			sflags |= 0x10 << i;
 	}
+	if (sflags == 0)
+		error(CONSISTENCY, "zero ray direction in localhit");
 	t = 0.0;
 	if (!incube(scene, curpos)) {
 					/* find distance to entry */