--- ray/src/rt/source.c	1990/03/27 11:40:13	1.21
+++ ray/src/rt/source.c	1990/12/21 11:32:39	1.28
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1990 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -32,7 +32,10 @@ extern double  shadcert;		/* shadow testing certainty 
 SRCREC  *source = NULL;			/* our list of sources */
 int  nsources = 0;			/* the number of sources */
 
+static CONTRIB  *srccnt;		/* source contributions in direct() */
+static CNTPTR  *cntord;			/* source ordering in direct() */
 
+
 marksources()			/* find and mark source objects */
 {
 	register OBJREC  *o, *m;
@@ -47,10 +50,7 @@ marksources()			/* find and mark source objects */
 
 		m = objptr(o->omod);
 
-		if (m->otype != MAT_LIGHT &&
-				m->otype != MAT_ILLUM &&
-				m->otype != MAT_GLOW &&
-				m->otype != MAT_SPOT)
+		if (!islight(m->otype))
 			continue;
 	
 		if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 :
@@ -68,7 +68,7 @@ marksources()			/* find and mark source objects */
 			source = (SRCREC *)realloc((char *)source,
 					(unsigned)(nsources+1)*sizeof(SRCREC));
 		if (source == NULL)
-			error(SYSTEM, "out of memory in marksources");
+			goto memerr;
 
 		newsource(&source[nsources], o);
 
@@ -83,6 +83,17 @@ marksources()			/* find and mark source objects */
 		}
 		nsources++;
 	}
+	if (nsources <= 0) {
+		error(WARNING, "no light sources found");
+		return;
+	}
+	srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
+	cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
+	if (srccnt != NULL && cntord != NULL)
+		return;
+	/* fall through */
+memerr:
+	error(SYSTEM, "out of memory in marksources");
 }
 
 
@@ -226,26 +237,24 @@ register int  sn;		/* source number */
 						/* domega constant */
 		return(source[sn].ss2);
 
-	else {
 						/* check proximity */
-		if (source[sn].sflags & SPROX &&
-				d > source[sn].sl.prox)
-			return(0.0);
-
-		if (norm != NULL)
-			ddot /= d;
-		else
-			ddot = 1.0;
+	if (source[sn].sflags & SPROX &&
+			d > source[sn].sl.prox)
+		return(0.0);
+						/* compute dot product */
+	if (norm != NULL)
+		ddot /= d;
+	else
+		ddot = 1.0;
 						/* check angle */
-		if (source[sn].sflags & SSPOT) {
-			if (source[sn].sl.s->siz < 2.0*PI *
+	if (source[sn].sflags & SSPOT) {
+		if (source[sn].sl.s->siz < 2.0*PI *
 				(1.0 + DOT(source[sn].sl.s->aim,sr->rdir)))
-				return(0.0);
-			d += source[sn].sl.s->flen;
-		}
-						/* return domega */
-		return(ddot*source[sn].ss2/(d*d));
+			return(0.0);
+		d += source[sn].sl.s->flen;	/* adjust length */
 	}
+						/* compute domega */
+	return(ddot*source[sn].ss2/(d*d));
 }
 
 
@@ -277,8 +286,7 @@ register RAY  *r;
 		for (i = 0; i < 3; i++)
 			r->ron[i] = -r->rdir[i];
 		r->rod = 1.0;
-		r->rofs = 1.0; setident4(r->rofx);
-		r->robs = 1.0; setident4(r->robx);
+		r->rox = NULL;
 		return(1);
 	}
 	return(0);
@@ -304,16 +312,12 @@ char  *p;			/* data for f */
 {
 	extern double  pow();
 	register int  sn;
-	register CONTRIB  *srccnt;
-	register CNTPTR  *cntord;
 	int  nshadcheck, ncnts;
 	double  prob, ourthresh, hwt, test2, hit2;
 	RAY  sr;
-
-	srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB));
-	cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR));
-	if (srccnt == NULL || cntord == NULL)
-		error(SYSTEM, "out of memory in direct");
+			/* NOTE: srccnt and cntord global so no recursion */
+	if (nsources <= 0)
+		return;		/* no sources?! */
 						/* compute number to check */
 	nshadcheck = pow((double)nsources, shadcert) + .5;
 						/* modify threshold */
@@ -335,8 +339,14 @@ char  *p;			/* data for f */
 		if (!( source[sn].sflags & SDISTANT ?
 				sourcehit(&sr) :
 				(*ofun[source[sn].so->otype].funp)
-				(source[sn].so, &sr) ))
+				(source[sn].so, &sr) )) {
+			sprintf(errmsg,
+				"aiming failure for light source \"%s\"",
+					source[sn].so->oname);
+			error(WARNING, errmsg);
+			cntord[sn].brt = 0.0;
 			continue;
+		}
 						/* compute contribution */
 		raycont(&sr);
 		multcolor(srccnt[sn].val, sr.rcol);
@@ -365,8 +375,8 @@ char  *p;			/* data for f */
 	for (sn = 0; sn < ncnts; sn++) {
 						/* check threshold */
 		if ((sn+nshadcheck>=ncnts ? cntord[sn].brt :
-				cntord[sn].brt-cntord[sn+nshadcheck].brt) <
-				ourthresh*bright(r->rcol))
+				cntord[sn].brt-cntord[sn+nshadcheck].brt)
+				< ourthresh*bright(r->rcol))
 			break;
 						/* get statistics */
 		hwt = (double)source[cntord[sn].sno].nhits /
@@ -407,9 +417,6 @@ char  *p;			/* data for f */
 		scalecolor(srccnt[cntord[sn].sno].val, prob);
 		addcolor(r->rcol, srccnt[cntord[sn].sno].val);
 	}
-		
-	free(srccnt);
-	free(cntord);
 }
 
 
@@ -457,6 +464,3 @@ register RAY  *r;
 		r->rt = r->rot;
 	}
 }
-
-
-o_source() {}		/* intersection with a source is done elsewhere */