--- ray/src/rt/source.c	1992/08/28 14:07:41	2.4
+++ ray/src/rt/source.c	1992/10/22 09:55:16	2.7
@@ -183,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;
@@ -201,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;
@@ -224,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);
@@ -270,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)
@@ -305,11 +341,11 @@ 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);
 	}
 }