--- ray/src/rt/source.c	1991/11/12 17:08:57	2.1
+++ ray/src/rt/source.c	1993/04/06 17:55:51	2.11
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1993 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -41,6 +41,7 @@ static int  maxcntr = 0;		/* size of contribution arra
 
 marksources()			/* find and mark source objects */
 {
+	int  foundsource = 0;
 	int  i;
 	register OBJREC  *o, *m;
 	register int  ns;
@@ -80,7 +81,7 @@ marksources()			/* find and mark source objects */
 		if (m->otype == MAT_GLOW) {
 			source[ns].sflags |= SPROX;
 			source[ns].sl.prox = m->oargs.farg[3];
-			if (o->otype == OBJ_SOURCE)
+			if (source[ns].sflags & SDISTANT)
 				source[ns].sflags |= SSKIP;
 		} else if (m->otype == MAT_SPOT) {
 			source[ns].sflags |= SSPOT;
@@ -93,8 +94,10 @@ marksources()			/* find and mark source objects */
 				source[ns].sflags |= SSKIP;
 			}
 		}
+		if (!(source[ns].sflags & SSKIP))
+			foundsource++;
 	}
-	if (nsources <= 0) {
+	if (!foundsource) {
 		error(WARNING, "no light sources found");
 		return;
 	}
@@ -117,9 +120,7 @@ RAY  *r;			/* ray which hit object */
 SRCINDEX  *si;			/* source sample index */
 {
     double  d;				/* distance to source */
-    FVECT  vd;
     register SRCREC  *srcp;
-    register int  i;
 
     rayorigin(sr, r, SHADOW, 1.0);		/* ignore limits */
 
@@ -127,16 +128,8 @@ SRCINDEX  *si;			/* source sample index */
 	sr->rsrc = si->sn;			/* remember source */
 	srcp = source + si->sn;
 	if (srcp->sflags & SDISTANT) {
-		if (srcp->sflags & SSPOT) {	/* check location */
-			for (i = 0; i < 3; i++)
-			    vd[i] = srcp->sl.s->aim[i] - sr->rorg[i];
-			d = DOT(sr->rdir,vd);
-			if (d <= FTINY)
-				continue;
-			d = DOT(vd,vd) - d*d;
-			if (PI*d > srcp->sl.s->siz)
-				continue;
-		}
+		if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s, 1))
+			continue;
 		return(1);		/* sample OK */
 	}
 				/* local source */
@@ -145,8 +138,7 @@ SRCINDEX  *si;			/* source sample index */
 		continue;
 						/* check angle */
 	if (srcp->sflags & SSPOT) {
-		if (srcp->sl.s->siz < 2.0*PI *
-				(1.0 + DOT(srcp->sl.s->aim,sr->rdir)))
+		if (spotout(sr, srcp->sl.s, 0))
 			continue;
 					/* adjust solid angle */
 		si->dom *= d*d;
@@ -191,6 +183,41 @@ RAY  *r;
 }
 
 
+sourcehit(r)			/* check to see if ray hit distant source */
+register RAY  *r;
+{
+	int  first, last;
+	register int  i;
+
+	if (r->rsrc >= 0) {		/* check only one if aimed */
+		first = last = r->rsrc;
+	} else {			/* otherwise check all */
+		first = 0; last = nsources-1;
+	}
+	for (i = first; i <= last; i++)
+		if ((source[i].sflags & (SDISTANT|SVIRTUAL)) == SDISTANT)
+			/*
+			 * Check to see if ray is within
+			 * solid angle of source.
+			 */
+			if (2.0*PI * (1.0 - DOT(source[i].sloc,r->rdir))
+					<= source[i].ss2) {
+				r->ro = source[i].so;
+				if (!(source[i].sflags & SSKIP))
+					break;
+			}
+
+	if (r->ro != NULL) {
+		for (i = 0; i < 3; i++)
+			r->ron[i] = -r->rdir[i];
+		r->rod = 1.0;
+		r->rox = NULL;
+		return(1);
+	}
+	return(0);
+}
+
+
 static int
 cntcmp(sc1, sc2)			/* contribution compare (descending) */
 register CNTPTR  *sc1, *sc2;
@@ -209,8 +236,8 @@ int  (*f)();			/* direct component coefficient functio
 char  *p;			/* data for f */
 {
 	extern int  (*trace)();
-	extern double  pow();
 	register int  sn;
+	register CONTRIB  *scp;
 	SRCINDEX  si;
 	int  nshadcheck, ncnts;
 	int  nhits;
@@ -232,19 +259,20 @@ char  *p;			/* data for f */
 				error(SYSTEM, "out of memory in direct");
 		}
 		cntord[sn].sndx = sn;
-		srccnt[sn].sno = sr.rsrc;
+		scp = srccnt + sn;
+		scp->sno = sr.rsrc;
 						/* compute coefficient */
-		(*f)(srccnt[sn].coef, p, sr.rdir, si.dom);
-		cntord[sn].brt = bright(srccnt[sn].coef);
+		(*f)(scp->coef, p, sr.rdir, si.dom);
+		cntord[sn].brt = bright(scp->coef);
 		if (cntord[sn].brt <= 0.0)
 			continue;
-		VCOPY(srccnt[sn].dir, sr.rdir);
+		VCOPY(scp->dir, sr.rdir);
 						/* compute potential */
 		sr.revf = srcvalue;
 		rayvalue(&sr);
-		copycolor(srccnt[sn].val, sr.rcol);
-		multcolor(srccnt[sn].val, srccnt[sn].coef);
-		cntord[sn].brt = bright(srccnt[sn].val);
+		copycolor(scp->val, sr.rcol);
+		multcolor(scp->val, scp->coef);
+		cntord[sn].brt = bright(scp->val);
 	}
 						/* sort contributions */
 	qsort(cntord, sn, sizeof(CNTPTR), cntcmp);
@@ -261,6 +289,8 @@ char  *p;			/* data for f */
 			l = m;
 		}
 	}
+	if (ncnts == 0)
+		return;		/* no contributions! */
                                                 /* accumulate tail */
         for (sn = ncnts-1; sn > 0; sn--)
                 cntord[sn-1].brt += cntord[sn].brt;
@@ -276,28 +306,28 @@ char  *p;			/* data for f */
 				cntord[sn].brt-cntord[sn+nshadcheck].brt)
 				< ourthresh*bright(r->rcol))
 			break;
+		scp = srccnt + cntord[sn].sndx;
 						/* test for hit */
 		rayorigin(&sr, r, SHADOW, 1.0);
-		VCOPY(sr.rdir, srccnt[cntord[sn].sndx].dir);
-		sr.rsrc = srccnt[cntord[sn].sndx].sno;
-		source[sr.rsrc].ntests++;	/* keep statistics */
+		VCOPY(sr.rdir, scp->dir);
+		sr.rsrc = scp->sno;
+		source[scp->sno].ntests++;	/* keep statistics */
 		if (localhit(&sr, &thescene) &&
-				( sr.ro != source[sr.rsrc].so ||
-				source[sr.rsrc].sflags & SFOLLOW )) {
+				( sr.ro != source[scp->sno].so ||
+				source[scp->sno].sflags & SFOLLOW )) {
 						/* follow entire path */
 			raycont(&sr);
 			if (trace != NULL)
 				(*trace)(&sr);	/* trace execution */
 			if (bright(sr.rcol) <= FTINY)
 				continue;	/* missed! */
-			copycolor(srccnt[cntord[sn].sndx].val, sr.rcol);
-			multcolor(srccnt[cntord[sn].sndx].val,
-					srccnt[cntord[sn].sndx].coef);
+			copycolor(scp->val, sr.rcol);
+			multcolor(scp->val, scp->coef);
 		}
 						/* add contribution if hit */
-		addcolor(r->rcol, srccnt[cntord[sn].sndx].val);
+		addcolor(r->rcol, scp->val);
 		nhits++;
-		source[sr.rsrc].nhits++;
+		source[scp->sno].nhits++;
 	}
 					/* surface hit rate */
 	if (sn > 0)
@@ -311,10 +341,130 @@ char  *p;			/* data for f */
 #endif
 					/* add in untested sources */
 	for ( ; sn < ncnts; sn++) {
-		sr.rsrc = srccnt[cntord[sn].sndx].sno;
-		prob = hwt * (double)source[sr.rsrc].nhits /
-				(double)source[sr.rsrc].ntests;
-		scalecolor(srccnt[cntord[sn].sndx].val, prob);
-		addcolor(r->rcol, srccnt[cntord[sn].sndx].val);
+		scp = srccnt + cntord[sn].sndx;
+		prob = hwt * (double)source[scp->sno].nhits /
+				(double)source[scp->sno].ntests;
+		scalecolor(scp->val, prob);
+		addcolor(r->rcol, scp->val);
 	}
+}
+
+
+/****************************************************************
+ * The following macros were separated from the m_light() routine
+ * because they are very nasty and difficult to understand.
+ */
+
+/* illumblock *
+ *
+ * We cannot allow an illum to pass to another illum, because that
+ * would almost certainly constitute overcounting.
+ * However, we do allow an illum to pass to another illum
+ * that is actually going to relay to a virtual light source.
+ * We also prevent an illum from passing to a glow; this provides a
+ * convenient mechanism for defining detailed light source
+ * 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);}
+
+#define  illumblock(m, r)	(!(source[r->rsrc].sflags&SVIRTUAL) && \
+				weaksrcmod(source[r->rsrc].so->omod))
+
+/* wrongsource *
+ *
+ * This source is the wrong source (ie. overcounted) if we are
+ * aimed to a different source than the one we hit and the one
+ * we hit is not an illum that should be passed.
+ */
+
+#define  wrongsource(m, r)	(r->rsrc>=0 && source[r->rsrc].so!=r->ro && \
+				(m->otype!=MAT_ILLUM || illumblock(m,r)))
+
+/* distglow *
+ *
+ * A distant glow is an object that sometimes acts as a light source,
+ * but is too far away from the test point to be one in this case.
+ * (Glows with negative radii should NEVER participate in illumination.)
+ */
+
+#define  distglow(m, r)		(m->otype==MAT_GLOW && \
+				m->oargs.farg[3] >= -FTINY && \
+				r->rot > m->oargs.farg[3])
+
+/* badcomponent *
+ *
+ * We must avoid counting light sources in the ambient calculation,
+ * since the direct component is handled separately.  Therefore, any
+ * ambient ray which hits an active light source must be discarded.
+ * The same is true for stray specular samples, since the specular
+ * contribution from light sources is calculated separately.
+ */
+
+#define  badcomponent(m, r)	(r->crtype&(AMBIENT|SPECULAR) && \
+				!(r->crtype&SHADOW || r->rod < 0.0 || \
+					distglow(m, r)))
+
+/* overcount *
+ *
+ * All overcounting possibilities are contained here.
+ */
+
+#define  overcount(m, r)	(badcomponent(m,r) || wrongsource(m,r))
+
+/* passillum *
+ *
+ * An illum passes to another material type when we didn't hit it
+ * on purpose (as part of a direct calculation), or it is relaying
+ * a virtual light source.
+ */
+
+#define  passillum(m, r)	(m->otype==MAT_ILLUM && \
+				(r->rsrc<0 || source[r->rsrc].so!=r->ro || \
+				source[r->rsrc].sflags&SVIRTUAL))
+
+/* srcignore *
+ *
+ * The -dv flag is normally on for sources to be visible.
+ */
+
+#define  srcignore(m, r)	(!directvis && !(r->crtype&SHADOW) && \
+				!distglow(m, r))
+
+
+m_light(m, r)			/* ray hit a light source */
+register OBJREC  *m;
+register RAY  *r;
+{
+						/* check for over-counting */
+	if (overcount(m, r))
+		return;
+						/* check for passed illum */
+	if (passillum(m, r)) {
+		if (m->oargs.nsargs < 1 || !strcmp(m->oargs.sarg[0], VOIDID))
+			raytrans(r);
+		else
+			rayshade(r, modifier(m->oargs.sarg[0]));
+		return;
+	}
+					/* otherwise treat as source */
+						/* check for behind */
+	if (r->rod < 0.0)
+		return;
+						/* check for invisibility */
+	if (srcignore(m, r))
+		return;
+						/* check for outside spot */
+	if (m->otype==MAT_SPOT && spotout(r, makespot(m), r->rot>=FHUGE))
+		return;
+						/* get distribution pattern */
+	raytexture(r, m->omod);
+						/* get source color */
+	setcolor(r->rcol, m->oargs.farg[0],
+			  m->oargs.farg[1],
+			  m->oargs.farg[2]);
+						/* modify value */
+	multcolor(r->rcol, r->pcol);
 }