--- ray/src/rt/source.c	1989/02/02 10:41:41	1.1
+++ ray/src/rt/source.c	1989/11/29 14:35:27	1.18
@@ -12,6 +12,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "ray.h"
 
+#include  "octree.h"
+
 #include  "source.h"
 
 #include  "otypes.h"
@@ -24,8 +26,10 @@ static char SCCSid[] = "$SunId$ LBL";
 
 
 extern double  dstrsrc;			/* source distribution amount */
+extern double  shadthresh;		/* relative shadow threshold */
+extern double  shadcert;		/* shadow testing certainty */
 
-SOURCE  srcval[MAXSOURCE];		/* our array of sources */
+SRCREC  *source = NULL;			/* our list of sources */
 int  nsources = 0;			/* the number of sources */
 
 
@@ -58,19 +62,24 @@ marksources()			/* find and mark source objects */
 				m->oargs.farg[3] <= FTINY)
 			continue;			/* don't bother */
 
-		if (nsources >= MAXSOURCE)
-			error(INTERNAL, "too many sources in marksources");
+		if (source == NULL)
+			source = (SRCREC *)malloc(sizeof(SRCREC));
+		else
+			source = (SRCREC *)realloc((char *)source,
+					(unsigned)(nsources+1)*sizeof(SRCREC));
+		if (source == NULL)
+			error(SYSTEM, "out of memory in marksources");
 
-		newsource(&srcval[nsources], o);
+		newsource(&source[nsources], o);
 
 		if (m->otype == MAT_GLOW) {
-			srcval[nsources].sflags |= SPROX;
-			srcval[nsources].sl.prox = m->oargs.farg[3];
+			source[nsources].sflags |= SPROX;
+			source[nsources].sl.prox = m->oargs.farg[3];
 			if (o->otype == OBJ_SOURCE)
-				srcval[nsources].sflags |= SSKIP;
+				source[nsources].sflags |= SSKIP;
 		} else if (m->otype == MAT_SPOT) {
-			srcval[nsources].sflags |= SSPOT;
-			srcval[nsources].sl.s = makespot(m);
+			source[nsources].sflags |= SSPOT;
+			source[nsources].sl.s = makespot(m);
 		}
 		nsources++;
 	}
@@ -78,7 +87,7 @@ marksources()			/* find and mark source objects */
 
 
 newsource(src, so)			/* add a source to the array */
-register SOURCE  *src;
+register SRCREC  *src;
 register OBJREC  *so;
 {
 	double  cos(), tan(), sqrt();
@@ -89,6 +98,7 @@ register OBJREC  *so;
 	register int  i;
 	
 	src->sflags = 0;
+	src->nhits = 1; src->ntests = 2;	/* start probability = 1/2 */
 	src->so = so;
 
 	switch (so->otype) {
@@ -169,32 +179,32 @@ register int  sn;		/* source number */
 	double  d;
 	register int  i;
 
-	if (srcval[sn].sflags & SSKIP)
+	if (source[sn].sflags & SSKIP)
 		return(0.0);			/* skip this source */
 
 	rayorigin(sr, r, SHADOW, 1.0);		/* ignore limits */
 
 	sr->rsrc = sn;				/* remember source */
 						/* get source direction */
-	if (srcval[sn].sflags & SDISTANT)
+	if (source[sn].sflags & SDISTANT)
 						/* constant direction */
-		VCOPY(sr->rdir, srcval[sn].sloc);
+		VCOPY(sr->rdir, source[sn].sloc);
 	else {					/* compute direction */
 		for (i = 0; i < 3; i++)
-			sr->rdir[i] = srcval[sn].sloc[i] - sr->rorg[i];
+			sr->rdir[i] = source[sn].sloc[i] - sr->rorg[i];
 
-		if (srcval[sn].so->otype == OBJ_FACE)
- 			norm = getface(srcval[sn].so)->norm;
-		else if (srcval[sn].so->otype == OBJ_RING)
-			norm = getcone(srcval[sn].so,0)->ad;
+		if (source[sn].so->otype == OBJ_FACE)
+ 			norm = getface(source[sn].so)->norm;
+		else if (source[sn].so->otype == OBJ_RING)
+			norm = getcone(source[sn].so,0)->ad;
 
-		if (norm != NULL && (ddot = -DOT(sr->rdir, norm)) <= 0.0)
+		if (norm != NULL && (ddot = -DOT(sr->rdir, norm)) <= FTINY)
 			return(0.0);		/* behind surface! */
 	}
 	if (dstrsrc > FTINY) {
 					/* distribute source direction */
 		for (i = 0; i < 3; i++)
-			vd[i] = dstrsrc * srcval[sn].ss * (1.0 - 2.0*frandom());
+			vd[i] = dstrsrc * source[sn].ss * (1.0 - 2.0*frandom());
 
 		if (norm != NULL) {		/* project offset */
 			d = DOT(vd, norm);
@@ -204,22 +214,22 @@ register int  sn;		/* source number */
 		for (i = 0; i < 3; i++)		/* offset source direction */
 			sr->rdir[i] += vd[i];
 
-	} else if (srcval[sn].sflags & SDISTANT)
+	} else if (source[sn].sflags & SDISTANT)
 						/* already normalized */
-		return(srcval[sn].ss2);
+		return(source[sn].ss2);
 
 	if ((d = normalize(sr->rdir)) == 0.0)
 						/* at source! */
 		return(0.0);
 	
-	if (srcval[sn].sflags & SDISTANT)
+	if (source[sn].sflags & SDISTANT)
 						/* domega constant */
-		return(srcval[sn].ss2);
+		return(source[sn].ss2);
 
 	else {
 						/* check proximity */
-		if (srcval[sn].sflags & SPROX &&
-				d > srcval[sn].sl.prox)
+		if (source[sn].sflags & SPROX &&
+				d > source[sn].sl.prox)
 			return(0.0);
 
 		if (norm != NULL)
@@ -227,14 +237,14 @@ register int  sn;		/* source number */
 		else
 			ddot = 1.0;
 						/* check angle */
-		if (srcval[sn].sflags & SSPOT) {
-			if (srcval[sn].sl.s->siz < 2.0*PI *
-				(1.0 + DOT(srcval[sn].sl.s->aim,sr->rdir)))
+		if (source[sn].sflags & SSPOT) {
+			if (source[sn].sl.s->siz < 2.0*PI *
+				(1.0 + DOT(source[sn].sl.s->aim,sr->rdir)))
 				return(0.0);
-			d += srcval[sn].sl.s->flen;
+			d += source[sn].sl.s->flen;
 		}
 						/* return domega */
-		return(ddot*srcval[sn].ss2/(d*d));
+		return(ddot*source[sn].ss2/(d*d));
 	}
 }
 
@@ -251,15 +261,15 @@ register RAY  *r;
 		first = 0; last = nsources-1;
 	}
 	for (i = first; i <= last; i++)
-		if (srcval[i].sflags & SDISTANT)
+		if (source[i].sflags & SDISTANT)
 			/*
 			 * Check to see if ray is within
 			 * solid angle of source.
 			 */
-			if (2.0*PI * (1.0 - DOT(srcval[i].sloc,r->rdir))
-					<= srcval[i].ss2) {
-				r->ro = srcval[i].so;
-				if (!(srcval[i].sflags & SSKIP))
+			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;
 			}
 
@@ -267,31 +277,160 @@ register RAY  *r;
 		for (i = 0; i < 3; i++)
 			r->ron[i] = -r->rdir[i];
 		r->rod = 1.0;
+		r->rofs = 1.0; setident4(r->rofx);
+		r->robs = 1.0; setident4(r->robx);
 		return(1);
 	}
 	return(0);
 }
 
 
+static int
+cntcmp(sc1, sc2)			/* contribution compare (descending) */
+register CNTPTR  *sc1, *sc2;
+{
+	if (sc1->brt > sc2->brt)
+		return(-1);
+	if (sc1->brt < sc2->brt)
+		return(1);
+	return(0);
+}
+
+
+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 double  pow();
+	register int  sn;
+	register CONTRIB  *srccnt;
+	register CNTPTR  *cntord;
+	int  nshadcheck, ncnts;
+	double  prob, ourthresh, hwt, test2, hit2;
+	RAY  sr;
+
+	srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
+	cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
+	if (srccnt == NULL || cntord == NULL)
+		error(SYSTEM, "out of memory in direct");
+						/* compute number to check */
+	nshadcheck = pow((double)nsources, shadcert) + .5;
+						/* modify threshold */
+	ourthresh = shadthresh / r->rweight;
+						/* potential contributions */
+	for (sn = 0; sn < nsources; sn++) {
+		cntord[sn].sno = sn;
+		cntord[sn].brt = 0.0;
+						/* get source ray */
+		if ((srccnt[sn].dom = srcray(&sr, r, sn)) == 0.0)
+			continue;
+		VCOPY(srccnt[sn].dir, sr.rdir);
+						/* compute coefficient */
+		(*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom);
+		cntord[sn].brt = bright(srccnt[sn].val);
+		if (cntord[sn].brt <= 0.0)
+			continue;
+						/* compute intersection */
+		if (!( source[sn].sflags & SDISTANT ?
+				sourcehit(&sr) :
+				(*ofun[source[sn].so->otype].funp)
+				(source[sn].so, &sr) ))
+			continue;
+						/* compute contribution */
+		rayshade(&sr, sr.ro->omod);
+		multcolor(srccnt[sn].val, sr.rcol);
+		cntord[sn].brt = bright(srccnt[sn].val);
+	}
+						/* sort contributions */
+	qsort(cntord, nsources, sizeof(CNTPTR), cntcmp);
+	{					/* find last */
+		register int  l, m;
+
+		sn = 0; ncnts = l = nsources;
+		while ((m = (sn + ncnts) >> 1) != l) {
+			if (cntord[m].brt > 0.0)
+				sn = m;
+			else
+				ncnts = m;
+			l = m;
+		}
+	}
+                                                /* accumulate tail */
+        for (sn = ncnts-1; sn > 0; sn--)
+                cntord[sn-1].brt += cntord[sn].brt;
+						/* start with prob=.5 */
+	hit2 = 0.5; test2 = 1.0;
+						/* test for shadows */
+	for (sn = 0; sn < ncnts; sn++) {
+						/* check threshold */
+		if ((sn+nshadcheck>=ncnts ? cntord[sn].brt :
+				cntord[sn].brt-cntord[sn+nshadcheck].brt) <
+				ourthresh*bright(r->rcol))
+			break;
+						/* get statistics */
+		hwt = (double)source[cntord[sn].sno].nhits /
+				(double)source[cntord[sn].sno].ntests;
+		test2 += hwt;
+		source[cntord[sn].sno].ntests++;
+						/* test for hit */
+		rayorigin(&sr, r, SHADOW, 1.0);
+		VCOPY(sr.rdir, srccnt[cntord[sn].sno].dir);
+		if (localhit(&sr, &thescene) &&
+				sr.ro != source[cntord[sn].sno].so) {
+						/* check for transmission */
+			if (sr.clipset != NULL && inset(sr.clipset, sr.ro->omod))
+				raytrans(&sr);
+			else
+				rayshade(&sr, sr.ro->omod);
+			if (bright(sr.rcol) <= FTINY)
+				continue;	/* missed! */
+			(*f)(srccnt[cntord[sn].sno].val, p,
+					srccnt[cntord[sn].sno].dir,
+					srccnt[cntord[sn].sno].dom);
+			multcolor(srccnt[cntord[sn].sno].val, sr.rcol);
+		}
+						/* add contribution if hit */
+		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
+		hit2 += hwt;
+		source[cntord[sn].sno].nhits++;
+	}
+					/* weighted hit rate */
+	hwt = hit2 / test2;
+#ifdef notdef
+	sprintf(errmsg, "%d tested, %d untested, %f hit rate\n",
+			sn, ncnts-sn, hwt);
+	eputs(errmsg);
+#endif
+					/* add in untested sources */
+	for ( ; sn < ncnts; sn++) {
+		prob = hwt * (double)source[cntord[sn].sno].nhits /
+				(double)source[cntord[sn].sno].ntests;
+		scalecolor(srccnt[cntord[sn].sno].val, prob);
+		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
+	}
+		
+	free(srccnt);
+	free(cntord);
+}
+
+
 #define  wrongsource(m, r)	(m->otype!=MAT_ILLUM && \
 				r->rsrc>=0 && \
-				srcval[r->rsrc].so!=r->ro)
+				source[r->rsrc].so!=r->ro)
 
 #define  badambient(m, r)	((r->crtype&(AMBIENT|SHADOW))==AMBIENT && \
 				!(r->rtype&REFLECTED) && 	/* hack! */\
 				!(m->otype==MAT_GLOW&&r->rot>m->oargs.farg[3]))
 
 #define  passillum(m, r)	(m->otype==MAT_ILLUM && \
-				!(r->rsrc>=0&&srcval[r->rsrc].so==r->ro))
+				!(r->rsrc>=0&&source[r->rsrc].so==r->ro))
 
 
 m_light(m, r)			/* ray hit a light source */
 register OBJREC  *m;
 register RAY  *r;
 {
-						/* check for behind */
-	if (r->rod < 0.0)
-		return;
 						/* check for over-counting */
 	if (wrongsource(m, r) || badambient(m, r))
 		return;
@@ -305,6 +444,9 @@ register RAY  *r;
 
 						/* otherwise treat as source */
 	} else {
+						/* check for behind */
+		if (r->rod < 0.0)
+			return;
 						/* get distribution pattern */
 		raytexture(r, m->omod);
 						/* get source color */