--- ray/src/rt/srcsupp.c	1992/08/28 14:07:45	2.5
+++ ray/src/rt/srcsupp.c	2010/10/25 22:57:45	2.18
@@ -1,13 +1,14 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: srcsupp.c,v 2.18 2010/10/25 22:57:45 greg Exp $";
 #endif
-
 /*
  *  Support routines for source objects and materials
+ *
+ *  External symbols declared in source.h
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
 #include  "otypes.h"
@@ -18,7 +19,7 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "face.h"
 
-#define SRCINC		4		/* realloc increment for array */
+#define SRCINC		8		/* realloc increment for array */
 
 SRCREC  *source = NULL;			/* our list of sources */
 int  nsources = 0;			/* the number of sources */
@@ -26,13 +27,10 @@ int  nsources = 0;			/* the number of sources */
 SRCFUNC  sfun[NUMOTYPE];		/* source dispatch table */
 
 
+void
 initstypes()			/* initialize source dispatch table */
 {
 	extern VSMATERIAL  mirror_vs, direct1_vs, direct2_vs;
-	extern int  fsetsrc(), ssetsrc(), sphsetsrc(), cylsetsrc(), rsetsrc();
-	extern int  nopart(), flatpart(), cylpart();
-	extern double  fgetplaneq(), rgetplaneq();
-	extern double  fgetmaxdisk(), rgetmaxdisk();
 	static SOBJECT  fsobj = {fsetsrc, flatpart, fgetplaneq, fgetmaxdisk};
 	static SOBJECT  ssobj = {ssetsrc, nopart};
 	static SOBJECT  sphsobj = {sphsetsrc, nopart};
@@ -56,17 +54,21 @@ newsource()			/* allocate new source in our array */
 	if (nsources == 0)
 		source = (SRCREC *)malloc(SRCINC*sizeof(SRCREC));
 	else if (nsources%SRCINC == 0)
-		source = (SRCREC *)realloc((char *)source,
+		source = (SRCREC *)realloc((void *)source,
 				(unsigned)(nsources+SRCINC)*sizeof(SRCREC));
 	if (source == NULL)
 		return(-1);
 	source[nsources].sflags = 0;
 	source[nsources].nhits = 1;
-	source[nsources].ntests = 2;	/* initial hit probability = 1/2 */
+	source[nsources].ntests = 2;	/* initial hit probability = 50% */
+#if SHADCACHE
+	source[nsources].obscache = NULL;
+#endif
 	return(nsources++);
 }
 
 
+void
 setflatss(src)				/* set sampling for a flat source */
 register SRCREC  *src;
 {
@@ -86,6 +88,7 @@ register SRCREC  *src;
 }
 
 
+void
 fsetsrc(src, so)			/* set a face as a source */
 register SRCREC  *src;
 OBJREC  *so;
@@ -98,6 +101,8 @@ OBJREC  *so;
 	src->so = so;
 						/* get the face */
 	f = getface(so);
+	if (f->area == 0.0)
+		objerror(so, USER, "zero source area");
 						/* find the center */
 	for (j = 0; j < 3; j++) {
 		src->sloc[j] = 0.0;
@@ -106,7 +111,7 @@ OBJREC  *so;
 		src->sloc[j] /= (double)f->nv;
 	}
 	if (!inface(src->sloc, f))
-		objerror(so, USER, "cannot hit center");
+		objerror(so, USER, "cannot hit source center");
 	src->sflags |= SFLAT;
 	VCOPY(src->snorm, f->norm);
 	src->ss2 = f->area;
@@ -119,8 +124,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]);
@@ -130,6 +134,7 @@ OBJREC  *so;
 }
 
 
+void
 ssetsrc(src, so)			/* set a source as a source */
 register SRCREC  *src;
 register OBJREC  *so;
@@ -140,7 +145,7 @@ register OBJREC  *so;
 	src->so = so;
 	if (so->oargs.nfargs != 4)
 		objerror(so, USER, "bad arguments");
-	src->sflags |= SDISTANT;
+	src->sflags |= (SDISTANT|SCIR);
 	VCOPY(src->sloc, so->oargs.farg);
 	if (normalize(src->sloc) == 0.0)
 		objerror(so, USER, "zero direction");
@@ -156,6 +161,7 @@ register OBJREC  *so;
 }
 
 
+void
 sphsetsrc(src, so)			/* set a sphere as a source */
 register SRCREC  *src;
 register OBJREC  *so;
@@ -167,17 +173,19 @@ register OBJREC  *so;
 	if (so->oargs.nfargs != 4)
 		objerror(so, USER, "bad # arguments");
 	if (so->oargs.farg[3] <= FTINY)
-		objerror(so, USER, "illegal radius");
+		objerror(so, USER, "illegal source radius");
+	src->sflags |= SCIR;
 	VCOPY(src->sloc, so->oargs.farg);
 	src->srad = so->oargs.farg[3];
 	src->ss2 = PI * src->srad * src->srad;
 	for (i = 0; i < 3; i++)
 		src->ss[SU][i] = src->ss[SV][i] = src->ss[SW][i] = 0.0;
 	for (i = 0; i < 3; i++)
-		src->ss[i][i] = .7236 * so->oargs.farg[3];
+		src->ss[i][i] = 0.7236 * so->oargs.farg[3];
 }
 
 
+void
 rsetsrc(src, so)			/* set a ring (disk) as a source */
 register SRCREC  *src;
 OBJREC  *so;
@@ -188,10 +196,12 @@ OBJREC  *so;
 	src->so = so;
 						/* get the ring */
 	co = getcone(so, 0);
+	if (CO_R1(co) <= FTINY)
+		objerror(so, USER, "illegal source radius");
 	VCOPY(src->sloc, CO_P0(co));
 	if (CO_R0(co) > 0.0)
-		objerror(so, USER, "cannot hit center");
-	src->sflags |= SFLAT;
+		objerror(so, USER, "cannot hit source center");
+	src->sflags |= (SFLAT|SCIR);
 	VCOPY(src->snorm, co->ad);
 	src->srad = CO_R1(co);
 	src->ss2 = PI * src->srad * src->srad;
@@ -199,6 +209,7 @@ OBJREC  *so;
 }
 
 
+void
 cylsetsrc(src, so)			/* set a cylinder as a source */
 register SRCREC  *src;
 OBJREC  *so;
@@ -210,6 +221,8 @@ OBJREC  *so;
 	src->so = so;
 						/* get the cylinder */
 	co = getcone(so, 0);
+	if (CO_R0(co) <= FTINY)
+		objerror(so, USER, "illegal source radius");
 	if (CO_R0(co) > .2*co->al)		/* heuristic constraint */
 		objerror(so, WARNING, "source aspect too small");
 	src->sflags |= SCYL;
@@ -243,6 +256,8 @@ register OBJREC  *m;
 		return(ns);
 	if ((ns = (SPOT *)malloc(sizeof(SPOT))) == NULL)
 		return(NULL);
+	if (m->oargs.farg[3] <= FTINY)
+		objerror(m, USER, "zero angle");
 	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)
@@ -252,17 +267,17 @@ register OBJREC  *m;
 }
 
 
-spotout(r, s, dist)		/* check if we're outside spot region */
+int
+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];
@@ -353,6 +368,7 @@ OBJREC  *op;
 }
 
 
+int
 commonspot(sp1, sp2, org)	/* set sp1 to intersection of sp1 and sp2 */
 register SPOT  *sp1, *sp2;
 FVECT  org;
@@ -376,20 +392,18 @@ FVECT  org;
 }
 
 
+int
 commonbeam(sp1, sp2, dir)	/* set sp1 to intersection of sp1 and sp2 */
 register SPOT  *sp1, *sp2;
 FVECT  dir;
 {
 	FVECT  cent, c1, c2;
 	double  rad2, d;
-	register int  i;
 					/* move centers to common plane */
 	d = DOT(sp1->aim, dir);
-	for (i = 0; i < 3; i++)
-		c1[i] = sp1->aim[i] - d*dir[i];
+	VSUM(c1, sp1->aim, dir, -d);
 	d = DOT(sp2->aim, dir);
-	for (i = 0; i < 3; i++)
-		c2[i] = sp2->aim[i] - d*dir[i];
+	VSUM(c2, sp2->aim, dir, -d);
 					/* compute overlap */
 	rad2 = intercircle(cent, c1, c2, sp1->siz/PI, sp2->siz/PI);
 	if (rad2 <= FTINY)
@@ -400,6 +414,7 @@ FVECT  dir;
 }
 
 
+int
 checkspot(sp, nrm)		/* check spotlight for behind source */
 register SPOT  *sp;	/* spotlight */
 FVECT  nrm;		/* source surface normal */
@@ -424,7 +439,6 @@ FVECT  pos;
 {
 	FVECT  onorm;
 	double  offs, d, dist;
-	register int  i;
 
 	offs = getplaneq(onorm, op);
 	d = -DOT(onorm, sp->aim);
@@ -433,8 +447,7 @@ FVECT  pos;
 	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];
+	VSUM(oc, pos, sp->aim, dist);
 	return(sp->siz*dist*dist/PI/(d*d));
 }
 
@@ -448,15 +461,13 @@ 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];
+	VSUM(oc, sp->aim, dir, dist);
 	return(sp->siz/PI/(d*d));
 }
 
@@ -469,10 +480,8 @@ double  r1s, r2s;		/* radii squared */
 {
 	double  a2, d2, l;
 	FVECT  disp;
-	register int  i;
 
-	for (i = 0; i < 3; i++)
-		disp[i] = c2[i] - c1[i];
+	VSUB(disp, c2, c1);
 	d2 = DOT(disp,disp);
 					/* circle within overlap? */
 	if (r1s < r2s) {
@@ -492,42 +501,6 @@ double  r1s, r2s;		/* radii squared */
 		return(0.);
 					/* overlap, compute center */
 	l = sqrt((r1s - a2)/d2);
-	for (i = 0; i < 3; i++)
-		cc[i] = c1[i] + l*disp[i];
+	VSUM(cc, c1, disp, l);
 	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);
 }