--- ray/src/rt/ambient.c	1991/11/12 17:09:42	2.1
+++ ray/src/rt/ambient.c	1992/11/03 21:29:52	2.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -7,9 +7,6 @@ static char SCCSid[] = "$SunId$ LBL";
 /*
  *  ambient.c - routines dealing with ambient (inter-reflected) component.
  *
- *  The macro AMBFLUSH (if defined) is the number of ambient values
- *	to wait before flushing to the ambient file.
- *
  *     5/9/86
  */
 
@@ -23,49 +20,73 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "random.h"
 
-#define  OCTSCALE	0.5	/* ceil((valid rad.)/(cube size)) */
+#define	 OCTSCALE	0.5	/* ceil((valid rad.)/(cube size)) */
 
 typedef struct ambtree {
-	AMBVAL  *alist;		/* ambient value list */
-	struct ambtree  *kid;	/* 8 child nodes */
+	AMBVAL	*alist;		/* ambient value list */
+	struct ambtree	*kid;	/* 8 child nodes */
 }  AMBTREE;			/* ambient octree */
 
 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 */
+#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 */
+double	maxarad;		/* maximum ambient radius */
+double	minarad;		/* minimum ambient radius */
 
-static AMBTREE  atrunk;		/* our ambient trunk node */
+static AMBTREE	atrunk;		/* our ambient trunk node */
 
 static FILE  *ambfp = NULL;	/* ambient file pointer */
 
-#define  newambval()	(AMBVAL *)bmalloc(sizeof(AMBVAL))
+#define	 AMBFLUSH	(BUFSIZ/AMBVALSIZ)
 
-#define  newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
+#define	 newambval()	(AMBVAL *)bmalloc(sizeof(AMBVAL))
 
+#define	 newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
 
-setambient(afile)			/* initialize calculation */
-char  *afile;
+extern long  ftell(), lseek();
+static int  initambfile(), avsave(), avinsert(), ambsync();
+
+
+setambres(ar)				/* set ambient resolution */
+int  ar;
 {
-	long  ftell();
-	AMBVAL  amb;
+						/* 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;
+}
 
-	maxarad = thescene.cusize / 2.0;		/* maximum radius */
-							/* minimum radius */
-	minarad = ambres > 0 ? thescene.cusize/ambres : 0.0;
 
-					/* open ambient file */
+setambient(afile)			/* initialize calculation */
+char  *afile;
+{
+	long  headlen;
+	AMBVAL	amb;
+						/* 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);
+			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);
@@ -74,10 +95,10 @@ char  *afile;
 
 
 ambnotify(obj)			/* record new modifier */
-OBJECT  obj;
+OBJECT	obj;
 {
 	static int  hitlimit = 0;
-	register OBJREC  *o = objptr(obj);
+	register OBJREC	 *o = objptr(obj);
 	register char  **amblp;
 
 	if (hitlimit || !ismodifier(o->otype))
@@ -100,7 +121,7 @@ COLOR  acol;
 register RAY  *r;
 {
 	static int  rdepth = 0;			/* ambient recursion */
-	double  d;
+	double	d;
 
 	if (ambdiv <= 0)			/* no ambient calculation */
 		goto dumbamb;
@@ -142,17 +163,16 @@ sumambient(acol, r, al, at, c0, s)	/* get interpolated
 COLOR  acol;
 register RAY  *r;
 int  al;
-AMBTREE  *at;
+AMBTREE	 *at;
 FVECT  c0;
-double  s;
+double	s;
 {
-	extern double  sqrt();
-	double  d, e1, e2, wt, wsum;
+	double	d, e1, e2, wt, wsum;
 	COLOR  ct;
 	FVECT  ck0;
 	int  i;
 	register int  j;
-	register AMBVAL  *av;
+	register AMBVAL	 *av;
 					/* do this node */
 	wsum = 0.0;
 	for (av = at->alist; av != NULL; av = av->next) {
@@ -192,7 +212,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)
@@ -231,7 +251,7 @@ COLOR  acol;
 register RAY  *r;
 int  al;
 {
-	AMBVAL  amb;
+	AMBVAL	amb;
 	FVECT	gp, gd;
 						/* compute weight */
 	amb.weight = pow(AVGREFL, (double)al);
@@ -249,20 +269,19 @@ 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);
 }
 
 
 extambient(cr, ap, pv, nv)		/* extrapolate value at pv, nv */
 COLOR  cr;
-register AMBVAL  *ap;
+register AMBVAL	 *ap;
 FVECT  pv, nv;
 {
 	FVECT  v1, v2;
 	register int  i;
-	double  d;
+	double	d;
 
 	d = 1.0;			/* zeroeth order */
 					/* gradient due to translation */
@@ -282,23 +301,52 @@ FVECT  pv, nv;
 
 
 static
-avsave(av)				/* save an ambient value */
-AMBVAL  *av;
+initambfile(creat)		/* initialize ambient file */
+int  creat;
 {
-#ifdef  AMBFLUSH
-	static int  nunflshed = 0;
+	extern char  *progname, *octname, VersionID[];
+
+#ifdef MSDOS
+	setmode(fileno(ambfp), O_BINARY);
 #endif
+	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);
+#ifndef	 NIX
+		sync();			/* protect against NFS buffering */
+#endif
+	} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp))
+		error(USER, "bad ambient file");
+}
+
+
+static
+avsave(av)				/* insert and save an ambient value */
+AMBVAL	*av;
+{
+	static int  nunflshed = 0;
+
+	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");
@@ -307,14 +355,14 @@ writerr:
 
 static
 avinsert(aval, at, c0, s)		/* insert ambient value in a tree */
-AMBVAL  *aval;
+AMBVAL	*aval;
 register AMBTREE  *at;
 FVECT  c0;
-double  s;
+double	s;
 {
 	FVECT  ck0;
 	int  branch;
-	register AMBVAL  *av;
+	register AMBVAL	 *av;
 	register int  i;
 
 	if ((av = newambval()) == NULL)
@@ -340,3 +388,59 @@ double  s;
 memerr:
 	error(SYSTEM, "out of memory in avinsert");
 }
+
+
+#ifdef	NIX
+
+static
+ambsync()			/* flush ambient file */
+{
+	return(fflush(ambfp));
+}
+
+#else
+
+#include  <sys/types.h>
+#include  <sys/stat.h>
+
+static
+ambsync()			/* synchronize ambient file */
+{
+	static FILE  *ambinp = NULL;
+	struct flock  fls;
+	struct stat  sts;
+#define	flen	sts.st_size
+	AMBVAL	avs;
+	long  lastpos;
+	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 */
+	if (fstat(fileno(ambfp), &sts) < 0)	/* get current length */
+		error(SYSTEM, "cannot stat ambient file");
+	if (n = (flen - lastpos)/AMBVALSIZ) {	/* file has grown */
+		if (ambinp == NULL) {		/* use duplicate file */
+			ambinp = fdopen(dup(fileno(ambfp)), "r");
+			if (ambinp == NULL)
+				error(SYSTEM, "fdopen failed in ambsync");
+		}
+		while (n--) {			/* load contributed values */
+			readambval(&avs, ambinp);
+			avinsert(&avs,&atrunk,thescene.cuorg,thescene.cusize);
+		}				/* moves shared file pointer */
+		if (n = (flen - lastpos)%AMBVALSIZ)	/* alignment */
+			lseek(fileno(ambfp), flen-n, 0);
+	}
+	n = fflush(ambfp);			/* calls write() at last */
+	fls.l_type = F_UNLCK;			/* release file */
+	fcntl(fileno(ambfp), F_SETLKW, &fls);
+	return(n);
+}
+
+#endif