--- ray/src/rt/raytrace.c	2003/02/25 02:47:23	2.35
+++ ray/src/rt/raytrace.c	2003/09/09 03:28:43	2.43
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: raytrace.c,v 2.35 2003/02/25 02:47:23 greg Exp $";
+static const char RCSid[] = "$Id: raytrace.c,v 2.43 2003/09/09 03:28:43 greg Exp $";
 #endif
 /*
  *  raytrace.c - routines for tracing and shading rays.
@@ -20,7 +20,7 @@ static const char	RCSid[] = "$Id: raytrace.c,v 2.35 20
 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};
+static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
 OBJREC  Lamb = {
 	OVOID, MAT_PLASTIC, "Lambertian",
 	{0, 5, NULL, Lambfa}, NULL,
@@ -95,11 +95,13 @@ register RAY  *r;
 {
 	r->rno = raynum++;
 	r->newcset = r->clipset;
+	r->hitf = rayhit;
 	r->robj = OVOID;
 	r->ro = NULL;
 	r->rox = NULL;
 	r->rt = r->rot = FHUGE;
 	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
+	r->uv[0] = r->uv[1] = 0.0;
 	setcolor(r->pcol, 1.0, 1.0, 1.0);
 	setcolor(r->rcol, 0.0, 0.0, 0.0);
 }
@@ -172,7 +174,9 @@ int  mod;
 		}
 		******/
 					/* hack for irradiance calculation */
-		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS))) {
+		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&
+				m->otype != MAT_CLIP &&
+				(ofun[m->otype].flags & (T_M|T_X))) {
 			if (irr_ignore(m->otype)) {
 #if  MAXLOOP
 				depth--;
@@ -225,9 +229,10 @@ register RAY  *r;
 }
 
 
+void
 raytexture(r, mod)			/* get material modifiers */
 RAY  *r;
-int  mod;
+OBJECT  mod;
 {
 	register OBJREC  *m;
 #if  MAXLOOP
@@ -274,19 +279,20 @@ double  coef;
 					/* compute foreground and background */
 	foremat = backmat = 0;
 					/* foreground */
-	copystruct(&fr, r);
+	fr = *r;
 	if (coef > FTINY)
 		foremat = rayshade(&fr, fore);
 					/* background */
-	copystruct(&br, r);
+	br = *r;
 	if (coef < 1.0-FTINY)
 		backmat = rayshade(&br, back);
 					/* check for transparency */
-	if (backmat ^ foremat)
+	if (backmat ^ foremat) {
 		if (backmat && coef > FTINY)
 			raytrans(&fr);
 		else if (foremat && coef < 1.0-FTINY)
 			raytrans(&br);
+	}
 					/* mix perturbations */
 	for (i = 0; i < 3; i++)
 		r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
@@ -409,6 +415,22 @@ register RAY  *r;
 }
 
 
+void
+rayhit(oset, r)			/* standard ray hit test */
+OBJECT  *oset;
+RAY  *r;
+{
+	OBJREC  *o;
+	int	i;
+
+	for (i = oset[0]; i > 0; i--) {
+		o = objptr(oset[i]);
+		if ((*ofun[o->otype].funp)(o, r))
+			r->robj = oset[i];
+	}
+}
+
+
 int
 localhit(r, scene)		/* check for hit in the octree */
 register RAY  *r;
@@ -467,7 +489,7 @@ register CUBE  *scene;
 	}
 	cxset[0] = 0;
 	raymove(curpos, cxset, sflags, r, scene);
-	return(r->ro != NULL & r->ro != &Aftplane);
+	return((r->ro != NULL) & (r->ro != &Aftplane));
 }
 
 
@@ -564,17 +586,13 @@ CUBE  *cu;
 OBJECT  *cxs;
 {
 	OBJECT  oset[MAXSET+1];
-	register OBJREC  *o;
-	register int  i;
 
 	objset(oset, cu->cutree);
-	checkset(oset, cxs);			/* eliminate double-checking */
-	for (i = oset[0]; i > 0; i--) {
-		o = objptr(oset[i]);
-		if ((*ofun[o->otype].funp)(o, r))
-			r->robj = oset[i];
-	}
-	if (r->ro == NULL)
+	checkset(oset, cxs);			/* avoid double-checking */
+
+	(*r->hitf)(oset, r);			/* test for hit in set */
+
+	if (r->robj == OVOID)
 		return(0);			/* no scores yet */
 
 	return(incube(cu, r->rop));		/* hit OK if in current cube */