--- ray/src/rt/ambient.c	1991/08/20 10:05:18	1.16
+++ ray/src/rt/ambient.c	1992/07/16 12:09:08	2.6
@@ -41,31 +41,52 @@ double  minarad;		/* minimum ambient radius */
 static AMBTREE  atrunk;		/* our ambient trunk node */
 
 static FILE  *ambfp = NULL;	/* ambient file pointer */
+static int  ambheadlen;		/* length of ambient file header */
 
+#define  AMBFLUSH	(BUFSIZ/AMBVALSIZ)
+
 #define  newambval()	(AMBVAL *)bmalloc(sizeof(AMBVAL))
 
 #define  newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
 
 
+setambres(ar)				/* set ambient resolution */
+int  ar;
+{
+						/* set min & max radii */
+	if (ar <= 0) {
+		minarad = 0.0;
+		maxarad = thescene.cusize / 2.0;
+	} else {
+		minarad = thescene.cusize / ar;
+		maxarad = 16.0 * minarad;		/* heuristic */
+		if (maxarad > thescene.cusize / 2.0)
+			maxarad = thescene.cusize / 2.0;
+	}
+	if (maxarad <= FTINY)
+		maxarad = .001;
+}
+
+
 setambient(afile)			/* initialize calculation */
 char  *afile;
 {
-	long  ftell();
+	extern long  ftell();
 	AMBVAL  amb;
-
-	maxarad = thescene.cusize / 2.0;		/* maximum radius */
-							/* minimum radius */
-	minarad = ambres > 0 ? thescene.cusize/ambres : 0.0;
-
-					/* open ambient file */
+						/* init ambient limits */
+	setambres(ambres);
+						/* open ambient file */
 	if (afile != NULL)
 		if ((ambfp = fopen(afile, "r+")) != NULL) {
-			while (fread((char *)&amb,sizeof(AMBVAL),1,ambfp) == 1)
+			initambfile(0);
+			while (readambval(&amb, ambfp))
 				avinsert(&amb, &atrunk, thescene.cuorg,
 						thescene.cusize);
 							/* align */
-			fseek(ambfp, -(ftell(ambfp)%sizeof(AMBVAL)), 1);
-		} else if ((ambfp = fopen(afile, "w")) == NULL) {
+			fseek(ambfp, -((ftell(ambfp)-ambheadlen)%AMBVALSIZ), 1);
+		} else if ((ambfp = fopen(afile, "w")) != NULL)
+			initambfile(1);
+		else {
 			sprintf(errmsg, "cannot open ambient file \"%s\"",
 					afile);
 			error(SYSTEM, errmsg);
@@ -73,6 +94,30 @@ char  *afile;
 }
 
 
+initambfile(creat)		/* initialize ambient file */
+int  creat;
+{
+	extern char  *progname, *octname;
+
+	setbuf(ambfp, bmalloc(BUFSIZ));
+	if (creat) {			/* new file */
+		fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ",
+				progname, colval(ambval,RED),
+				colval(ambval,GRN), colval(ambval,BLU),
+				ambounce, ambacc);
+		fprintf(ambfp, "-ad %d -as %d -ar %d %s\n",
+				ambdiv, ambssamp, ambres,
+				octname==NULL ? "" : octname);
+		fputformat(AMBFMT, ambfp);
+		putc('\n', ambfp);
+		putambmagic(ambfp);
+		fflush(ambfp);
+	} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp))
+		error(USER, "ambient file format error");
+	ambheadlen = ftell(ambfp);
+}
+
+
 ambnotify(obj)			/* record new modifier */
 OBJECT  obj;
 {
@@ -186,13 +231,13 @@ double  s;
 		for (j = 0; j < 3; j++)
 			d += (r->rop[j] - av->pos[j]) *
 					(av->dir[j] + r->ron[j]);
-		if (d*0.5 < -minarad*ambacc)
+		if (d*0.5 < -minarad*ambacc-.001)
 			continue;
 		/*
 		 *  Jittering final test reduces image artifacts.
 		 */
 		wt = sqrt(e1) + sqrt(e2);
-		wt *= .9 + .2*frandom();
+		wt *= .9 + .2*urand(9015+samplendx);
 		if (wt > ambacc)
 			continue;
 		if (wt <= 1e-3)
@@ -235,7 +280,7 @@ int  al;
 	FVECT	gp, gd;
 						/* compute weight */
 	amb.weight = pow(AVGREFL, (double)al);
-	if (r->rweight < 0.1*amb.weight)	/* heuristic */
+	if (r->rweight < 0.2*amb.weight)	/* heuristic */
 		amb.weight = r->rweight;
 						/* compute ambient */
 	amb.rad = doambient(acol, r, amb.weight, gp, gd);
@@ -285,20 +330,17 @@ static
 avsave(av)				/* save an ambient value */
 AMBVAL  *av;
 {
-#ifdef  AMBFLUSH
 	static int  nunflshed = 0;
-#endif
+
 	if (ambfp == NULL)
 		return;
-	if (fwrite((char *)av, sizeof(AMBVAL), 1, ambfp) != 1)
+	if (writambval(av, ambfp) < 0)
 		goto writerr;
-#ifdef  AMBFLUSH
 	if (++nunflshed >= AMBFLUSH) {
 		if (fflush(ambfp) == EOF)
 			goto writerr;
 		nunflshed = 0;
 	}
-#endif
 	return;
 writerr:
 	error(SYSTEM, "error writing ambient file");