--- ray/src/rt/ambcomp.c	2005/04/19 01:15:06	2.14
+++ ray/src/rt/ambcomp.c	2005/05/31 18:01:09	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ambcomp.c,v 2.14 2005/04/19 01:15:06 greg Exp $";
+static const char	RCSid[] = "$Id: ambcomp.c,v 2.16 2005/05/31 18:01:09 greg Exp $";
 #endif
 /*
  * Routines to compute "ambient" values using Monte Carlo
@@ -16,28 +16,30 @@ static const char	RCSid[] = "$Id: ambcomp.c,v 2.14 200
 #include  "random.h"
 
 
-int
+void
 inithemi(			/* initialize sampling hemisphere */
 	register AMBHEMI  *hp,
+	COLOR ac,
 	RAY  *r,
-	COLOR ac, 
 	double  wt
 )
 {
-	int	ns;
 	double	d;
 	register int  i;
 					/* set number of divisions */
+	if (ambacc <= FTINY &&
+			wt > (d = 0.8*bright(ac)*r->rweight/(ambdiv*minweight)))
+		wt = d;			/* avoid ray termination */
 	hp->nt = sqrt(ambdiv * wt / PI) + 0.5;
 	i = ambacc > FTINY ? 3 : 1;	/* minimum number of samples */
 	if (hp->nt < i)
 		hp->nt = i;
 	hp->np = PI * hp->nt + 0.5;
 					/* set number of super-samples */
-	ns = ambssamp * wt + 0.5;
+	hp->ns = ambssamp * wt + 0.5;
 					/* assign coefficient */
-	d = 1.0/(hp->nt*hp->np + ns);	/* XXX weight not uniform if ns > 0 */
 	copycolor(hp->acoef, ac);
+	d = 1.0/(hp->nt*hp->np);
 	scalecolor(hp->acoef, d);
 					/* make axes */
 	VCOPY(hp->uz, r->ron);
@@ -51,7 +53,6 @@ inithemi(			/* initialize sampling hemisphere */
 	fcross(hp->ux, hp->uy, hp->uz);
 	normalize(hp->ux);
 	fcross(hp->uy, hp->uz, hp->ux);
-	return(ns);
 }
 
 
@@ -69,14 +70,15 @@ divsample(				/* sample a division */
 	double  b2;
 	double  phi;
 	register int  i;
-					/* assign coefficient */
-	if (ambacc <= FTINY)		/* no storage, so report accurately */
-		copycolor(ar.rcoef, h->acoef);
-	else				/* else lie for sake of cache */
+					/* ambient coefficient for weight */
+	if (ambacc > FTINY)
 		setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
+	else
+		copycolor(ar.rcoef, h->acoef);
 	if (rayorigin(&ar, AMBIENT, r, ar.rcoef) < 0)
 		return(-1);
-	copycolor(ar.rcoef, h->acoef);	/* correct coefficient rtrace output */
+	if (ambacc > FTINY)
+		copycolor(ar.rcoef, h->acoef);
 	hlist[0] = r->rno;
 	hlist[1] = dp->t;
 	hlist[2] = dp->p;
@@ -93,6 +95,7 @@ divsample(				/* sample a division */
 	dimlist[ndims++] = dp->t*h->np + dp->p + 90171;
 	rayvalue(&ar);
 	ndims--;
+	multcolor(ar.rcol, ar.rcoef);	/* apply coefficient */
 	addcolor(dp->v, ar.rcol);
 					/* use rt to improve gradient calc */
 	if (ar.rt > FTINY && ar.rt < FHUGE)
@@ -145,7 +148,6 @@ double
 doambient(				/* compute ambient component */
 	COLOR  acol,
 	RAY  *r,
-	COLOR  ac,
 	double  wt,
 	FVECT  pg,
 	FVECT  dg
@@ -157,17 +159,17 @@ doambient(				/* compute ambient component */
 	AMBSAMP  dnew;
 	register AMBSAMP  *dp;
 	double  arad;
-	int  ndivs, ns;
+	int  ndivs;
 	register int  i, j;
-					/* initialize color */
-	setcolor(acol, 0.0, 0.0, 0.0);
 					/* initialize hemisphere */
-	ns = inithemi(&hemi, r, ac, wt);
+	inithemi(&hemi, acol, r, wt);
 	ndivs = hemi.nt * hemi.np;
+					/* initialize sum */
+	setcolor(acol, 0.0, 0.0, 0.0);
 	if (ndivs == 0)
 		return(0.0);
 					/* allocate super-samples */
-	if (ns > 0 || pg != NULL || dg != NULL) {
+	if (hemi.ns > 0 || pg != NULL || dg != NULL) {
 		div = (AMBSAMP *)malloc(ndivs*sizeof(AMBSAMP));
 		if (div == NULL)
 			error(SYSTEM, "out of memory in doambient");
@@ -183,26 +185,29 @@ doambient(				/* compute ambient component */
 			setcolor(dp->v, 0.0, 0.0, 0.0);
 			dp->r = 0.0;
 			dp->n = 0;
-			if (divsample(dp, &hemi, r) < 0)
-				goto oopsy;
+			if (divsample(dp, &hemi, r) < 0) {
+				if (div != NULL) dp++;
+				continue;
+			}
 			arad += dp->r;
 			if (div != NULL)
 				dp++;
 			else
 				addcolor(acol, dp->v);
 		}
-	if (ns > 0 && arad > FTINY && ndivs/arad < minarad)
-		ns = 0;			/* close enough */
-	else if (ns > 0) {		/* else perform super-sampling */
+	if (hemi.ns > 0 && arad > FTINY && ndivs/arad < minarad)
+		hemi.ns = 0;		/* close enough */
+	else if (hemi.ns > 0) {		/* else perform super-sampling */
 		comperrs(div, &hemi);			/* compute errors */
 		qsort(div, ndivs, sizeof(AMBSAMP), ambcmp);	/* sort divs */
 						/* super-sample */
-		for (i = ns; i > 0; i--) {
+		for (i = hemi.ns; i > 0; i--) {
 			dnew = *div;
-			if (divsample(&dnew, &hemi, r) < 0)
-				goto oopsy;
-							/* reinsert */
-			dp = div;
+			if (divsample(&dnew, &hemi, r) < 0) {
+				dp++;
+				continue;
+			}
+			dp = div;		/* reinsert */
 			j = ndivs < i ? ndivs : i;
 			while (--j > 0 && dnew.k < dp[1].k) {
 				*dp = *(dp+1);
@@ -228,7 +233,7 @@ doambient(				/* compute ambient component */
 		}
 		b = bright(acol);
 		if (b > FTINY) {
-			b = ndivs/b;
+			b = 1.0/b;	/* normalize gradient(s) */
 			if (pg != NULL) {
 				posgradient(pg, div, &hemi);
 				for (i = 0; i < 3; i++)
@@ -249,12 +254,10 @@ doambient(				/* compute ambient component */
 		}
 		free((void *)div);
 	}
-	b = 1.0/ndivs;
-	scalecolor(acol, b);
 	if (arad <= FTINY)
 		arad = maxarad;
 	else
-		arad = (ndivs+ns)/arad;
+		arad = (ndivs+hemi.ns)/arad;
 	if (pg != NULL) {		/* reduce radius if gradient large */
 		d = DOT(pg,pg);
 		if (d*arad*arad > 1.0)
@@ -271,10 +274,6 @@ doambient(				/* compute ambient component */
 	if ((arad /= sqrt(wt)) > maxarad)
 		arad = maxarad;
 	return(arad);
-oopsy:
-	if (div != NULL)
-		free((void *)div);
-	return(0.0);
 }
 
 
@@ -384,7 +383,7 @@ posgradient(					/* compute position gradient */
 		yd += mag0*sinp + mag1*cosp;
 	}
 	for (i = 0; i < 3; i++)
-		gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/PI;
+		gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])*(hp->nt*hp->np)/PI;
 }
 
 
@@ -419,5 +418,5 @@ dirgradient(					/* compute direction gradient */
 		yd += mag * tsin(phi);
 	}
 	for (i = 0; i < 3; i++)
-		gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/(hp->nt*hp->np);
+		gv[i] = xd*hp->ux[i] + yd*hp->uy[i];
 }