--- ray/src/rt/ambcomp.c	1991/06/07 13:43:05	1.2
+++ ray/src/rt/ambcomp.c	1991/07/11 16:39:00	1.9
@@ -54,7 +54,6 @@ AMBSAMP  *d1, *d2;
 }
 
 
-double
 divsample(dp, h, r)			/* sample a division */
 register AMBSAMP  *dp;
 AMBHEMI  *h;
@@ -68,14 +67,14 @@ RAY  *r;
 	register int  i;
 
 	if (rayorigin(&ar, r, AMBIENT, 0.5) < 0)
-		return(0.0);
+		return(-1);
 	hlist[0] = r->rno;
 	hlist[1] = dp->t;
 	hlist[2] = dp->p;
 	hlist[3] = 0;
-	zd = sqrt((dp->t+urand(ilhash(hlist,4)+dp->n))/h->nt);
+	zd = sqrt((dp->t+urand(urind(ilhash(hlist,4),dp->n)))/h->nt);
 	hlist[3] = 1;
-	phi = 2.0*PI * (dp->p+urand(ilhash(hlist,4)+dp->n))/h->np;
+	phi = 2.0*PI * (dp->p+urand(urind(ilhash(hlist,4),dp->n)))/h->np;
 	xd = cos(phi) * zd;
 	yd = sin(phi) * zd;
 	zd = sqrt(1.0 - zd*zd);
@@ -87,8 +86,8 @@ RAY  *r;
 	rayvalue(&ar);
 	ndims--;
 	addcolor(dp->v, ar.rcol);
-	if (ar.rot < FHUGE)
-		dp->r += 1.0/ar.rot;
+	if (ar.rt > FTINY && ar.rt < FHUGE)
+		dp->r += 1.0/ar.rt;
 					/* (re)initialize error */
 	if (dp->n++) {
 		b2 = bright(dp->v)/dp->n - bright(ar.rcol);
@@ -96,7 +95,7 @@ RAY  *r;
 		dp->k = b2/(dp->n*dp->n);
 	} else
 		dp->k = 0.0;
-	return(ar.rot);
+	return(0);
 }
 
 
@@ -139,7 +138,7 @@ FVECT  pg, dg;
 			setcolor(dp->v, 0.0, 0.0, 0.0);
 			dp->r = 0.0;
 			dp->n = 0;
-			if ((d = divsample(dp, &hemi, r)) == 0.0)
+			if (divsample(dp, &hemi, r) < 0)
 				goto oopsy;
 			if (div != NULL)
 				dp++;
@@ -149,21 +148,13 @@ FVECT  pg, dg;
 			}
 		}
 	if (ns > 0) {			/* perform super-sampling */
-		comperrs(div, hemi);			/* compute errors */
+		comperrs(div, &hemi);			/* compute errors */
 		qsort(div, ndivs, sizeof(AMBSAMP), ambcmp);	/* sort divs */
-		dp = div + ndivs;			/* skim excess */
-		for (i = ndivs; i > ns; i--) {
-			dp--;
-			addcolor(acol, dp->v);
-			arad += dp->r;
-		}
 						/* super-sample */
 		for (i = ns; i > 0; i--) {
 			copystruct(&dnew, div);
-			if ((d = divsample(&dnew, &hemi)) == 0.0)
+			if (divsample(&dnew, &hemi, r) < 0)
 				goto oopsy;
-			if (d < FHUGE)
-				arad += 1.0 / d;
 							/* reinsert */
 			dp = div;
 			j = ndivs < i ? ndivs : i;
@@ -172,29 +163,45 @@ FVECT  pg, dg;
 				dp++;
 			}
 			copystruct(dp, &dnew);
-							/* extract darkest */
-			if (i <= ndivs) {
-				dp = div + i-1;
-				arad += dp->r;
-				if (dp->n > 1) {
-					b = 1.0/dp->n;
-					scalecolor(dp->v, b);
-					dp->r *= b;
-					dp->n = 1;
-				}
-				addcolor(acol, dp->v);
-			}
 		}
 		if (pg != NULL || dg != NULL)	/* restore order */
 			qsort(div, ndivs, sizeof(AMBSAMP), ambnorm);
 	}
 					/* compute returned values */
-	if (pg != NULL)
-		posgradient(pg, div, &hemi);
-	if (dg != NULL)
-		dirgradient(dg, div, &hemi);
-	if (div != NULL)
+	if (div != NULL) {
+		for (i = ndivs, dp = div; i-- > 0; dp++) {
+			arad += dp->r;
+			if (dp->n > 1) {
+				b = 1.0/dp->n;
+				scalecolor(dp->v, b);
+				dp->r *= b;
+				dp->n = 1;
+			}
+			addcolor(acol, dp->v);
+		}
+		b = bright(acol);
+		if (b > FTINY) {
+			b = ndivs/b;
+			if (pg != NULL) {
+				posgradient(pg, div, &hemi);
+				for (i = 0; i < 3; i++)
+					pg[i] *= b;
+			}
+			if (dg != NULL) {
+				dirgradient(dg, div, &hemi);
+				for (i = 0; i < 3; i++)
+					dg[i] *= b;
+			}
+		} else {
+			if (pg != NULL)
+				for (i = 0; i < 3; i++)
+					pg[i] = 0.0;
+			if (dg != NULL)
+				for (i = 0; i < 3; i++)
+					dg[i] = 0.0;
+		}
 		free((char *)div);
+	}
 	b = 1.0/ndivs;
 	scalecolor(acol, b);
 	if (arad <= FTINY)
@@ -206,6 +213,14 @@ FVECT  pg, dg;
 	else if (arad < minarad)
 		arad = minarad;
 	arad /= sqrt(r->rweight);
+	if (pg != NULL) {		/* clip pos. gradient if too large */
+		d = 4.0*DOT(pg,pg)*arad*arad;
+		if (d > 1.0) {
+			d = 1.0/sqrt(d);
+			for (i = 0; i < 3; i++)
+				pg[i] *= d;
+		}
+	}
 	return(arad);
 oopsy:
 	if (div != NULL)
@@ -231,9 +246,9 @@ RAY  *r;
 	if (i >= 3)
 		error(CONSISTENCY, "bad ray direction in inithemi");
 	hp->uy[i] = 1.0;
-	fcross(hp->ux, hp->uz, hp->uy);
+	fcross(hp->ux, hp->uy, hp->uz);
 	normalize(hp->ux);
-	fcross(hp->uy, hp->ux, hp->uz);
+	fcross(hp->uy, hp->uz, hp->ux);
 }
 
 
@@ -248,6 +263,11 @@ register AMBHEMI  *hp;
 	dp = da;
 	for (i = 0; i < hp->nt; i++)
 		for (j = 0; j < hp->np; j++) {
+#ifdef  DEBUG
+			if (dp->t != i || dp->p != j)
+				error(CONSISTENCY,
+					"division order in comperrs");
+#endif
 			b = bright(dp[0].v);
 			if (i > 0) {		/* from above */
 				b2 = bright(dp[-hp->np].v) - b;
@@ -260,12 +280,11 @@ register AMBHEMI  *hp;
 				b2 *= b2 * 0.25;
 				dp[0].k += b2;
 				dp[-1].k += b2;
-			}
-			if (j == hp->np-1) {	/* around */
-				b2 = bright(dp[-(hp->np-1)].v) - b;
+			} else {		/* around */
+				b2 = bright(dp[hp->np-1].v) - b;
 				b2 *= b2 * 0.25;
 				dp[0].k += b2;
-				dp[-(hp->np-1)].k += b2;
+				dp[hp->np-1].k += b2;
 			}
 			dp++;
 		}
@@ -323,7 +342,7 @@ AMBHEMI  *hp;
 			dp += hp->np;
 		}
 		if (hp->nt > 1) {
-			mag0 /= (double)(hp->nt-1);
+			mag0 /= (double)hp->np;
 			mag1 /= (double)hp->nt;
 		}
 		phi = 2.0*PI * (double)j/hp->np;
@@ -332,7 +351,7 @@ AMBHEMI  *hp;
 		yd += mag0*sinp + mag1*cosp;
 	}
 	for (i = 0; i < 3; i++)
-		gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/hp->np;
+		gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/PI;
 }
 
 
@@ -364,5 +383,5 @@ AMBHEMI  *hp;
 		yd += mag * sin(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])*PI/(hp->nt*hp->np);
 }