--- ray/src/rt/ambient.c	1995/04/30 13:24:36	2.28
+++ ray/src/rt/ambient.c	1995/10/03 11:53:30	2.31
@@ -18,7 +18,7 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "random.h"
 
-#define	 OCTSCALE	0.5	/* ceil((valid rad.)/(cube size)) */
+#define	 OCTSCALE	1.0	/* ceil((valid rad.)/(cube size)) */
 
 typedef struct ambtree {
 	AMBVAL	*alist;		/* ambient value list */
@@ -48,10 +48,10 @@ static int  nunflshed = 0;	/* number of unflushed ambi
 #endif
 #endif
 #ifndef SORT_INTVL
-#define SORT_INTVL	(SORT_THRESH*32)
+#define SORT_INTVL	(SORT_THRESH*256)
 #endif
 #ifndef MAX_SORT_INTVL
-#define MAX_SORT_INTVL	(SORT_INTVL<<8)
+#define MAX_SORT_INTVL	(SORT_INTVL<<4)
 #endif
 
 static unsigned long  ambclock = 0;	/* ambient access clock */
@@ -89,7 +89,7 @@ int  ar;
 		maxarad = thescene.cusize / 2.0;
 	} else {
 		minarad = thescene.cusize / ar;
-		maxarad = 16 * minarad;			/* heuristic */
+		maxarad = 64 * minarad;			/* heuristic */
 		if (maxarad > thescene.cusize / 2.0)
 			maxarad = thescene.cusize / 2.0;
 	}
@@ -234,8 +234,9 @@ double	s;
 	int  i;
 	register int  j;
 	register AMBVAL	 *av;
-					/* do this node */
+
 	wsum = 0.0;
+					/* do this node */
 	for (av = at->alist; av != NULL; av = av->next) {
 		if (tracktime)
 			av->latick = ambclock++;
@@ -249,11 +250,12 @@ double	s;
 		/*
 		 *  Ambient radius test.
 		 */
-		e1 = 0.0;
-		for (j = 0; j < 3; j++) {
-			d = av->pos[j] - r->rop[j];
-			e1 += d * d;
-		}
+		d = av->pos[0] - r->rop[0];
+		e1 = d * d;
+		d = av->pos[1] - r->rop[1];
+		e1 += d * d;
+		d = av->pos[2] - r->rop[2];
+		e1 += d * d;
 		e1 /= av->rad * av->rad;
 		if (e1 > ambacc*ambacc*1.21)
 			continue;
@@ -277,8 +279,7 @@ double	s;
 		 *  Jittering final test reduces image artifacts.
 		 */
 		wt = sqrt(e1) + sqrt(e2);
-		wt *= .9 + .2*urand(9015+samplendx);
-		if (wt > ambacc)
+		if (wt > ambacc*(.9+.2*urand(9015+samplendx)))
 			continue;
 		if (wt <= 1e-3)
 			wt = 1e3;
@@ -630,7 +631,8 @@ int	always;
 		 * when we're thrashing, which is when we need to do it.
 		 */
 #ifdef DEBUG
-		sprintf(errmsg, "sorting %u ambient values...", nambvals);
+		sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...",
+				nambvals, ambclock);
 		eputs(errmsg);
 #endif
 		i_avlist = 0;