--- ray/src/rt/source.c	2005/04/19 01:15:07	2.50
+++ ray/src/rt/source.c	2010/10/28 09:38:46	2.59
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: source.c,v 2.50 2005/04/19 01:15:07 greg Exp $";
+static const char RCSid[] = "$Id: source.c,v 2.59 2010/10/28 09:38:46 greg Exp $";
 #endif
 /*
  *  source.c - routines dealing with illumination sources.
@@ -55,6 +55,10 @@ findmaterial(register OBJREC *o)
 			ao = objptr(aobj);
 			if (ismaterial(ao->otype))
 				return(ao);
+			if (ao->otype == MOD_ALIAS) {
+				o = ao;
+				continue;
+			}
 		}
 		if (o->omod == OVOID)
 			return(NULL);
@@ -82,7 +86,13 @@ marksources(void)			/* find and mark source objects */
 			continue;
 					/* find material */
 		m = findmaterial(objptr(o->omod));
-		if (m == NULL || !islight(m->otype))
+		if (m == NULL)
+			continue;
+		if (m->otype == MAT_CLIP) {
+			markclip(m);	/* special case for antimatter */
+			continue;
+		}
+		if (!islight(m->otype))
 			continue;	/* not source modifier */
 	
 		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
@@ -174,35 +184,38 @@ srcray(				/* send a ray to a source, return domega */
 	SRCINDEX  *si			/* source sample index */
 )
 {
-    double  d;				/* distance to source */
-    register SRCREC  *srcp;
+	double  d;				/* distance to source */
+	register SRCREC  *srcp;
 
-    rayorigin(sr, SHADOW, r, NULL);		/* ignore limits */
+	rayorigin(sr, SHADOW, r, NULL);		/* ignore limits */
 
-    while ((d = nextssamp(sr, si)) != 0.0) {
-	sr->rsrc = si->sn;			/* remember source */
-	srcp = source + si->sn;
-	if (srcp->sflags & SDISTANT) {
-		if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
-			continue;
-		return(1);		/* sample OK */
-	}
+	if (r == NULL)
+		sr->rmax = 0.0;
+
+	while ((d = nextssamp(sr, si)) != 0.0) {
+		sr->rsrc = si->sn;			/* remember source */
+		srcp = source + si->sn;
+		if (srcp->sflags & SDISTANT) {
+			if (srcp->sflags & SSPOT && spotout(sr, srcp->sl.s))
+				continue;
+			return(1);		/* sample OK */
+		}
 				/* local source */
 						/* check proximity */
-	if (srcp->sflags & SPROX && d > srcp->sl.prox)
-		continue;
-						/* check angle */
-	if (srcp->sflags & SSPOT) {
-		if (spotout(sr, srcp->sl.s))
+		if (srcp->sflags & SPROX && d > srcp->sl.prox)
 			continue;
+						/* check angle */
+		if (srcp->sflags & SSPOT) {
+			if (spotout(sr, srcp->sl.s))
+				continue;
 					/* adjust solid angle */
-		si->dom *= d*d;
-		d += srcp->sl.s->flen;
-		si->dom /= d*d;
+			si->dom *= d*d;
+			d += srcp->sl.s->flen;
+			si->dom /= d*d;
+		}
+		return(1);			/* sample OK */
 	}
-	return(1);			/* sample OK */
-    }
-    return(0);			/* no more samples */
+	return(0);			/* no more samples */
 }
 
 
@@ -296,11 +309,13 @@ sourcehit(			/* check to see if ray hit distant source
 		 * If it's a glow or transparent illum, just remember it.
 		 */
 		if (source[i].sflags & SSKIP) {
-			glowsrc = i;
+			if (glowsrc < 0)
+				glowsrc = i;
 			continue;
 		}
 		if (transillum(source[i].so->omod)) {
-			transrc = i;
+			if (transrc < 0)
+				transrc = i;
 			continue;
 		}
 		r->ro = source[i].so;	/* otherwise, use first hit */
@@ -382,7 +397,7 @@ direct(					/* add direct component */
 		scp->sno = sr.rsrc;
 						/* compute coefficient */
 		(*f)(scp->coef, p, sr.rdir, si.dom);
-		cntord[sn].brt = bright(scp->coef);
+		cntord[sn].brt = intens(scp->coef);
 		if (cntord[sn].brt <= 0.0)
 			continue;
 #if SHADCACHE
@@ -395,10 +410,11 @@ direct(					/* add direct component */
 		VCOPY(scp->dir, sr.rdir);
 		copycolor(sr.rcoef, scp->coef);
 						/* compute potential */
-		srcvalue(&sr);
+		sr.revf = srcvalue;
+		rayvalue(&sr);
 		multcolor(sr.rcol, sr.rcoef);
 		copycolor(scp->val, sr.rcol);
-		cntord[sn].brt = bright(scp->val);
+		cntord[sn].brt = bright(sr.rcol);
 	}
 						/* sort contributions */
 	qsort(cntord, sn, sizeof(CNTPTR), cntcmp);
@@ -437,6 +453,7 @@ direct(					/* add direct component */
 		scp = srccnt + cntord[sn].sndx;
 						/* test for hit */
 		rayorigin(&sr, SHADOW, r, NULL);
+		copycolor(sr.rcoef, scp->coef);
 		VCOPY(sr.rdir, scp->dir);
 		sr.rsrc = scp->sno;
 						/* keep statistics */
@@ -451,7 +468,6 @@ direct(					/* add direct component */
 			raycont(&sr);
 			if (trace != NULL)
 				(*trace)(&sr);	/* trace execution */
-			rayparticipate(&sr);
 			if (bright(sr.rcol) <= FTINY) {
 #if SHADCACHE
 				if ((scp <= srccnt || scp[-1].sno != scp->sno)
@@ -461,8 +477,15 @@ direct(					/* add direct component */
 #endif
 				continue;	/* missed! */
 			}
+			rayparticipate(&sr);
+			multcolor(sr.rcol, sr.rcoef);
 			copycolor(scp->val, sr.rcol);
-			multcolor(scp->val, scp->coef);
+		} else if (trace != NULL &&
+			(source[scp->sno].sflags & (SDISTANT|SVIRTUAL|SFOLLOW))
+						== (SDISTANT|SFOLLOW) &&
+				sourcehit(&sr) && rayshade(&sr, sr.ro->omod)) {
+			(*trace)(&sr);		/* trace execution */
+			/* skip call to rayparticipate() & scp->val update */
 		}
 						/* add contribution if hit */
 		addcolor(r->rcol, scp->val);
@@ -484,9 +507,8 @@ direct(					/* add direct component */
 		scp = srccnt + cntord[sn].sndx;
 		prob = hwt * (double)source[scp->sno].nhits /
 				(double)source[scp->sno].ntests;
-		if (prob > 1.0)
-			prob = 1.0;
-		scalecolor(scp->val, prob);
+		if (prob < 1.0)
+			scalecolor(scp->val, prob);
 		addcolor(r->rcol, scp->val);
 	}
 }
@@ -533,7 +555,6 @@ srcscatter(			/* compute source scattering into ray */
 			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);