--- ray/src/rt/raytrace.c	2003/02/22 02:07:29	2.34
+++ ray/src/rt/raytrace.c	2003/06/26 00:58:10	2.40
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: raytrace.c,v 2.34 2003/02/22 02:07:29 greg Exp $";
+static const char RCSid[] = "$Id: raytrace.c,v 2.40 2003/06/26 00:58:10 schorsch Exp $";
 #endif
 /*
  *  raytrace.c - routines for tracing and shading rays.
@@ -7,62 +7,7 @@ static const char	RCSid[] = "$Id: raytrace.c,v 2.34 20
  *  External symbols declared in ray.h
  */
 
-/* ====================================================================
- * 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 "copyright.h"
 
 #include  "ray.h"
 
@@ -75,7 +20,7 @@ static const char	RCSid[] = "$Id: raytrace.c,v 2.34 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,
@@ -150,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);
 }
@@ -227,7 +174,8 @@ int  mod;
 		}
 		******/
 					/* hack for irradiance calculation */
-		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS))) {
+		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&
+				(ofun[m->otype].flags & (T_M|T_X))) {
 			if (irr_ignore(m->otype)) {
 #if  MAXLOOP
 				depth--;
@@ -280,9 +228,10 @@ register RAY  *r;
 }
 
 
+void
 raytexture(r, mod)			/* get material modifiers */
 RAY  *r;
-int  mod;
+OBJECT  mod;
 {
 	register OBJREC  *m;
 #if  MAXLOOP
@@ -464,6 +413,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;
@@ -619,17 +584,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 */