--- ray/src/rt/ambient.c	1991/10/26 15:19:06	1.18
+++ ray/src/rt/ambient.c	1992/07/16 15:53:42	2.9
@@ -41,31 +41,55 @@ double  minarad;		/* minimum ambient radius */
 static AMBTREE  atrunk;		/* our ambient trunk node */
 
 static FILE  *ambfp = NULL;	/* ambient file pointer */
+static char  *afname;		/* ambient file name */
 
+#define  AMBFLUSH	(BUFSIZ/AMBVALSIZ)
+
 #define  newambval()	(AMBVAL *)bmalloc(sizeof(AMBVAL))
 
 #define  newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
 
+extern long  ftell(), lseek();
 
+
+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();
+	long  headlen;
 	AMBVAL  amb;
-
-	maxarad = thescene.cusize / 2.0;		/* maximum radius */
-							/* minimum radius */
-	minarad = ambres > 0 ? thescene.cusize/ambres : 0.0;
-
-					/* open ambient file */
-	if (afile != NULL)
+						/* init ambient limits */
+	setambres(ambres);
+						/* open ambient file */
+	if ((afname = afile) != NULL)
 		if ((ambfp = fopen(afile, "r+")) != NULL) {
-			while (fread((char *)&amb,sizeof(AMBVAL),1,ambfp) == 1)
+			initambfile(0);
+			headlen = ftell(ambfp);
+			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)-headlen)%AMBVALSIZ), 1);
+		} else if ((ambfp = fopen(afile, "w")) != NULL)
+			initambfile(1);
+		else {
 			sprintf(errmsg, "cannot open ambient file \"%s\"",
 					afile);
 			error(SYSTEM, errmsg);
@@ -192,7 +216,7 @@ double  s;
 		 *  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)
@@ -249,8 +273,7 @@ int  al;
 	VCOPY(amb.gpos, gp);
 	VCOPY(amb.gdir, gd);
 						/* insert into tree */
-	avinsert(&amb, &atrunk, thescene.cuorg, thescene.cusize);
-	avsave(&amb);				/* write to file */
+	avsave(&amb);				/* and save to file */
 	return(amb.rad);
 }
 
@@ -282,23 +305,49 @@ FVECT  pv, nv;
 
 
 static
-avsave(av)				/* save an ambient value */
+initambfile(creat)		/* initialize ambient file */
+int  creat;
+{
+	extern char  *progname, *octname, VersionID[];
+
+	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);
+		fprintf(ambfp, "SOFTWARE= %s\n", VersionID);
+		fputformat(AMBFMT, ambfp);
+		putc('\n', ambfp);
+		putambmagic(ambfp);
+		fflush(ambfp);
+	} else if (checkheader(ambfp, AMBFMT, NULL) < 0
+			|| !hasambmagic(ambfp)) {
+		sprintf(errmsg, "\"%s\" is not an ambient file", afname);
+		error(USER, errmsg);
+	}
+}
+
+
+static
+avsave(av)				/* insert and save an ambient value */
 AMBVAL  *av;
 {
-#ifdef  AMBFLUSH
 	static int  nunflshed = 0;
-#endif
+
+	avinsert(av, &atrunk, thescene.cuorg, thescene.cusize);
 	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)
+		if (ambsync() == EOF)
 			goto writerr;
 		nunflshed = 0;
 	}
-#endif
 	return;
 writerr:
 	error(SYSTEM, "error writing ambient file");
@@ -339,4 +388,43 @@ double  s;
 	return;
 memerr:
 	error(SYSTEM, "out of memory in avinsert");
+}
+
+
+#include  <fcntl.h>
+
+
+static
+ambsync()			/* synchronize ambient file */
+{
+	static FILE  *ambinp = NULL;
+	struct flock  fls;
+	AMBVAL  avs;
+	long  lastpos, flen;
+	register int  n;
+				/* gain exclusive access */
+	fls.l_type = F_WRLCK;
+	fls.l_whence = 0;
+	fls.l_start = 0L;
+	fls.l_len = 0L;
+	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
+		error(SYSTEM, "cannot lock ambient file");
+				/* see if file has grown */
+	lastpos = lseek(fileno(ambfp), 0L, 1);	/* get previous position */
+	flen = lseek(fileno(ambfp), 0L, 2);	/* new(?) file length */
+	if (n = (flen - lastpos)%AMBVALSIZ)	/* assure alignment */
+		lseek(fileno(ambfp), (long)-n, 1);
+	if (n = (flen - lastpos)/AMBVALSIZ) {	/* file has grown */
+		if (ambinp == NULL && (ambinp = fopen(afname, "r")) == NULL)
+			error(SYSTEM, "cannot reopen ambient file");
+		fseek(ambinp, lastpos, 0);	/* go to previous position */
+		while (n--) {			/* load contributed values */
+			readambval(&avs, ambinp);
+			avinsert(&avs,&atrunk,thescene.cuorg,thescene.cusize);
+		}
+	}
+	n = fflush(ambfp);			/* calls write() at last */
+	fls.l_type = F_UNLCK;			/* release file */
+	fcntl(fileno(ambfp), F_SETLKW, &fls);
+	return(n);
 }