--- ray/src/rt/source.c	1994/01/12 21:25:59	2.14
+++ ray/src/rt/source.c	1997/05/30 19:04:51	2.26
@@ -1,4 +1,4 @@
-/* Copyright (c) 1993 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -18,6 +18,14 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "source.h"
 
+#include  "random.h"
+
+extern double  ssampdist;		/* scatter sampling distance */
+
+#ifndef MAXSSAMP
+#define MAXSSAMP	16		/* maximum samples per ray */
+#endif
+
 /*
  * Structures used by direct()
  */
@@ -68,6 +76,9 @@ marksources()			/* find and mark source objects */
 				o->otype != OBJ_SOURCE &&
 				m->oargs.farg[3] <= FTINY)
 			continue;			/* don't bother */
+		if (m->oargs.farg[0] <= FTINY && m->oargs.farg[1] <= FTINY &&
+				m->oargs.farg[2] <= FTINY)
+			continue;			/* don't bother */
 
 		if (sfun[o->otype].of == NULL ||
 				sfun[o->otype].of->setsrc == NULL)
@@ -128,7 +139,7 @@ SRCINDEX  *si;			/* source sample index */
 	sr->rsrc = si->sn;			/* remember source */
 	srcp = source + si->sn;
 	if (srcp->sflags & SDISTANT) {
-		if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s, 1))
+		if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
 			continue;
 		return(1);		/* sample OK */
 	}
@@ -138,7 +149,7 @@ SRCINDEX  *si;			/* source sample index */
 		continue;
 						/* check angle */
 	if (srcp->sflags & SSPOT) {
-		if (spotout(sr, srcp->sl.s, 0))
+		if (spotout(sr, srcp->sl.s))
 			continue;
 					/* adjust solid angle */
 		si->dom *= d*d;
@@ -152,7 +163,7 @@ SRCINDEX  *si;			/* source sample index */
 
 
 srcvalue(r)			/* punch ray to source and compute value */
-RAY  *r;
+register RAY  *r;
 {
 	register SRCREC  *sp;
 
@@ -161,7 +172,9 @@ RAY  *r;
 					/* check intersection */
 		if (!(*ofun[sp->so->otype].funp)(sp->so, r))
 			return;
-		raycont(r);		/* compute contribution */
+		if (!rayshade(r, r->ro->omod))	/* compute contribution */
+			goto nomat;
+		rayparticipate(r);
 		return;
 	}
 					/* compute intersection */
@@ -169,9 +182,12 @@ RAY  *r;
 			(*ofun[sp->so->otype].funp)(sp->so, r)) {
 		if (sp->sa.success >= 0)
 			sp->sa.success++;
-		raycont(r);		/* compute contribution */
+		if (!rayshade(r, r->ro->omod))	/* compute contribution */
+			goto nomat;
+		rayparticipate(r);
 		return;
 	}
+					/* we missed our mark! */
 	if (sp->sa.success < 0)
 		return;			/* bitched already */
 	sp->sa.success -= AIMREQT;
@@ -180,6 +196,9 @@ RAY  *r;
 	sprintf(errmsg, "aiming failure for light source \"%s\"",
 			sp->so->oname);
 	error(WARNING, errmsg);		/* issue warning */
+	return;
+nomat:
+	objerror(r->ro, USER, "material not found");
 }
 
 
@@ -319,6 +338,7 @@ char  *p;			/* data for f */
 				source[scp->sno].sflags & SFOLLOW )) {
 						/* follow entire path */
 			raycont(&sr);
+			rayparticipate(&sr);
 			if (trace != NULL)
 				(*trace)(&sr);	/* trace execution */
 			if (bright(sr.rcol) <= FTINY)
@@ -354,6 +374,79 @@ char  *p;			/* data for f */
 }
 
 
+srcscatter(r)			/* compute source scattering into ray */
+register RAY  *r;
+{
+	int  oldsampndx;
+	int  nsamps;
+	RAY  sr;
+	SRCINDEX  si;
+	double  t, d;
+	double  re, ge, be;
+	COLOR  cvext;
+	int  i, j;
+
+	if (r->slights == NULL || r->slights[0] == 0
+			|| r->gecc >= 1.-FTINY || r->rot >= FHUGE)
+		return;
+	if (ssampdist <= FTINY || (nsamps = r->rot/ssampdist + .5) < 1)
+		nsamps = 1;
+#if MAXSSAMP
+	else if (nsamps > MAXSSAMP)
+		nsamps = MAXSSAMP;
+#endif
+	oldsampndx = samplendx;
+	samplendx = random()&0x7fff;		/* randomize */
+	for (i = r->slights[0]; i > 0; i--) {	/* for each source */
+		for (j = 0; j < nsamps; j++) {	/* for each sample position */
+			samplendx++;
+			t = r->rot * (j+frandom())/nsamps;
+							/* extinction */
+			re = t*colval(r->cext,RED);
+			ge = t*colval(r->cext,GRN);
+			be = t*colval(r->cext,BLU);
+			setcolor(cvext,	re > 92. ? 0. : exp(-re),
+					ge > 92. ? 0. : exp(-ge),
+					be > 92. ? 0. : exp(-be));
+			if (intens(cvext) <= FTINY)
+				break;			/* too far away */
+			sr.rorg[0] = r->rorg[0] + r->rdir[0]*t;
+			sr.rorg[1] = r->rorg[1] + r->rdir[1]*t;
+			sr.rorg[2] = r->rorg[2] + r->rdir[2]*t;
+			sr.rmax = 0.;
+			initsrcindex(&si);	/* sample ray to this source */
+			si.sn = r->slights[i];
+			nopart(&si, &sr);
+			if (!srcray(&sr, NULL, &si) ||
+					sr.rsrc != r->slights[i])
+				continue;		/* no path */
+			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;
+			if (r->gecc <= FTINY)		/* compute P(theta) */
+				d = 1.;
+			else {
+				d = DOT(r->rdir, sr.rdir);
+				d = 1. + r->gecc*r->gecc - 2.*r->gecc*d;
+				d = (1. - r->gecc*r->gecc) / (d*sqrt(d));
+			}
+							/* other factors */
+			d *= si.dom * r->rot / (4.*PI*nsamps);
+			multcolor(sr.rcol, r->cext);
+			multcolor(sr.rcol, r->albedo);
+			scalecolor(sr.rcol, d);
+			multcolor(sr.rcol, cvext);
+			addcolor(r->rcol, sr.rcol);	/* add it in */
+		}
+	}
+	samplendx = oldsampndx;
+}
+
+
 /****************************************************************
  * The following macros were separated from the m_light() routine
  * because they are very nasty and difficult to understand.
@@ -395,9 +488,9 @@ return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
  * (Glows with negative radii should NEVER participate in illumination.)
  */
 
-#define  distglow(m, r)		(m->otype==MAT_GLOW && \
+#define  distglow(m, r, d)	(m->otype==MAT_GLOW && \
 				m->oargs.farg[3] >= -FTINY && \
-				r->rot > m->oargs.farg[3])
+				d > m->oargs.farg[3])
 
 /* badcomponent *
  *
@@ -410,7 +503,7 @@ return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
 
 #define  badcomponent(m, r)	(r->crtype&(AMBIENT|SPECULAR) && \
 				!(r->crtype&SHADOW || r->rod < 0.0 || \
-					distglow(m, r)))
+		/* not 100% correct */	distglow(m, r, r->rot)))
 
 /* passillum *
  *
@@ -428,8 +521,8 @@ return(o->otype==MAT_ILLUM|o->otype==MAT_GLOW);}
  * The -dv flag is normally on for sources to be visible.
  */
 
-#define  srcignore(m, r)	(!directvis && !(r->crtype&SHADOW) && \
-				!distglow(m, r))
+#define  srcignore(m, r)	!(directvis || r->crtype&SHADOW || \
+				distglow(m, r, raydist(r,PRIMARY)))
 
 
 m_light(m, r)			/* ray hit a light source */
@@ -439,7 +532,7 @@ register RAY  *r;
 						/* check for over-counting */
 	if (badcomponent(m, r))
 		return(1);
-	if (wrongsource(m,r))
+	if (wrongsource(m, r))
 		return(1);
 						/* check for passed illum */
 	if (passillum(m, r)) {
@@ -456,7 +549,7 @@ register RAY  *r;
 	if (srcignore(m, r))
 		return(1);
 						/* check for outside spot */
-	if (m->otype==MAT_SPOT && spotout(r, makespot(m), r->rot>=FHUGE))
+	if (m->otype==MAT_SPOT && spotout(r, makespot(m)))
 		return(1);
 						/* get distribution pattern */
 	raytexture(r, m->omod);