--- ray/src/rt/m_direct.c	1991/11/25 09:51:06	2.2
+++ ray/src/rt/m_direct.c	2003/07/27 22:12:03	2.11
@@ -1,14 +1,13 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: m_direct.c,v 2.11 2003/07/27 22:12:03 schorsch 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,13 +41,14 @@ 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;
 {
 					/* check if source ray */
 	if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
-		return;				/* got the wrong guy */
+		return(1);			/* got the wrong guy */
 					/* compute first projection */
 	if (m->otype == MAT_DIRECT1 ||
 			(r->rsrc < 0 || source[r->rsrc].sa.sv.pn == 0))
@@ -56,9 +57,11 @@ register RAY  *r;
 	if (m->otype == MAT_DIRECT2 &&
 			(r->rsrc < 0 || source[r->rsrc].sa.sv.pn == 1))
 		redirect(m, r, 1);
+	return(1);
 }
 
 
+int
 redirect(m, r, n)		/* compute n'th ray redirection */
 OBJREC  *m;
 RAY  *r;
@@ -66,24 +69,45 @@ int  n;
 {
 	MFUNC  *mf;
 	register EPNODE  **va;
+	FVECT  nsdir;
 	RAY  nr;
 	double  coef;
 	register int  j;
 					/* set up function */
 	mf = getdfunc(m);
 	setfunc(m, r);
+					/* assign direction variable */
+	if (r->rsrc >= 0) {
+		register SRCREC  *sp = source + source[r->rsrc].sa.sv.sn;
+
+		if (sp->sflags & SDISTANT)
+			VCOPY(nsdir, sp->sloc);
+		else {
+			for (j = 0; j < 3; j++)
+				nsdir[j] = sp->sloc[j] - r->rop[j];
+			normalize(nsdir);
+		}
+		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)
@@ -98,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");
@@ -105,6 +131,7 @@ computerr:
 }
 
 
+static int
 dir_proj(pm, o, s, n)		/* compute a director's projection */
 MAT4  pm;
 OBJREC  *o;
@@ -137,6 +164,7 @@ int  n;
 	olddot = DOT(tr.rdir, nv);
 	if (olddot <= FTINY && olddot >= -FTINY)
 		return(0);		/* old dir parallels plane */
+	tr.rmax = 0.0;
 	rayorigin(&tr, NULL, PRIMARY, 1.0);
 	if (!(*ofun[o->otype].funp)(o, &tr))
 		return(0);		/* no intersection! */
@@ -144,17 +172,20 @@ int  n;
 	m = vsmaterial(o);
 	mf = getdfunc(m);
 	setfunc(m, &tr);
+	varset("DxA", '=', 0.0);
+	varset("DyA", '=', 0.0);
+	varset("DzA", '=', 0.0);
 	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)
@@ -172,7 +203,7 @@ int  n;
 			pm[i][j] += nv[i]*h[j];
 		pm[3][j] = -od*h[j];
 	}
-	if (newdot > 0.0 ^ olddot > 0.0)	/* add mirroring */
+	if ((newdot > 0.0) ^ (olddot > 0.0))	/* add mirroring */
 		for (j = 0; j < 3; j++) {
 			for (i = 0; i < 3; i++)
 				pm[i][j] -= 2.*nv[i]*nv[j];