--- ray/src/rt/raytrace.c	1989/04/11 13:30:31	1.2
+++ ray/src/rt/raytrace.c	1990/03/27 11:40:05	1.10
@@ -22,7 +22,7 @@ extern double  minweight;		/* minimum ray weight */
 
 long  nrays = 0L;			/* number of rays traced */
 
-#define  MAXLOOP	32		/* modifier loop detection */
+#define  MAXLOOP	128		/* modifier loop detection */
 
 #define  RAYHIT		(-1)		/* return value for intercepted ray */
 
@@ -56,35 +56,39 @@ double  rw;
 	r->newcset = r->clipset;
 	r->ro = NULL;
 	r->rot = FHUGE;
-	r->rofs = 1.0; setident4(r->rofx);
-	r->robs = 1.0; setident4(r->robx);
 	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
 	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 */
-register RAY  *r;
+RAY  *r;
 {
 	extern int  (*trace)();
 
-	if (localhit(r, &thescene))
-		if (r->clipset != NULL && inset(r->clipset, r->ro->omod))
-			raytrans(r);		/* object is clipped */
-		else
-			rayshade(r, r->ro->omod);
-	else if (sourcehit(r))
-		rayshade(r, r->ro->omod);
+	if (localhit(r, &thescene) || sourcehit(r))
+		raycont(r);
 
 	if (trace != NULL)
 		(*trace)(r);		/* trace execution */
 }
 
 
+raycont(r)			/* check for clipped object and continue */
+register RAY  *r;
+{
+	if (r->clipset != NULL && inset(r->clipset, r->ro->omod))
+		raytrans(r);
+	else
+		rayshade(r, r->ro->omod);
+}
+
+
 raytrans(r)			/* transmit ray as is */
-RAY  *r;
+register RAY  *r;
 {
 	RAY  tr;
 
@@ -92,6 +96,7 @@ RAY  *r;
 		VCOPY(tr.rdir, r->rdir);
 		rayvalue(&tr);
 		copycolor(r->rcol, tr.rcol);
+		r->rt = r->rot + tr.rt;
 	}
 }
 
@@ -104,13 +109,15 @@ int  mod;
 	register OBJREC  *m;
 					/* check for infinite loop */
 	if (depth++ >= MAXLOOP)
-		objerror(r->ro, USER, "material loop");
+		objerror(r->ro, USER, "possible modifier loop");
 	for ( ; mod != OVOID; mod = m->omod) {
 		m = objptr(mod);
+		/****** 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);	/* execute function */
 		m->lastrno = r->rno;
 		if (ismaterial(m->otype)) {	/* materials call raytexture */
@@ -205,7 +212,7 @@ register RAY  *r;
 	 *  still fraught with problems since reflected rays and similar
 	 *  directions calculated from the surface normal may spawn rays behind
 	 *  the surface.  The only solution is to curb textures at high
-	 *  incidence (Rdot << 1).
+	 *  incidence (namely, keep DOT(rdir,pert) < Rdot).
 	 */
 
 	for (i = 0; i < 3; i++)