--- ray/src/rt/srcsupp.c	2003/12/31 02:03:08	2.13
+++ ray/src/rt/srcsupp.c	2014/06/22 18:05:28	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: srcsupp.c,v 2.13 2003/12/31 02:03:08 greg Exp $";
+static const char	RCSid[] = "$Id: srcsupp.c,v 2.20 2014/06/22 18:05:28 greg Exp $";
 #endif
 /*
  *  Support routines for source objects and materials
@@ -19,7 +19,7 @@ static const char	RCSid[] = "$Id: srcsupp.c,v 2.13 200
 
 #include  "face.h"
 
-#define SRCINC		8		/* realloc increment for array */
+#define SRCINC		32		/* realloc increment for array */
 
 SRCREC  *source = NULL;			/* our list of sources */
 int  nsources = 0;			/* the number of sources */
@@ -28,7 +28,7 @@ SRCFUNC  sfun[NUMOTYPE];		/* source dispatch table */
 
 
 void
-initstypes()			/* initialize source dispatch table */
+initstypes(void)			/* initialize source dispatch table */
 {
 	extern VSMATERIAL  mirror_vs, direct1_vs, direct2_vs;
 	static SOBJECT  fsobj = {fsetsrc, flatpart, fgetplaneq, fgetmaxdisk};
@@ -49,7 +49,7 @@ initstypes()			/* initialize source dispatch table */
 
 
 int
-newsource()			/* allocate new source in our array */
+newsource(void)			/* allocate new source in our array */
 {
 	if (nsources == 0)
 		source = (SRCREC *)malloc(SRCINC*sizeof(SRCREC));
@@ -59,8 +59,8 @@ newsource()			/* allocate new source in our array */
 	if (source == NULL)
 		return(-1);
 	source[nsources].sflags = 0;
-	source[nsources].nhits = 0;
-	source[nsources].ntests = 1;	/* initial hit probability = 0 */
+	source[nsources].nhits = 1;
+	source[nsources].ntests = 2;	/* initial hit probability = 50% */
 #if SHADCACHE
 	source[nsources].obscache = NULL;
 #endif
@@ -69,11 +69,12 @@ newsource()			/* allocate new source in our array */
 
 
 void
-setflatss(src)				/* set sampling for a flat source */
-register SRCREC  *src;
+setflatss(				/* set sampling for a flat source */
+	SRCREC  *src
+)
 {
 	double  mult;
-	register int  i;
+	int  i;
 
 	src->ss[SV][0] = src->ss[SV][1] = src->ss[SV][2] = 0.0;
 	for (i = 0; i < 3; i++)
@@ -89,18 +90,21 @@ register SRCREC  *src;
 
 
 void
-fsetsrc(src, so)			/* set a face as a source */
-register SRCREC  *src;
-OBJREC  *so;
+fsetsrc(			/* set a face as a source */
+	SRCREC  *src,
+	OBJREC  *so
+)
 {
-	register FACE  *f;
-	register int  i, j;
+	FACE  *f;
+	int  i, j;
 	double  d;
 	
 	src->sa.success = 2*AIMREQT-1;		/* bitch on second failure */
 	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;
@@ -109,7 +113,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;
@@ -133,9 +137,10 @@ OBJREC  *so;
 
 
 void
-ssetsrc(src, so)			/* set a source as a source */
-register SRCREC  *src;
-register OBJREC  *so;
+ssetsrc(			/* set a source as a source */
+	SRCREC  *src,
+	OBJREC  *so
+)
 {
 	double  theta;
 	
@@ -143,7 +148,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");
@@ -160,43 +165,48 @@ register OBJREC  *so;
 
 
 void
-sphsetsrc(src, so)			/* set a sphere as a source */
-register SRCREC  *src;
-register OBJREC  *so;
+sphsetsrc(			/* set a sphere as a source */
+	SRCREC  *src,
+	OBJREC  *so
+)
 {
-	register int  i;
+	int  i;
 
 	src->sa.success = 2*AIMREQT-1;		/* bitch on second failure */
 	src->so = 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;
+rsetsrc(			/* set a ring (disk) as a source */
+	SRCREC  *src,
+	OBJREC  *so
+)
 {
-	register CONE  *co;
+	CONE  *co;
 	
 	src->sa.success = 2*AIMREQT-1;		/* bitch on second failure */
 	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;
@@ -205,17 +215,20 @@ OBJREC  *so;
 
 
 void
-cylsetsrc(src, so)			/* set a cylinder as a source */
-register SRCREC  *src;
-OBJREC  *so;
+cylsetsrc(			/* set a cylinder as a source */
+	SRCREC  *src,
+	OBJREC  *so
+)
 {
-	register CONE  *co;
-	register int  i;
+	CONE  *co;
+	int  i;
 	
 	src->sa.success = 4*AIMREQT-1;		/* bitch on fourth failure */
 	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;
@@ -240,15 +253,18 @@ OBJREC  *so;
 
 
 SPOT *
-makespot(m)			/* make a spotlight */
-register OBJREC  *m;
+makespot(			/* make a spotlight */
+	OBJREC  *m
+)
 {
-	register SPOT  *ns;
+	SPOT  *ns;
 
 	if ((ns = (SPOT *)m->os) != NULL)
 		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)
@@ -259,9 +275,10 @@ register OBJREC  *m;
 
 
 int
-spotout(r, s)			/* check if we're outside spot region */
-register RAY  *r;
-register SPOT  *s;
+spotout(			/* check if we're outside spot region */
+	RAY  *r,
+	SPOT  *s
+)
 {
 	double  d;
 	FVECT  vd;
@@ -289,14 +306,15 @@ register SPOT  *s;
 
 
 double
-fgetmaxdisk(ocent, op)		/* get center and squared radius of face */
-FVECT  ocent;
-OBJREC  *op;
+fgetmaxdisk(		/* get center and squared radius of face */
+	FVECT  ocent,
+	OBJREC  *op
+)
 {
 	double  maxrad2;
 	double  d;
-	register int  i, j;
-	register FACE  *f;
+	int  i, j;
+	FACE  *f;
 	
 	f = getface(op);
 	if (f->area == 0.)
@@ -321,11 +339,12 @@ OBJREC  *op;
 
 
 double
-rgetmaxdisk(ocent, op)		/* get center and squared radius of ring */
-FVECT  ocent;
-OBJREC  *op;
+rgetmaxdisk(		/* get center and squared radius of ring */
+	FVECT  ocent,
+	OBJREC  *op
+)
 {
-	register CONE  *co;
+	CONE  *co;
 	
 	co = getcone(op, 0);
 	VCOPY(ocent, CO_P0(co));
@@ -334,11 +353,12 @@ OBJREC  *op;
 
 
 double
-fgetplaneq(nvec, op)			/* get plane equation for face */
-FVECT  nvec;
-OBJREC  *op;
+fgetplaneq(			/* get plane equation for face */
+	FVECT  nvec,
+	OBJREC  *op
+)
 {
-	register FACE  *fo;
+	FACE  *fo;
 
 	fo = getface(op);
 	VCOPY(nvec, fo->norm);
@@ -347,11 +367,12 @@ OBJREC  *op;
 
 
 double
-rgetplaneq(nvec, op)			/* get plane equation for ring */
-FVECT  nvec;
-OBJREC  *op;
+rgetplaneq(			/* get plane equation for ring */
+	FVECT  nvec,
+	OBJREC  *op
+)
 {
-	register CONE  *co;
+	CONE  *co;
 
 	co = getcone(op, 0);
 	VCOPY(nvec, co->ad);
@@ -360,9 +381,11 @@ OBJREC  *op;
 
 
 int
-commonspot(sp1, sp2, org)	/* set sp1 to intersection of sp1 and sp2 */
-register SPOT  *sp1, *sp2;
-FVECT  org;
+commonspot(		/* set sp1 to intersection of sp1 and sp2 */
+	SPOT  *sp1,
+	SPOT  *sp2,
+	FVECT  org
+)
 {
 	FVECT  cent;
 	double  rad2, cos1, cos2;
@@ -384,20 +407,19 @@ FVECT  org;
 
 
 int
-commonbeam(sp1, sp2, dir)	/* set sp1 to intersection of sp1 and sp2 */
-register SPOT  *sp1, *sp2;
-FVECT  dir;
+commonbeam(		/* set sp1 to intersection of sp1 and sp2 */
+	SPOT  *sp1,
+	SPOT  *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)
@@ -409,9 +431,10 @@ FVECT  dir;
 
 
 int
-checkspot(sp, nrm)		/* check spotlight for behind source */
-register SPOT  *sp;	/* spotlight */
-FVECT  nrm;		/* source surface normal */
+checkspot(			/* check spotlight for behind source */
+	SPOT  *sp,	/* spotlight */
+	FVECT  nrm	/* source surface normal */
+)
 {
 	double  d, d1;
 
@@ -425,15 +448,15 @@ FVECT  nrm;		/* source surface normal */
 
 
 double
-spotdisk(oc, op, sp, pos)	/* intersect spot with object op */
-FVECT  oc;
-OBJREC  *op;
-register SPOT  *sp;
-FVECT  pos;
+spotdisk(		/* intersect spot with object op */
+	FVECT  oc,
+	OBJREC  *op,
+	SPOT  *sp,
+	FVECT  pos
+)
 {
 	FVECT  onorm;
 	double  offs, d, dist;
-	register int  i;
 
 	offs = getplaneq(onorm, op);
 	d = -DOT(onorm, sp->aim);
@@ -442,46 +465,45 @@ 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));
 }
 
 
 double
-beamdisk(oc, op, sp, dir)	/* intersect beam with object op */
-FVECT  oc;
-OBJREC  *op;
-register SPOT  *sp;
-FVECT  dir;
+beamdisk(		/* intersect beam with object op */
+	FVECT  oc,
+	OBJREC  *op,
+	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];
+	VSUM(oc, sp->aim, dir, dist);
 	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 */
-double  r1s, r2s;		/* radii squared */
+intercircle(				/* intersect two circles */
+	FVECT  cc,		/* midpoint (return value) */
+	FVECT  c1,		/* circle centers */
+	FVECT  c2,
+	double  r1s,		/* radii squared */
+	double	r2s
+)
 {
 	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) {
@@ -501,7 +523,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);
 }