--- ray/src/rt/raytrace.c	1991/01/12 14:05:01	1.13
+++ ray/src/rt/raytrace.c	1991/10/23 13:43:45	1.23
@@ -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";
@@ -16,12 +16,22 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "otypes.h"
 
+#include  "otspecial.h"
+
 extern CUBE  thescene;			/* our scene */
 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 FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
+OBJREC  Lamb = {
+	OVOID, MAT_PLASTIC, "Lambertian",
+	{0, 5, NULL, Lambfa}, NULL, -1,
+};					/* a Lambertian surface */
+
 #define  MAXLOOP	128		/* modifier loop detection */
 
 #define  RAYHIT		(-1)		/* return value for intercepted ray */
@@ -38,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) {
@@ -48,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;
@@ -60,17 +80,18 @@ 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)();
 
-	if (localhit(r, &thescene) || sourcehit(r))
+	if (localhit(r, &thescene))
 		raycont(r);
+	else if (sourcehit(r))
+		rayshade(r, r->ro->omod);
 
 	if (trace != NULL)
 		(*trace)(r);		/* trace execution */
@@ -110,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
@@ -118,6 +140,16 @@ int  mod;
 			error(USER, errmsg);
 		}
 		******/
+					/* hack for irradiance calculation */
+		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS))) {
+			if (irr_ignore(m->otype)) {
+				depth--;
+				raytrans(r);
+				return;
+			}
+			if (!islight(m->otype))
+				m = &Lamb;
+		}
 		(*ofun[m->otype].funp)(m, r);	/* execute function */
 		m->lastrno = r->rno;
 		if (ismaterial(m->otype)) {	/* materials call raytexture */
@@ -252,7 +284,7 @@ RAY  *r;
 		if (rp->rox == &xp->xf) {		/* xp in use */
 			xp = xp->next;			/* move to next */
 			if (xp == xflast) {		/* need new one */
-				xp = (struct xfn *)malloc(sizeof(struct xfn));
+				xp = (struct xfn *)bmalloc(sizeof(struct xfn));
 				if (xp == NULL)
 					error(SYSTEM,
 						"out of memory in newrayxf");
@@ -292,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];
@@ -301,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 */