--- ray/src/rt/raytrace.c	1993/01/26 09:28:00	2.3
+++ ray/src/rt/raytrace.c	1994/01/24 11:51:31	2.13
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1994 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -25,8 +25,8 @@ extern int  maxdepth;			/* maximum recursion depth */
 extern double  minweight;		/* minimum ray weight */
 extern int  do_irrad;			/* compute irradiance? */
 
-long  raynum = 0L;			/* next unique ray number */
-long  nrays = 0L;			/* number of calls to localhit */
+unsigned long  raynum = 0;		/* next unique ray number */
+unsigned long  nrays = 0;		/* number of calls to localhit */
 
 static FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
 OBJREC  Lamb = {
@@ -34,6 +34,8 @@ OBJREC  Lamb = {
 	{0, 5, NULL, Lambfa}, NULL,
 };					/* a Lambertian surface */
 
+static int  raymove(), checkset(), checkhit();
+
 #define  MAXLOOP	128		/* modifier loop detection */
 
 #define  RAYHIT		(-1)		/* return value for intercepted ray */
@@ -89,12 +91,16 @@ raytrace(r)			/* trace a ray and compute its value */
 RAY  *r;
 {
 	extern int  (*trace)();
+	int  gotmat;
 
 	if (localhit(r, &thescene))
-		raycont(r);
+		gotmat = raycont(r);
 	else if (sourcehit(r))
-		rayshade(r, r->ro->omod);
+		gotmat = rayshade(r, r->ro->omod);
 
+	if (!gotmat)
+		objerror(r->ro, USER, "material not found");
+
 	if (trace != NULL)
 		(*trace)(r);		/* trace execution */
 }
@@ -103,10 +109,12 @@ RAY  *r;
 raycont(r)			/* check for clipped object and continue */
 register RAY  *r;
 {
-	if (r->clipset != NULL && inset(r->clipset, r->ro->omod))
+	if ((r->clipset != NULL && inset(r->clipset, r->ro->omod)) ||
+			r->ro->omod == OVOID) {
 		raytrans(r);
-	else
-		rayshade(r, r->ro->omod);
+		return(1);
+	}
+	return(rayshade(r, r->ro->omod));
 }
 
 
@@ -129,12 +137,13 @@ register RAY  *r;
 int  mod;
 {
 	static int  depth = 0;
+	int  gotmat;
 	register OBJREC  *m;
 					/* 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) {
+	for (gotmat = 0; !gotmat && mod != OVOID; mod = m->omod) {
 		m = objptr(mod);
 		/****** unnecessary test since modifier() is always called
 		if (!ismodifier(m->otype)) {
@@ -152,13 +161,11 @@ int  mod;
 			if (!islight(m->otype))
 				m = &Lamb;
 		}
-		(*ofun[m->otype].funp)(m, r);	/* execute function */
-		if (ismaterial(m->otype)) {	/* materials call raytexture */
-			depth--;
-			return;		/* we're done */
-		}
+					/* materials call raytexture */
+		gotmat = (*ofun[m->otype].funp)(m, r);
 	}
-	objerror(r->ro, USER, "material not found");
+	depth--;
+	return(gotmat);
 }
 
 
@@ -174,11 +181,14 @@ int  mod;
 					/* execute textures and patterns */
 	for ( ; mod != OVOID; mod = m->omod) {
 		m = objptr(mod);
-		if (!istexture(m->otype)) {
+		/****** unnecessary test since modifier() is always called
+		if (!ismodifier(m->otype)) {
 			sprintf(errmsg, "illegal modifier \"%s\"", m->oname);
 			error(USER, errmsg);
 		}
-		(*ofun[m->otype].funp)(m, r);
+		******/
+		if ((*ofun[m->otype].funp)(m, r))
+			objerror(r->ro, USER, "conflicting materials");
 	}
 	depth--;			/* end here */
 }
@@ -189,44 +199,52 @@ register RAY  *r;
 OBJECT  fore, back;
 double  coef;
 {
-	FVECT  curpert, forepert, backpert;
-	COLOR  curpcol, forepcol, backpcol;
+	RAY  fr, br;
+	int  foremat, backmat;
 	register int  i;
 					/* clip coefficient */
 	if (coef > 1.0)
 		coef = 1.0;
 	else if (coef < 0.0)
 		coef = 0.0;
-					/* save current mods */
-	VCOPY(curpert, r->pert);
-	copycolor(curpcol, r->pcol);
-					/* compute new mods */
-						/* foreground */
-	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
-	setcolor(r->pcol, 1.0, 1.0, 1.0);
+					/* compute foreground and background */
+	foremat = backmat = -1;
+					/* foreground */
+	copystruct(&fr, r);
 	if (fore != OVOID && coef > FTINY)
-		raytexture(r, fore);
-	VCOPY(forepert, r->pert);
-	copycolor(forepcol, r->pcol);
-						/* background */
-	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
-	setcolor(r->pcol, 1.0, 1.0, 1.0);
+		foremat = rayshade(&fr, fore);
+					/* background */
+	copystruct(&br, r);
 	if (back != OVOID && coef < 1.0-FTINY)
-		raytexture(r, back);
-	VCOPY(backpert, r->pert);
-	copycolor(backpcol, r->pcol);
-					/* sum perturbations */
+		backmat = rayshade(&br, back);
+					/* check */
+	if (foremat < 0)
+		if (backmat < 0)
+			foremat = backmat = 0;
+		else
+			foremat = backmat;
+	else if (backmat < 0)
+		backmat = foremat;
+	if ((foremat==0) != (backmat==0))
+		objerror(r->ro, USER, "mixing material with non-material");
+					/* mix perturbations */
 	for (i = 0; i < 3; i++)
-		r->pert[i] = curpert[i] + coef*forepert[i] +
-				(1.0-coef)*backpert[i];
-					/* multiply colors */
-	setcolor(r->pcol, coef*colval(forepcol,RED) +
-				(1.0-coef)*colval(backpcol,RED),
-			coef*colval(forepcol,GRN) +
-				(1.0-coef)*colval(backpcol,GRN),
-			coef*colval(forepcol,BLU) +
-				(1.0-coef)*colval(backpcol,BLU));
-	multcolor(r->pcol, curpcol);
+		r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
+					/* mix pattern colors */
+	scalecolor(fr.pcol, coef);
+	scalecolor(br.pcol, 1.0-coef);
+	copycolor(r->pcol, fr.pcol);
+	addcolor(r->pcol, br.pcol);
+					/* mix returned ray values */
+	if (foremat) {
+		scalecolor(fr.rcol, coef);
+		scalecolor(br.rcol, 1.0-coef);
+		copycolor(r->rcol, fr.rcol);
+		addcolor(r->rcol, br.rcol);
+		r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt;
+	}
+					/* return value tells if material */
+	return(foremat);
 }
 
 
@@ -328,9 +346,9 @@ register CUBE  *scene;
 	sflags = 0;
 	for (i = 0; i < 3; i++) {
 		curpos[i] = r->rorg[i];
-		if (r->rdir[i] > FTINY)
+		if (r->rdir[i] > 1e-7)
 			sflags |= 1 << i;
-		else if (r->rdir[i] < -FTINY)
+		else if (r->rdir[i] < -1e-7)
 			sflags |= 0x10 << i;
 	}
 	if (sflags == 0)