--- ray/src/rt/m_direct.c	1992/05/15 09:29:09	2.3
+++ ray/src/rt/m_direct.c	2003/02/22 02:07:28	2.8
@@ -1,14 +1,68 @@
-/* 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.8 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  * Routines for light-redirecting materials and
  *   their associated virtual light sources
  */
 
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
+
 #include  "ray.h"
 
 #include  "otypes.h"
@@ -32,7 +86,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 +96,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 +112,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;
@@ -84,15 +142,15 @@ 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;
@@ -119,6 +177,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");
@@ -126,6 +186,7 @@ computerr:
 }
 
 
+static int
 dir_proj(pm, o, s, n)		/* compute a director's projection */
 MAT4  pm;
 OBJREC  *o;
@@ -158,6 +219,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! */