--- ray/src/rt/source.c	1997/08/15 10:24:24	2.27
+++ ray/src/rt/source.c	2004/09/08 17:10:16	2.46
@@ -1,23 +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.46 2004/09/08 17:10:16 greg Exp $";
 #endif
-
 /*
  *  source.c - routines dealing with illumination sources.
  *
- *     8/20/85
+ *  External symbols declared in source.h
  */
 
 #include  "ray.h"
-
-#include  "octree.h"
-
 #include  "otypes.h"
-
+#include  "rtotypes.h"
 #include  "source.h"
-
 #include  "random.h"
 
 extern double  ssampdist;		/* scatter sampling distance */
@@ -46,9 +39,36 @@ static CONTRIB  *srccnt;		/* source contributions in d
 static CNTPTR  *cntord;			/* source ordering in direct() */
 static int  maxcntr = 0;		/* size of contribution arrays */
 
+static int cntcmp(const void *p1, const void *p2);
 
-marksources()			/* find and mark source objects */
+
+extern OBJREC *			/* find an object's actual material */
+findmaterial(register OBJREC *o)
 {
+	while (!ismaterial(o->otype)) {
+		if (ismixture(o->otype))
+			return(NULL);   /* reject mixed materials */
+		if (o->otype == MOD_ALIAS && o->oargs.nsargs) {
+			OBJECT  aobj;
+			OBJREC  *ao;
+			aobj = lastmod(objndx(o), o->oargs.sarg[0]);
+			if (aobj < 0)
+				objerror(o, USER, "bad reference");
+			ao = objptr(aobj);
+			if (ismaterial(ao->otype))
+				return(ao);
+		}
+		if (o->omod == OVOID)
+			return(NULL);
+		o = objptr(o->omod);
+	}
+	return(o);
+}
+
+
+extern void
+marksources(void)			/* find and mark source objects */
+{
 	int  foundsource = 0;
 	int  i;
 	register OBJREC  *o, *m;
@@ -56,17 +76,16 @@ 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;
-
-		m = objptr(o->omod);
-
-		if (!islight(m->otype))
-			continue;
+					/* find material */
+		m = findmaterial(objptr(o->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))
@@ -105,6 +124,9 @@ marksources()			/* find and mark source objects */
 				source[ns].sflags |= SSKIP;
 			}
 		}
+#if  SHADCACHE
+		initobscache(ns);
+#endif
 		if (!(source[ns].sflags & SSKIP))
 			foundsource++;
 	}
@@ -117,7 +139,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,11 +147,35 @@ memerr:
 }
 
 
-srcray(sr, r, si)		/* send a ray to a source, return domega */
-register RAY  *sr;		/* returned source ray */
-RAY  *r;			/* ray which hit object */
-SRCINDEX  *si;			/* source sample index */
+extern void
+freesources(void)			/* free all source structures */
 {
+	if (nsources > 0) {
+#if SHADCACHE
+		while (nsources--)
+			freeobscache(&source[nsources]);
+#endif
+		free((void *)source);
+		source = NULL;
+		nsources = 0;
+	}
+	if (maxcntr <= 0)
+		return;
+	free((void *)srccnt);
+	srccnt = NULL;
+	free((void *)cntord);
+	cntord = NULL;
+	maxcntr = 0;
+}
+
+
+extern int
+srcray(				/* send a ray to a source, return domega */
+	register RAY  *sr,		/* returned source ray */
+	RAY  *r,			/* ray which hit object */
+	SRCINDEX  *si			/* source sample index */
+)
+{
     double  d;				/* distance to source */
     register SRCREC  *srcp;
 
@@ -162,8 +208,10 @@ SRCINDEX  *si;			/* source sample index */
 }
 
 
-srcvalue(r)			/* punch ray to source and compute value */
-register RAY  *r;
+extern void
+srcvalue(			/* punch ray to source and compute value */
+	register RAY  *r
+)
 {
 	register SRCREC  *sp;
 
@@ -202,8 +250,10 @@ nomat:
 }
 
 
-sourcehit(r)			/* check to see if ray hit distant source */
-register RAY  *r;
+extern int
+sourcehit(			/* check to see if ray hit distant source */
+	register RAY  *r
+)
 {
 	int  first, last;
 	register int  i;
@@ -231,6 +281,8 @@ register RAY  *r;
 		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);
 	}
@@ -239,9 +291,14 @@ register RAY  *r;
 
 
 static int
-cntcmp(sc1, sc2)			/* contribution compare (descending) */
-register CNTPTR  *sc1, *sc2;
+cntcmp(				/* contribution compare (descending) */
+	const void *p1,
+	const void *p2
+)
 {
+	register const CNTPTR  *sc1 = (const CNTPTR *)p1;
+	register const CNTPTR  *sc2 = (const CNTPTR *)p2;
+
 	if (sc1->brt > sc2->brt)
 		return(-1);
 	if (sc1->brt < sc2->brt)
@@ -250,12 +307,13 @@ register CNTPTR  *sc1, *sc2;
 }
 
 
-direct(r, f, p)				/* add direct component */
-RAY  *r;			/* ray that hit surface */
-int  (*f)();			/* direct component coefficient function */
-char  *p;			/* data for f */
+extern void
+direct(					/* add direct component */
+	RAY  *r,			/* ray that hit surface */
+	srcdirf_t *f,			/* direct component coefficient function */
+	void  *p			/* data for f */
+)
 {
-	extern int  (*trace)();
 	register int  sn;
 	register CONTRIB  *scp;
 	SRCINDEX  si;
@@ -271,11 +329,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;
@@ -286,6 +344,13 @@ char  *p;			/* data for f */
 		cntord[sn].brt = bright(scp->coef);
 		if (cntord[sn].brt <= 0.0)
 			continue;
+#if SHADCACHE
+						/* check shadow cache */
+		if (si.np == 1 && srcblocked(&sr)) {
+			cntord[sn].brt = 0.0;
+			continue;
+		}
+#endif
 		VCOPY(scp->dir, sr.rdir);
 						/* compute potential */
 		sr.revf = srcvalue;
@@ -333,7 +398,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 )) {
@@ -342,8 +411,15 @@ char  *p;			/* data for f */
 			rayparticipate(&sr);
 			if (trace != NULL)
 				(*trace)(&sr);	/* trace execution */
-			if (bright(sr.rcol) <= FTINY)
+			if (bright(sr.rcol) <= FTINY) {
+#if SHADCACHE
+				if ((scp <= srccnt || scp[-1].sno != scp->sno)
+						&& (scp >= srccnt+ncnts-1 ||
+						    scp[1].sno != scp->sno))
+					srcblocker(&sr);
+#endif
 				continue;	/* missed! */
+			}
 			copycolor(scp->val, sr.rcol);
 			multcolor(scp->val, scp->coef);
 		}
@@ -375,8 +451,10 @@ char  *p;			/* data for f */
 }
 
 
-srcscatter(r)			/* compute source scattering into ray */
-register RAY  *r;
+extern void
+srcscatter(			/* compute source scattering into ray */
+	register RAY  *r
+)
 {
 	int  oldsampndx;
 	int  nsamps;
@@ -421,13 +499,21 @@ register RAY  *r;
 			if (!srcray(&sr, NULL, &si) ||
 					sr.rsrc != r->slights[i])
 				continue;		/* no path */
+#if SHADCACHE
+			if (srcblocked(&sr))		/* check shadow cache */
+				continue;
+#endif
 			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)
+			if (bright(sr.rcol) <= FTINY) {
+#if SHADCACHE
+				srcblocker(&sr);	/* add blocker to cache */
+#endif
 				continue;
+			}
 			if (r->gecc <= FTINY)		/* compute P(theta) */
 				d = 1.;
 			else {
@@ -464,13 +550,18 @@ register RAY  *r;
  * geometry behind (or inside) an effective radiator.
  */
 
-static int weaksrcmod(obj) int obj;	/* efficiency booster function */
-{register OBJREC *o = objptr(obj);
-return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
+static int
+weaksrcmat(OBJECT obj)		/* identify material */
+{
+	OBJREC *o = findmaterial(objptr(obj));
+	
+	if (o == NULL) return 0;
+	return((o->otype==MAT_ILLUM)|(o->otype==MAT_GLOW));
+}
 
 #define  illumblock(m, r)	(!(source[r->rsrc].sflags&SVIRTUAL) && \
 				r->rod > 0.0 && \
-				weaksrcmod(source[r->rsrc].so->omod))
+				weaksrcmat(source[r->rsrc].so->omod))
 
 /* wrongsource *
  *
@@ -526,9 +617,11 @@ return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
 				distglow(m, r, raydist(r,PRIMARY)))
 
 
-m_light(m, r)			/* ray hit a light source */
-register OBJREC  *m;
-register RAY  *r;
+extern int
+m_light(				/* ray hit a light source */
+	register OBJREC  *m,
+	register RAY  *r
+)
 {
 						/* check for over-counting */
 	if (badcomponent(m, r))
@@ -538,7 +631,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);
 	}