--- ray/src/rt/m_direct.c	1994/12/20 20:18:17	2.5
+++ ray/src/rt/m_direct.c	2003/03/05 16:16:53	2.10
@@ -1,14 +1,13 @@
-/* Copyright (c) 1994 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: m_direct.c,v 2.10 2003/03/05 16:16:53 greg Exp $";
 #endif
-
 /*
  * Routines for light-redirecting materials and
  *   their associated virtual light sources
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
 #include  "otypes.h"
@@ -32,7 +31,8 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 
-int  dir_proj();
+static int  dir_proj();
+
 VSMATERIAL  direct1_vs = {dir_proj, 1};
 VSMATERIAL  direct2_vs = {dir_proj, 2};
 
@@ -41,6 +41,7 @@ VSMATERIAL  direct2_vs = {dir_proj, 2};
 				getfunc(m, 8, 0xff, 1) )
 
 
+int
 m_direct(m, r)			/* shade redirected ray */
 register OBJREC  *m;
 register RAY  *r;
@@ -60,6 +61,7 @@ register RAY  *r;
 }
 
 
+int
 redirect(m, r, n)		/* compute n'th ray redirection */
 OBJREC  *m;
 RAY  *r;
@@ -85,27 +87,27 @@ int  n;
 				nsdir[j] = sp->sloc[j] - r->rop[j];
 			normalize(nsdir);
 		}
-		if (r->rox != NULL)
-			multv3(nsdir, nsdir, r->rox->b.xfm);
-		if (mf->b != &unitxf)
-			multv3(nsdir, nsdir, mf->b->xfm);
-	} else
-		nsdir[0] = nsdir[1] = nsdir[2] = 0.0;
-	varset("DxA", '=', nsdir[0]);
-	varset("DyA", '=', nsdir[1]);
-	varset("DzA", '=', nsdir[2]);
+		multv3(nsdir, nsdir, funcxf.xfm);
+		varset("DxA", '=', nsdir[0]/funcxf.sca);
+		varset("DyA", '=', nsdir[1]/funcxf.sca);
+		varset("DzA", '=', nsdir[2]/funcxf.sca);
+	} else {
+		varset("DxA", '=', 0.0);
+		varset("DyA", '=', 0.0);
+		varset("DzA", '=', 0.0);
+	}
 					/* compute coefficient */
 	errno = 0;
 	va = mf->ep + 4*n;
 	coef = evalue(va[0]);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	if (coef <= FTINY || rayorigin(&nr, r, TRANS, coef) < 0)
 		return(0);
 	va++;				/* compute direction */
 	for (j = 0; j < 3; j++) {
 		nr.rdir[j] = evalue(va[j]);
-		if (errno)
+		if (errno == EDOM || errno == ERANGE)
 			goto computerr;
 	}
 	if (mf->f != &unitxf)
@@ -120,6 +122,8 @@ int  n;
 	rayvalue(&nr);
 	scalecolor(nr.rcol, coef);
 	addcolor(r->rcol, nr.rcol);
+	if (r->ro != NULL && isflat(r->ro->otype))
+		r->rt = r->rot + nr.rt;
 	return(1);
 computerr:
 	objerror(m, WARNING, "compute error");
@@ -127,6 +131,7 @@ computerr:
 }
 
 
+static int
 dir_proj(pm, o, s, n)		/* compute a director's projection */
 MAT4  pm;
 OBJREC  *o;
@@ -173,14 +178,14 @@ int  n;
 	errno = 0;
 	va = mf->ep + 4*n;
 	coef = evalue(va[0]);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	if (coef <= FTINY)
 		return(0);		/* insignificant */
 	va++;
 	for (i = 0; i < 3; i++) {
 		newdir[i] = evalue(va[i]);
-		if (errno)
+		if (errno == EDOM || errno == ERANGE)
 			goto computerr;
 	}
 	if (mf->f != &unitxf)