--- ray/src/rt/srcsupp.c	1992/08/28 14:07:45	2.5
+++ ray/src/rt/srcsupp.c	1995/11/07 12:40:30	2.8
@@ -1,4 +1,4 @@
-/* Copyright (c) 1992 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -119,8 +119,7 @@ OBJREC  *so;
 	}
 	src->srad = sqrt(src->srad);
 						/* compute size vectors */
-	if (f->nv == 4 || (f->nv == 5 &&	/* parallelogram case */
-			dist2(VERTEX(f,0),VERTEX(f,4)) <= FTINY*FTINY))
+	if (f->nv == 4)				/* parallelogram case */
 		for (j = 0; j < 3; j++) {
 			src->ss[SU][j] = .5*(VERTEX(f,1)[j]-VERTEX(f,0)[j]);
 			src->ss[SV][j] = .5*(VERTEX(f,3)[j]-VERTEX(f,0)[j]);
@@ -252,17 +251,16 @@ register OBJREC  *m;
 }
 
 
-spotout(r, s, dist)		/* check if we're outside spot region */
+spotout(r, s)			/* check if we're outside spot region */
 register RAY  *r;
 register SPOT  *s;
-int  dist;
 {
 	double  d;
 	FVECT  vd;
 	
 	if (s == NULL)
 		return(0);
-	if (dist) {			/* distant source */
+	if (s->flen < -FTINY) {		/* distant source */
 		vd[0] = s->aim[0] - r->rorg[0];
 		vd[1] = s->aim[1] - r->rorg[1];
 		vd[2] = s->aim[2] - r->rorg[2];
@@ -495,39 +493,4 @@ double  r1s, r2s;		/* radii squared */
 	for (i = 0; i < 3; i++)
 		cc[i] = c1[i] + l*disp[i];
 	return(a2);
-}
-
-
-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);
 }