--- ray/src/rt/srcsupp.c	1991/10/22 11:23:47	1.15
+++ ray/src/rt/srcsupp.c	1995/11/07 12:40:30	2.8
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 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]);
@@ -239,16 +238,48 @@ register OBJREC  *m;
 {
 	register SPOT  *ns;
 
+	if ((ns = (SPOT *)m->os) != NULL)
+		return(ns);
 	if ((ns = (SPOT *)malloc(sizeof(SPOT))) == NULL)
 		return(NULL);
 	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");
+	m->os = (char *)ns;
 	return(ns);
 }
 
 
+spotout(r, s)			/* check if we're outside spot region */
+register RAY  *r;
+register SPOT  *s;
+{
+	double  d;
+	FVECT  vd;
+	
+	if (s == NULL)
+		return(0);
+	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];
+		d = DOT(r->rdir,vd);
+		/*			wrong side?
+		if (d <= FTINY)
+			return(1);	*/
+		d = DOT(vd,vd) - d*d;
+		if (PI*d > s->siz)
+			return(1);	/* out */
+		return(0);	/* OK */
+	}
+					/* local source */
+	if (s->siz < 2.0*PI * (1.0 + DOT(s->aim,r->rdir)))
+		return(1);	/* out */
+	return(0);	/* OK */
+}
+
+
 double
 fgetmaxdisk(ocent, op)		/* get center and squared radius of face */
 FVECT  ocent;
@@ -462,90 +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);
-}
-
-
-#define  wrongsource(m, r)	(r->rsrc>=0 && \
-				source[r->rsrc].so!=r->ro && \
-				(m->otype!=MAT_ILLUM || \
-			objptr(source[r->rsrc].so->omod)->otype==MAT_ILLUM))
-
-#define  distglow(m, r)		(m->otype==MAT_GLOW && \
-				r->rot > m->oargs.farg[3])
-
-#define  badambient(m, r)	((r->crtype&(AMBIENT|SHADOW))==AMBIENT && \
-				!distglow(m, r))
-
-#define  passillum(m, r)	(m->otype==MAT_ILLUM && \
-				!(r->rsrc>=0&&source[r->rsrc].so==r->ro))
-
-#define  srcignore(m, r)	(directinvis && !(r->crtype&SHADOW) && \
-				!distglow(m, r))
-
-
-m_light(m, r)			/* ray hit a light source */
-register OBJREC  *m;
-register RAY  *r;
-{
-						/* check for over-counting */
-	if (wrongsource(m, r) || badambient(m, r))
-		return;
-						/* check for passed illum */
-	if (passillum(m, r)) {
-		if (m->oargs.nsargs < 1 || !strcmp(m->oargs.sarg[0], VOIDID))
-			raytrans(r);
-		else
-			rayshade(r, modifier(m->oargs.sarg[0]));
-		return;
-	}
-					/* otherwise treat as source */
-						/* check for behind */
-	if (r->rod < 0.0)
-		return;
-						/* check for invisibility */
-	if (srcignore(m, r))
-		return;
-						/* get distribution pattern */
-	raytexture(r, m->omod);
-						/* get source color */
-	setcolor(r->rcol, m->oargs.farg[0],
-			  m->oargs.farg[1],
-			  m->oargs.farg[2]);
-						/* modify value */
-	multcolor(r->rcol, r->pcol);
 }