--- ray/src/rt/source.c	1996/05/28 13:41:41	2.25
+++ ray/src/rt/source.c	2003/08/26 16:09:44	2.36
@@ -1,19 +1,16 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: source.c,v 2.36 2003/08/26 16:09:44 greg Exp $";
 #endif
-
 /*
  *  source.c - routines dealing with illumination sources.
  *
- *     8/20/85
+ *  External symbols declared in source.h
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
-#include  "octree.h"
-
 #include  "otypes.h"
 
 #include  "source.h"
@@ -47,6 +44,7 @@ static CNTPTR  *cntord;			/* source ordering in direct
 static int  maxcntr = 0;		/* size of contribution arrays */
 
 
+void
 marksources()			/* find and mark source objects */
 {
 	int  foundsource = 0;
@@ -56,17 +54,22 @@ marksources()			/* find and mark source objects */
 					/* initialize dispatch table */
 	initstypes();
 					/* find direct sources */
-	for (i = 0; i < nobjects; i++) {
+	for (i = 0; i < nsceneobjs; i++) {
 	
 		o = objptr(i);
 
 		if (!issurface(o->otype) || o->omod == OVOID)
 			continue;
-
+					/* find material */
 		m = objptr(o->omod);
-
-		if (!islight(m->otype))
-			continue;
+		while (!ismaterial(m->otype))
+			if (ismixture(m->otype) || m->omod == OVOID) {
+				m = NULL;
+				break;
+			} else
+				m = objptr(m->omod);
+		if (m == NULL || !islight(m->otype))
+			continue;	/* not source modifier */
 	
 		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
 				m->otype == MAT_SPOT ? 7 : 3))
@@ -117,7 +120,7 @@ marksources()			/* find and mark source objects */
 	maxcntr = nsources + MAXSPART;	/* start with this many */
 	srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB));
 	cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR));
-	if (srccnt == NULL | cntord == NULL)
+	if ((srccnt == NULL) | (cntord == NULL))
 		goto memerr;
 	return;
 memerr:
@@ -125,6 +128,25 @@ memerr:
 }
 
 
+void
+freesources()			/* free all source structures */
+{
+	if (nsources > 0) {
+		free((void *)source);
+		source = NULL;
+		nsources = 0;
+	}
+	if (maxcntr <= 0)
+		return;
+	free((void *)srccnt);
+	srccnt = NULL;
+	free((void *)cntord);
+	cntord = NULL;
+	maxcntr = 0;
+}
+
+
+int
 srcray(sr, r, si)		/* send a ray to a source, return domega */
 register RAY  *sr;		/* returned source ray */
 RAY  *r;			/* ray which hit object */
@@ -162,6 +184,7 @@ SRCINDEX  *si;			/* source sample index */
 }
 
 
+void
 srcvalue(r)			/* punch ray to source and compute value */
 register RAY  *r;
 {
@@ -202,6 +225,7 @@ nomat:
 }
 
 
+int
 sourcehit(r)			/* check to see if ray hit distant source */
 register RAY  *r;
 {
@@ -227,9 +251,12 @@ register RAY  *r;
 			}
 
 	if (r->ro != NULL) {
+		r->robj = objndx(r->ro);
 		for (i = 0; i < 3; i++)
 			r->ron[i] = -r->rdir[i];
 		r->rod = 1.0;
+		r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
+		r->uv[0] = r->uv[1] = 0.0;
 		r->rox = NULL;
 		return(1);
 	}
@@ -249,12 +276,13 @@ register CNTPTR  *sc1, *sc2;
 }
 
 
+void
 direct(r, f, p)				/* add direct component */
 RAY  *r;			/* ray that hit surface */
-int  (*f)();			/* direct component coefficient function */
+void  (*f)();			/* direct component coefficient function */
 char  *p;			/* data for f */
 {
-	extern int  (*trace)();
+	extern void  (*trace)();
 	register int  sn;
 	register CONTRIB  *scp;
 	SRCINDEX  si;
@@ -270,11 +298,11 @@ char  *p;			/* data for f */
 	for (sn = 0; srcray(&sr, r, &si); sn++) {
 		if (sn >= maxcntr) {
 			maxcntr = sn + MAXSPART;
-			srccnt = (CONTRIB *)realloc((char *)srccnt,
+			srccnt = (CONTRIB *)realloc((void *)srccnt,
 					maxcntr*sizeof(CONTRIB));
-			cntord = (CNTPTR *)realloc((char *)cntord,
+			cntord = (CNTPTR *)realloc((void *)cntord,
 					maxcntr*sizeof(CNTPTR));
-			if (srccnt == NULL | cntord == NULL)
+			if ((srccnt == NULL) | (cntord == NULL))
 				error(SYSTEM, "out of memory in direct");
 		}
 		cntord[sn].sndx = sn;
@@ -332,7 +360,11 @@ char  *p;			/* data for f */
 		rayorigin(&sr, r, SHADOW, 1.0);
 		VCOPY(sr.rdir, scp->dir);
 		sr.rsrc = scp->sno;
-		source[scp->sno].ntests++;	/* keep statistics */
+						/* keep statistics */
+		if (source[scp->sno].ntests++ > 0xfffffff0) {
+			source[scp->sno].ntests >>= 1;
+			source[scp->sno].nhits >>= 1;
+		}
 		if (localhit(&sr, &thescene) &&
 				( sr.ro != source[scp->sno].so ||
 				source[scp->sno].sflags & SFOLLOW )) {
@@ -374,6 +406,7 @@ char  *p;			/* data for f */
 }
 
 
+void
 srcscatter(r)			/* compute source scattering into ray */
 register RAY  *r;
 {
@@ -423,6 +456,7 @@ register RAY  *r;
 			copycolor(sr.cext, r->cext);
 			copycolor(sr.albedo, r->albedo);
 			sr.gecc = r->gecc;
+			sr.slights = r->slights;
 			rayvalue(&sr);			/* eval. source ray */
 			if (bright(sr.rcol) <= FTINY)
 				continue;
@@ -464,7 +498,7 @@ register RAY  *r;
 
 static int weaksrcmod(obj) int obj;	/* efficiency booster function */
 {register OBJREC *o = objptr(obj);
-return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
+return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW));}
 
 #define  illumblock(m, r)	(!(source[r->rsrc].sflags&SVIRTUAL) && \
 				r->rod > 0.0 && \
@@ -524,6 +558,7 @@ return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
 				distglow(m, r, raydist(r,PRIMARY)))
 
 
+int
 m_light(m, r)			/* ray hit a light source */
 register OBJREC  *m;
 register RAY  *r;
@@ -536,7 +571,7 @@ register RAY  *r;
 						/* check for passed illum */
 	if (passillum(m, r)) {
 		if (m->oargs.nsargs && strcmp(m->oargs.sarg[0], VOIDID))
-			return(rayshade(r, modifier(m->oargs.sarg[0])));
+			return(rayshade(r,lastmod(objndx(m),m->oargs.sarg[0])));
 		raytrans(r);
 		return(1);
 	}