--- ray/src/rt/srcsupp.c	1991/06/24 16:00:30	1.5
+++ ray/src/rt/srcsupp.c	1991/08/14 08:19:20	1.11
@@ -27,7 +27,7 @@ SRCFUNC  sfun[NUMOTYPE];		/* source dispatch table */
 
 initstypes()			/* initialize source dispatch table */
 {
-	extern VSMATERIAL  mirror_vs;
+	extern VSMATERIAL  mirror_vs, direct1_vs, direct2_vs;
 	extern int  fsetsrc(), ssetsrc(), sphsetsrc(), rsetsrc();
 	extern double  fgetplaneq(), rgetplaneq();
 	extern double  fgetmaxdisk(), rgetmaxdisk();
@@ -37,6 +37,8 @@ initstypes()			/* initialize source dispatch table */
 	static SOBJECT  rsobj = {rsetsrc, rgetplaneq, rgetmaxdisk};
 
 	sfun[MAT_MIRROR].mf = &mirror_vs;
+	sfun[MAT_DIRECT1].mf = &direct1_vs;
+	sfun[MAT_DIRECT2].mf = &direct2_vs;
 	sfun[OBJ_FACE].of = &fsobj;
 	sfun[OBJ_SOURCE].of = &ssobj;
 	sfun[OBJ_SPHERE].of = &sphsobj;
@@ -105,7 +107,7 @@ register OBJREC  *so;
 	theta = PI/180.0/2.0 * so->oargs.farg[3];
 	if (theta <= FTINY)
 		objerror(so, USER, "zero size");
-	src->ss = theta >= PI/4 ? 1.0 : tan(theta);
+	src->ss = theta >= PI/4.0 ? 1.0 : tan(theta);
 	src->ss2 = 2.0*PI * (1.0 - cos(theta));
 }
 
@@ -288,14 +290,60 @@ FVECT  nrm;		/* source surface normal */
 
 	d = DOT(sp->aim, nrm);
 	if (d > FTINY)			/* center in front? */
-		return(0);
+		return(1);
 					/* else check horizon */
 	d1 = 1. - sp->siz/(2.*PI);
-	return(1.-FTINY-d*d > d1*d1);
+	return(1.-FTINY-d*d < d1*d1);
 }
 
 
 double
+spotdisk(oc, op, sp, pos)	/* intersect spot with object op */
+FVECT  oc;
+OBJREC  *op;
+register SPOT  *sp;
+FVECT  pos;
+{
+	FVECT  onorm;
+	double  offs, d, dist;
+	register int  i;
+
+	offs = getplaneq(onorm, op);
+	d = -DOT(onorm, sp->aim);
+	if (d >= -FTINY && d <= FTINY)
+		return(0.);
+	dist = (DOT(pos, onorm) - offs)/d;
+	if (dist < 0.)
+		return(0.);
+	for (i = 0; i < 3; i++)
+		oc[i] = pos[i] + dist*sp->aim[i];
+	return(sp->siz*dist*dist/PI/(d*d));
+}
+
+
+double
+beamdisk(oc, op, sp, dir)	/* intersect beam with object op */
+FVECT  oc;
+OBJREC  *op;
+register SPOT  *sp;
+FVECT  dir;
+{
+	FVECT  onorm;
+	double  offs, d, dist;
+	register int  i;
+
+	offs = getplaneq(onorm, op);
+	d = -DOT(onorm, dir);
+	if (d >= -FTINY && d <= FTINY)
+		return(0.);
+	dist = (DOT(sp->aim, onorm) - offs)/d;
+	for (i = 0; i < 3; i++)
+		oc[i] = sp->aim[i] + dist*dir[i];
+	return(sp->siz/PI/(d*d));
+}
+
+
+double
 intercircle(cc, c1, c2, r1s, r2s)	/* intersect two circles */
 FVECT  cc;			/* midpoint (return value) */
 FVECT  c1, c2;			/* circle centers */
@@ -367,17 +415,24 @@ register RAY  *r;
 }
 
 
-#define  wrongsource(m, r)	(m->otype!=MAT_ILLUM && \
-				r->rsrc>=0 && \
-				source[r->rsrc].so!=r->ro)
+#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 && \
-				!(m->otype==MAT_GLOW&&r->rot>m->oargs.farg[3]))
+				!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;
@@ -387,24 +442,25 @@ register RAY  *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]));
-
-						/* otherwise treat as source */
-	} else {
+		return;
+	}
+					/* otherwise treat as source */
 						/* check for behind */
-		if (r->rod < 0.0)
-			return;
+	if (r->rod < 0.0)
+		return;
+						/* check for invisibility */
+	if (srcignore(m, r))
+		return;
 						/* get distribution pattern */
-		raytexture(r, m->omod);
+	raytexture(r, m->omod);
 						/* get source color */
-		setcolor(r->rcol, m->oargs.farg[0],
-				  m->oargs.farg[1],
-				  m->oargs.farg[2]);
+	setcolor(r->rcol, m->oargs.farg[0],
+			  m->oargs.farg[1],
+			  m->oargs.farg[2]);
 						/* modify value */
-		multcolor(r->rcol, r->pcol);
-	}
+	multcolor(r->rcol, r->pcol);
 }