--- ray/src/rt/source.c	1989/06/07 08:38:38	1.5
+++ ray/src/rt/source.c	1990/12/15 15:03:34	1.26
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1990 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -27,11 +27,15 @@ static char SCCSid[] = "$SunId$ LBL";
 
 extern double  dstrsrc;			/* source distribution amount */
 extern double  shadthresh;		/* relative shadow threshold */
+extern double  shadcert;		/* shadow testing certainty */
 
 SRCREC  *source = NULL;			/* our list of sources */
 int  nsources = 0;			/* the number of sources */
 
+static CONTRIB  *srccnt;		/* source contributions in direct() */
+static CNTPTR  *cntord;			/* source ordering in direct() */
 
+
 marksources()			/* find and mark source objects */
 {
 	register OBJREC  *o, *m;
@@ -46,15 +50,16 @@ marksources()			/* find and mark source objects */
 
 		m = objptr(o->omod);
 
-		if (m->otype != MAT_LIGHT &&
-				m->otype != MAT_ILLUM &&
-				m->otype != MAT_GLOW)
+		if (!islight(m->otype))
 			continue;
 	
-		if (m->oargs.nfargs != 3)
+		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
+				m->otype == MAT_SPOT ? 7 : 3))
 			objerror(m, USER, "bad # arguments");
 
-		if (m->otype == MAT_GLOW && o->otype != OBJ_SOURCE)
+		if (m->otype == MAT_GLOW &&
+				o->otype != OBJ_SOURCE &&
+				m->oargs.farg[3] <= FTINY)
 			continue;			/* don't bother */
 
 		if (source == NULL)
@@ -63,15 +68,32 @@ marksources()			/* find and mark source objects */
 			source = (SRCREC *)realloc((char *)source,
 					(unsigned)(nsources+1)*sizeof(SRCREC));
 		if (source == NULL)
-			error(SYSTEM, "out of memory in marksources");
+			goto memerr;
 
 		newsource(&source[nsources], o);
 
-		if (m->otype == MAT_GLOW)
-			source[nsources].sflags |= SSKIP;
-
+		if (m->otype == MAT_GLOW) {
+			source[nsources].sflags |= SPROX;
+			source[nsources].sl.prox = m->oargs.farg[3];
+			if (o->otype == OBJ_SOURCE)
+				source[nsources].sflags |= SSKIP;
+		} else if (m->otype == MAT_SPOT) {
+			source[nsources].sflags |= SSPOT;
+			source[nsources].sl.s = makespot(m);
+		}
 		nsources++;
 	}
+	if (nsources <= 0) {
+		error(WARNING, "no light sources found");
+		return;
+	}
+	srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
+	cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
+	if (srccnt != NULL && cntord != NULL)
+		return;
+	/* fall through */
+memerr:
+	error(SYSTEM, "out of memory in marksources");
 }
 
 
@@ -87,7 +109,7 @@ register OBJREC  *so;
 	register int  i;
 	
 	src->sflags = 0;
-	src->nhits = src->ntests = 1;	/* start with hit probability = 1 */
+	src->nhits = 1; src->ntests = 2;	/* start probability = 1/2 */
 	src->so = so;
 
 	switch (so->otype) {
@@ -139,6 +161,23 @@ register OBJREC  *so;
 }
 
 
+SPOT *
+makespot(m)			/* make a spotlight */
+register OBJREC  *m;
+{
+	extern double  cos();
+	register SPOT  *ns;
+
+	if ((ns = (SPOT *)malloc(sizeof(SPOT))) == NULL)
+		error(SYSTEM, "out of memory in makespot");
+	ns->siz = 2.0*PI * (1.0 - cos(PI/180.0/2.0 * m->oargs.farg[3]));
+	VCOPY(ns->aim, m->oargs.farg+4);
+	if ((ns->flen = normalize(ns->aim)) == 0.0)
+		objerror(m, USER, "zero focus vector");
+	return(ns);
+}
+
+
 double
 srcray(sr, r, sn)		/* send a ray to a source, return domega */
 register RAY  *sr;		/* returned source ray */
@@ -199,11 +238,22 @@ register int  sn;		/* source number */
 		return(source[sn].ss2);
 
 	else {
+						/* check proximity */
+		if (source[sn].sflags & SPROX &&
+				d > source[sn].sl.prox)
+			return(0.0);
 
 		if (norm != NULL)
 			ddot /= d;
 		else
 			ddot = 1.0;
+						/* check angle */
+		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 += source[sn].sl.s->flen;
+		}
 						/* return domega */
 		return(ddot*source[sn].ss2/(d*d));
 	}
@@ -238,8 +288,7 @@ 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);
+		r->rox = NULL;
 		return(1);
 	}
 	return(0);
@@ -248,7 +297,7 @@ register RAY  *r;
 
 static int
 cntcmp(sc1, sc2)			/* contribution compare (descending) */
-register CONTRIB  *sc1, *sc2;
+register CNTPTR  *sc1, *sc2;
 {
 	if (sc1->brt > sc2->brt)
 		return(-1);
@@ -263,88 +312,112 @@ 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;
-	double  dtmp, hwt, test2, hit2;
+	int  nshadcheck, ncnts;
+	double  prob, ourthresh, hwt, test2, hit2;
 	RAY  sr;
-
-	if ((srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB))) == NULL)
-		error(SYSTEM, "out of memory in direct");
+			/* NOTE: srccnt and cntord global so no recursion */
+	if (nsources <= 0)
+		return;		/* no sources?! */
+						/* compute number to check */
+	nshadcheck = pow((double)nsources, shadcert) + .5;
+						/* modify threshold */
+	ourthresh = shadthresh / r->rweight;
 						/* potential contributions */
 	for (sn = 0; sn < nsources; sn++) {
-		srccnt[sn].sno = sn;
-		setcolor(srccnt[sn].val, 0.0, 0.0, 0.0);
+		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);
-		srccnt[sn].brt = bright(srccnt[sn].val);
-		if (srccnt[sn].brt <= FTINY)
+		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) ))
+				(source[sn].so, &sr) )) {
+			sprintf(errmsg,
+				"aiming failure for light source \"%s\"",
+					source[sn].so->oname);
+			error(WARNING, errmsg);
 			continue;
+		}
 						/* compute contribution */
-		rayshade(&sr, sr.ro->omod);
+		raycont(&sr);
 		multcolor(srccnt[sn].val, sr.rcol);
-		srccnt[sn].brt = bright(srccnt[sn].val);
+		cntord[sn].brt = bright(srccnt[sn].val);
 	}
 						/* sort contributions */
-	qsort(srccnt, nsources, sizeof(CONTRIB), cntcmp);
-	hit2 = test2 = 0.0;
+	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 < nsources; sn++) {
+	for (sn = 0; sn < ncnts; sn++) {
 						/* check threshold */
-		if (srccnt[sn].brt <= shadthresh*bright(r->rcol)/r->rweight)
+		if ((sn+nshadcheck>=ncnts ? cntord[sn].brt :
+				cntord[sn].brt-cntord[sn+nshadcheck].brt) <
+				ourthresh*bright(r->rcol))
 			break;
 						/* get statistics */
-		hwt = (double)source[srccnt[sn].sno].nhits /
-				(double)source[srccnt[sn].sno].ntests;
+		hwt = (double)source[cntord[sn].sno].nhits /
+				(double)source[cntord[sn].sno].ntests;
 		test2 += hwt;
-		source[srccnt[sn].sno].ntests++;
+		source[cntord[sn].sno].ntests++;
 						/* test for hit */
 		rayorigin(&sr, r, SHADOW, 1.0);
-		VCOPY(sr.rdir, srccnt[sn].dir);
+		VCOPY(sr.rdir, srccnt[cntord[sn].sno].dir);
+		sr.rsrc = cntord[sn].sno;
 		if (localhit(&sr, &thescene) &&
-				sr.ro != source[srccnt[sn].sno].so) {
+				sr.ro != source[cntord[sn].sno].so) {
 						/* check for transmission */
-			if (sr.clipset != NULL && inset(sr.clipset,sr.ro->omod))
-				raytrans(&sr);		/* object is clipped */
-			else
-				rayshade(&sr, sr.ro->omod);
+			raycont(&sr);
 			if (bright(sr.rcol) <= FTINY)
 				continue;	/* missed! */
-			(*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom);
-			multcolor(srccnt[sn].val, sr.rcol);
+			(*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[sn].val);
+		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
 		hit2 += hwt;
-		source[srccnt[sn].sno].nhits++;
+		source[cntord[sn].sno].nhits++;
 	}
-	if (test2 > FTINY)		/* weighted hit rate */
-		hwt = hit2 / test2;
-	else
-		hwt = 0.0;
+					/* weighted hit rate */
+	hwt = hit2 / test2;
 #ifdef DEBUG
-	fprintf(stderr, "%d tested, %f hit rate\n", sn, hwt);
+	sprintf(errmsg, "%d tested, %d untested, %f hit rate\n",
+			sn, ncnts-sn, hwt);
+	eputs(errmsg);
 #endif
 					/* add in untested sources */
-	for ( ; sn < nsources; sn++) {
-		if (srccnt[sn].brt <= 0.0)
-			break;
-		dtmp = hwt * (double)source[srccnt[sn].sno].nhits /
-				(double)source[srccnt[sn].sno].ntests;
-		scalecolor(srccnt[sn].val, dtmp);
-		addcolor(r->rcol, srccnt[sn].val);
+	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);
 }
 
 
@@ -353,7 +426,8 @@ char  *p;			/* data for f */
 				source[r->rsrc].so!=r->ro)
 
 #define  badambient(m, r)	((r->crtype&(AMBIENT|SHADOW))==AMBIENT && \
-				!(r->rtype&REFLECTED)) 	/* hack! */
+				!(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&&source[r->rsrc].so==r->ro))
@@ -363,9 +437,6 @@ 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;
@@ -379,6 +450,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 */
@@ -387,8 +461,7 @@ register RAY  *r;
 				  m->oargs.farg[2]);
 						/* modify value */
 		multcolor(r->rcol, r->pcol);
+						/* assign distance */
+		r->rt = r->rot;
 	}
 }
-
-
-o_source() {}		/* intersection with a source is done elsewhere */