--- ray/src/rt/srcsamp.c	1991/10/22 15:45:21	1.4
+++ ray/src/rt/srcsamp.c	2003/02/22 02:07:29	2.7
@@ -1,13 +1,69 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: srcsamp.c,v 2.7 2003/02/22 02:07:29 greg Exp $";
 #endif
-
 /*
  * Source sampling routines
+ *
+ *  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  "ray.h"
 
 #include  "source.h"
@@ -15,6 +71,9 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "random.h"
 
 
+static int  cyl_partit(), flt_partit();
+
+
 double
 nextssamp(r, si)		/* compute sample for source, rtn. distance */
 register RAY  *r;		/* origin is read, direction is set */
@@ -24,11 +83,13 @@ register SRCINDEX  *si;		/* source index (modified to 
 	FVECT  vpos;
 	double  d;
 	register int  i;
-tryagain:
+nextsample:
 	while (++si->sp >= si->np) {	/* get next sample */
 		if (++si->sn >= nsources)
 			return(0.0);	/* no more */
-		if (srcsizerat <= FTINY)
+		if (source[si->sn].sflags & SSKIP)
+			si->np = 0;
+		else if (srcsizerat <= FTINY)
 			nopart(si, r);
 		else {
 			for (i = si->sn; source[i].sflags & SVIRTUAL;
@@ -74,31 +135,31 @@ tryagain:
 			r->rdir[i] -= r->rorg[i];
 					/* compute distance */
 	if ((d = normalize(r->rdir)) == 0.0)
-		goto tryagain;	/* at source! */
+		goto nextsample;		/* at source! */
 
 					/* compute sample size */
-	si->dom  = source[si->sn].ss2;
 	if (source[si->sn].sflags & SFLAT) {
-		si->dom *= sflatform(si->sn, r->rdir);
-		if (si->dom <= FTINY) {		/* behind source */
-			si->np = 0;
-			goto tryagain;
-		}
-		si->dom *= (double)(size[SU]*size[SV])/(MAXSPART*MAXSPART);
+		si->dom = sflatform(si->sn, r->rdir);
+		si->dom *= size[SU]*size[SV]/(MAXSPART*(double)MAXSPART);
 	} else if (source[si->sn].sflags & SCYL) {
-		si->dom *= scylform(si->sn, r->rdir);
-		si->dom *= (double)size[SU]/MAXSPART;
+		si->dom = scylform(si->sn, r->rdir);
+		si->dom *= size[SU]/(double)MAXSPART;
 	} else {
-		si->dom *= (double)(size[SU]*size[SV]*size[SW]) /
-				(MAXSPART*MAXSPART*MAXSPART) ;
+		si->dom = size[SU]*size[SV]*(double)size[SW] /
+				(MAXSPART*MAXSPART*(double)MAXSPART) ;
 	}
-	if (source[si->sn].sflags & SDISTANT)
+	if (source[si->sn].sflags & SDISTANT) {
+		si->dom *= source[si->sn].ss2;
 		return(FHUGE);
-	si->dom /= d*d;
+	}
+	if (si->dom <= 1e-4)
+		goto nextsample;		/* behind source? */
+	si->dom *= source[si->sn].ss2/(d*d);
 	return(d);		/* sample OK, return distance */
 }
 
 
+int
 skipparts(ct, sz, pp, pt)		/* skip to requested partition */
 int  ct[3], sz[3];		/* center and size of partition (returned) */
 register int  pp[2];		/* current index, number to skip (modified) */
@@ -130,6 +191,7 @@ unsigned char  *pt;		/* partition array */
 }
 
 
+void
 nopart(si, r)			/* single source partition */
 register SRCINDEX  *si;
 RAY  *r;
@@ -140,6 +202,7 @@ RAY  *r;
 }
 
 
+void
 cylpart(si, r)			/* partition a cylinder */
 SRCINDEX  *si;
 register RAY  *r;
@@ -165,8 +228,8 @@ register RAY  *r;
 		return;
 	}
 	safedist2 *= 4.*r->rweight*r->rweight/(srcsizerat*srcsizerat);
-	if (dist2 <= 4.*rad2 ||		/* point too close to subdivide? */
-			dist2cent >= safedist2) {	/* too far? */
+	if (dist2 <= 4.*rad2 ||		/* point too close to subdivide */
+			dist2cent >= safedist2) {	/* or too far */
 		setpart(si->spt, 0, S0);
 		si->np = 1;
 		return;
@@ -216,21 +279,32 @@ double  d2;
 }
 
 
+void
 flatpart(si, r)				/* partition a flat source */
 register SRCINDEX  *si;
-RAY  *r;
+register RAY  *r;
 {
-	register double  *vp;
+	register FLOAT  *vp;
+	FVECT  v;
 	double  du2, dv2;
 	int  pi;
 
+	clrpart(si->spt);
+	vp = source[si->sn].sloc;
+	v[0] = r->rorg[0] - vp[0];
+	v[1] = r->rorg[1] - vp[1];
+	v[2] = r->rorg[2] - vp[2];
+	vp = source[si->sn].snorm;
+	if (DOT(v,vp) <= FTINY) {	/* behind source */
+		si->np = 0;
+		return;
+	}
 	dv2 = 2.*r->rweight/srcsizerat;
 	dv2 *= dv2;
 	vp = source[si->sn].ss[SU];
 	du2 = dv2 * DOT(vp,vp);
 	vp = source[si->sn].ss[SV];
 	dv2 *= DOT(vp,vp);
-	clrpart(si->spt);
 	pi = 0;
 	si->np = flt_partit(r->rorg, si->spt, &pi, MAXSPART,
 		source[si->sn].sloc,
@@ -294,7 +368,7 @@ scylform(sn, dir)		/* compute cosine for cylinder's pr
 int  sn;
 register FVECT  dir;		/* assume normalized */
 {
-	register double  *dv;
+	register FLOAT  *dv;
 	double  d;
 
 	dv = source[sn].ss[SU];