--- ray/src/rt/srcsupp.c	2003/02/22 02:07:29	2.9
+++ ray/src/rt/srcsupp.c	2005/10/16 16:04:10	2.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: srcsupp.c,v 2.9 2003/02/22 02:07:29 greg Exp $";
+static const char	RCSid[] = "$Id: srcsupp.c,v 2.15 2005/10/16 16:04:10 greg Exp $";
 #endif
 /*
  *  Support routines for source objects and materials
@@ -7,62 +7,7 @@ static const char	RCSid[] = "$Id: srcsupp.c,v 2.9 2003
  *  External symbols declared in source.h
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 #include  "ray.h"
 
@@ -74,7 +19,7 @@ static const char	RCSid[] = "$Id: srcsupp.c,v 2.9 2003
 
 #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 */
@@ -109,13 +54,16 @@ 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++);
 }
 
@@ -161,7 +109,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 center for source");
 	src->sflags |= SFLAT;
 	VCOPY(src->snorm, f->norm);
 	src->ss2 = f->area;
@@ -247,7 +195,7 @@ OBJREC  *so;
 	co = getcone(so, 0);
 	VCOPY(src->sloc, CO_P0(co));
 	if (CO_R0(co) > 0.0)
-		objerror(so, USER, "cannot hit center");
+		objerror(so, USER, "cannot hit center for source");
 	src->sflags |= SFLAT;
 	VCOPY(src->snorm, co->ad);
 	src->srad = CO_R1(co);