--- ray/src/rt/ambient.c	1990/01/12 11:30:59	1.8
+++ ray/src/rt/ambient.c	1991/06/07 10:04:29	1.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -19,48 +19,25 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "otypes.h"
 
+#include  "ambient.h"
+
 #include  "random.h"
 
 #define  OCTSCALE	0.5	/* ceil((valid rad.)/(cube size)) */
 
-extern CUBE  thescene;		/* contains space boundaries */
-
-extern COLOR  ambval;		/* global ambient component */
-extern double  ambacc;		/* ambient accuracy */
-extern int  ambres;		/* ambient resolution */
-extern int  ambdiv;		/* number of divisions for calculation */
-extern int  ambssamp;		/* number of super-samples */
-extern int  ambounce;		/* number of ambient bounces */
-extern char  *amblist[];	/* ambient include/exclude list */
-extern int  ambincl;		/* include == 1, exclude == 0 */
-
-OBJECT  ambset[256]={0};	/* ambient include/exclude set */
-
-double  maxarad;		/* maximum ambient radius */
-double  minarad;		/* minimum ambient radius */
-
-typedef struct ambval {
-	FVECT  pos;		/* position in space */
-	FVECT  dir;		/* normal direction */
-	int  lvl;		/* recursion level of parent ray */
-	float  weight;		/* weight of parent ray */
-	COLOR  val;		/* computed ambient value */
-	float  rad;		/* validity radius */
-	struct ambval  *next;	/* next in list */
-}  AMBVAL;			/* ambient value */
-
 typedef struct ambtree {
 	AMBVAL  *alist;		/* ambient value list */
 	struct ambtree  *kid;	/* 8 child nodes */
 }  AMBTREE;			/* ambient octree */
 
-typedef struct {
-	float  k;		/* error contribution per sample */
-	COLOR  v;		/* ray sum */
-	int  n;			/* number of samples */
-	short  t, p;		/* theta, phi indices */
-}  AMBSAMP;			/* ambient sample */
+extern CUBE  thescene;		/* contains space boundaries */
 
+#define  MAXASET	511	/* maximum number of elements in ambient set */
+OBJECT  ambset[MAXASET+1]={0};	/* ambient include/exclude set */
+
+double  maxarad;		/* maximum ambient radius */
+double  minarad;		/* minimum ambient radius */
+
 static AMBTREE  atrunk;		/* our ambient trunk node */
 
 static FILE  *ambfp = NULL;	/* ambient file pointer */
@@ -69,14 +46,11 @@ static FILE  *ambfp = NULL;	/* ambient file pointer */
 
 #define  newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
 
-double  sumambient(), doambient(), makeambient();
 
-
 setambient(afile)			/* initialize calculation */
 char  *afile;
 {
 	long  ftell();
-	OBJECT  obj;
 	AMBVAL  amb;
 
 	maxarad = thescene.cusize / 2.0;		/* maximum radius */
@@ -86,7 +60,7 @@ char  *afile;
 					/* open ambient file */
 	if (afile != NULL)
 		if ((ambfp = fopen(afile, "r+")) != NULL) {
-			while (fread(&amb, sizeof(AMBVAL), 1, ambfp) == 1)
+			while (fread((char *)&amb,sizeof(AMBVAL),1,ambfp) == 1)
 				avinsert(&amb, &atrunk, thescene.cuorg,
 						thescene.cusize);
 							/* align */
@@ -102,13 +76,19 @@ char  *afile;
 ambnotify(obj)			/* record new modifier */
 OBJECT  obj;
 {
+	static int  hitlimit = 0;
 	register OBJREC  *o = objptr(obj);
 	register char  **amblp;
 
-	if (!ismodifier(o->otype))
+	if (hitlimit || !ismodifier(o->otype))
 		return;
 	for (amblp = amblist; *amblp != NULL; amblp++)
 		if (!strcmp(o->oname, *amblp)) {
+			if (ambset[0] >= MAXASET) {
+				error(WARNING, "too many modifiers in ambient list");
+				hitlimit++;
+				return;		/* should this be fatal? */
+			}
 			insertelem(ambset, obj);
 			return;
 		}
@@ -135,7 +115,7 @@ register RAY  *r;
 		goto dumbamb;
 
 	if (ambacc <= FTINY) {			/* no ambient storage */
-		if (doambient(acol, r) == 0.0)
+		if (doambient(acol, r, NULL, NULL) == 0.0)
 			goto dumbamb;
 		goto done;
 	}
@@ -203,7 +183,7 @@ double  s;
 		for (j = 0; j < 3; j++)
 			d += (r->rop[j] - av->pos[j]) *
 					(av->dir[j] + r->ron[j]);
-		if (d < -minarad)
+		if (d*0.5 < -minarad*ambacc)
 			continue;
 		/*
 		 *  Jittering final test reduces image artifacts.
@@ -248,8 +228,9 @@ COLOR  acol;
 register RAY  *r;
 {
 	AMBVAL  amb;
+	FVECT	gp, gd;
 
-	amb.rad = doambient(acol, r);		/* compute ambient */
+	amb.rad = doambient(acol, r, gp, gd);	/* compute ambient */
 	if (amb.rad == 0.0)
 		return(0.0);
 						/* store it */
@@ -258,6 +239,8 @@ register RAY  *r;
 	amb.lvl = r->rlvl;
 	amb.weight = r->rweight;
 	copycolor(amb.val, acol);
+	VCOPY(amb.gpos, gp);
+	VCOPY(amb.gdir, gd);
 						/* insert into tree */
 	avinsert(&amb, &atrunk, thescene.cuorg, thescene.cusize);
 	avsave(&amb);				/* write to file */
@@ -265,170 +248,6 @@ register RAY  *r;
 }
 
 
-double
-doambient(acol, r)			/* compute ambient component */
-COLOR  acol;
-register RAY  *r;
-{
-	extern int  ambcmp();
-	extern double  sin(), cos(), sqrt();
-	double  phi, xd, yd, zd;
-	double  b, b2;
-	register AMBSAMP  *div;
-	AMBSAMP  dnew;
-	RAY  ar;
-	FVECT  ux, uy;
-	double  arad;
-	int  ndivs, nt, np, ns, ne, i, j;
-	register int  k;
-
-	setcolor(acol, 0.0, 0.0, 0.0);
-					/* set number of divisions */
-	nt = sqrt(ambdiv * r->rweight * 0.5) + 0.5;
-	np = 2 * nt;
-	ndivs = nt * np;
-					/* check first */
-	if (ndivs == 0 || rayorigin(&ar, r, AMBIENT, 0.5) < 0)
-		return(0.0);
-					/* set number of super-samples */
-	ns = ambssamp * r->rweight + 0.5;
-	if (ns > 0) {
-		div = (AMBSAMP *)malloc(ndivs*sizeof(AMBSAMP));
-		if (div == NULL)
-			error(SYSTEM, "out of memory in doambient");
-	}
-					/* make axes */
-	uy[0] = uy[1] = uy[2] = 0.0;
-	for (k = 0; k < 3; k++)
-		if (r->ron[k] < 0.6 && r->ron[k] > -0.6)
-			break;
-	uy[k] = 1.0;
-	fcross(ux, r->ron, uy);
-	normalize(ux);
-	fcross(uy, ux, r->ron);
-						/* sample divisions */
-	arad = 0.0;
-	ne = 0;
-	for (i = 0; i < nt; i++)
-		for (j = 0; j < np; j++) {
-			rayorigin(&ar, r, AMBIENT, 0.5);	/* pretested */
-			zd = sqrt((i+frandom())/nt);
-			phi = 2.0*PI * (j+frandom())/np;
-			xd = cos(phi) * zd;
-			yd = sin(phi) * zd;
-			zd = sqrt(1.0 - zd*zd);
-			for (k = 0; k < 3; k++)
-				ar.rdir[k] = xd*ux[k]+yd*uy[k]+zd*r->ron[k];
-			rayvalue(&ar);
-			if (ar.rot < FHUGE)
-				arad += 1.0 / ar.rot;
-			if (ns > 0) {			/* save division */
-				div[ne].k = 0.0;
-				copycolor(div[ne].v, ar.rcol);
-				div[ne].n = 0;
-				div[ne].t = i; div[ne].p = j;
-							/* sum errors */
-				b = bright(ar.rcol);
-				if (i > 0) {		/* from above */
-					b2 = bright(div[ne-np].v) - b;
-					b2 *= b2 * 0.25;
-					div[ne].k += b2;
-					div[ne].n++;
-					div[ne-np].k += b2;
-					div[ne-np].n++;
-				}
-				if (j > 0) {		/* from behind */
-					b2 = bright(div[ne-1].v) - b;
-					b2 *= b2 * 0.25;
-					div[ne].k += b2;
-					div[ne].n++;
-					div[ne-1].k += b2;
-					div[ne-1].n++;
-				}
-				if (j == np-1) {	/* around */
-					b2 = bright(div[ne-(np-1)].v) - b;
-					b2 *= b2 * 0.25;
-					div[ne].k += b2;
-					div[ne].n++;
-					div[ne-(np-1)].k += b2;
-					div[ne-(np-1)].n++;
-				}
-				ne++;
-			} else
-				addcolor(acol, ar.rcol);
-		}
-	for (k = 0; k < ne; k++) {		/* compute errors */
-		if (div[k].n > 1)
-			div[k].k /= div[k].n;
-		div[k].n = 1;
-	}
-						/* sort the divisions */
-	qsort(div, ne, sizeof(AMBSAMP), ambcmp);
-						/* skim excess */
-	while (ne > ns) {
-		ne--;
-		addcolor(acol, div[ne].v);
-	}
-						/* super-sample */
-	for (i = ns; i > 0; i--) {
-		rayorigin(&ar, r, AMBIENT, 0.5);	/* pretested */
-		zd = sqrt((div[0].t+frandom())/nt);
-		phi = 2.0*PI * (div[0].p+frandom())/np;
-		xd = cos(phi) * zd;
-		yd = sin(phi) * zd;
-		zd = sqrt(1.0 - zd*zd);
-		for (k = 0; k < 3; k++)
-			ar.rdir[k] = xd*ux[k]+yd*uy[k]+zd*r->ron[k];
-		rayvalue(&ar);
-		if (ar.rot < FHUGE)
-			arad += 1.0 / ar.rot;
-						/* recompute error */
-		copycolor(dnew.v, div[0].v);
-		addcolor(dnew.v, ar.rcol);
-		dnew.n = div[0].n + 1;
-		dnew.t = div[0].t; dnew.p = div[0].p;
-		b2 = bright(dnew.v)/dnew.n - bright(ar.rcol);
-		b2 = b2*b2 + div[0].k*(div[0].n*div[0].n);
-		dnew.k = b2/(dnew.n*dnew.n);
-						/* reinsert */
-		for (k = 0; k < ne-1 && dnew.k < div[k+1].k; k++)
-			bcopy(&div[k+1], &div[k], sizeof(AMBSAMP));
-		bcopy(&dnew, &div[k], sizeof(AMBSAMP));
-
-		if (ne >= i) {		/* extract darkest division */
-			ne--;
-			if (div[ne].n > 1)
-				scalecolor(div[ne].v, 1.0/div[ne].n);
-			addcolor(acol, div[ne].v);
-		}
-	}
-	scalecolor(acol, 1.0/ndivs);
-	if (arad <= FTINY)
-		arad = FHUGE;
-	else
-		arad = (ndivs+ns) / arad / sqrt(r->rweight);
-	if (arad > maxarad)
-		arad = maxarad;
-	else if (arad < minarad)
-		arad = minarad;
-	if (ns > 0)
-		free((char *)div);
-	return(arad);
-}
-
-
-static int
-ambcmp(d1, d2)				/* decreasing order */
-AMBSAMP  *d1, *d2;
-{
-	if (d1->k < d2->k)
-		return(1);
-	if (d1->k > d2->k)
-		return(-1);
-	return(0);
-}
-
-
 static
 avsave(av)				/* save an ambient value */
 AMBVAL  *av;
@@ -438,7 +257,7 @@ AMBVAL  *av;
 #endif
 	if (ambfp == NULL)
 		return;
-	if (fwrite(av, sizeof(AMBVAL), 1, ambfp) != 1)
+	if (fwrite((char *)av, sizeof(AMBVAL), 1, ambfp) != 1)
 		goto writerr;
 #ifdef  AMBFLUSH
 	if (++nunflshed >= AMBFLUSH) {
@@ -467,7 +286,7 @@ double  s;
 
 	if ((av = newambval()) == NULL)
 		goto memerr;
-	bcopy(aval, av, sizeof(AMBVAL));
+	copystruct(av, aval);
 	VCOPY(ck0, c0);
 	while (s*(OCTSCALE/2) > av->rad*ambacc) {
 		if (at->kid == NULL)