--- ray/src/rt/ambient.c	2005/05/31 18:01:09	2.61
+++ ray/src/rt/ambient.c	2007/11/17 06:21:58	2.67
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ambient.c,v 2.61 2005/05/31 18:01:09 greg Exp $";
+static const char	RCSid[] = "$Id: ambient.c,v 2.67 2007/11/17 06:21:58 greg Exp $";
 #endif
 /*
  *  ambient.c - routines dealing with ambient (inter-reflected) component.
@@ -25,7 +25,7 @@ static const char	RCSid[] = "$Id: ambient.c,v 2.61 200
 extern char  *shm_boundary;	/* memory sharing boundary */
 
 #ifndef  MAXASET
-#define	 MAXASET	2047	/* maximum number of elements in ambient set */
+#define	 MAXASET	4095	/* maximum number of elements in ambient set */
 #endif
 OBJECT	ambset[MAXASET+1]={0};	/* ambient include/exclude set */
 
@@ -140,7 +140,7 @@ extern void
 setambient(void)				/* initialize calculation */
 {
 	int	readonly = 0;
-	long  pos, flen;
+	long	flen;
 	AMBVAL	amb;
 						/* make sure we're fresh */
 	ambdone();
@@ -160,7 +160,7 @@ setambient(void)				/* initialize calculation */
 		readonly = (ambfp = fopen(ambfile, "r")) != NULL;
 	if (ambfp != NULL) {
 		initambfile(0);			/* file exists */
-		pos = ftell(ambfp);
+		lastpos = ftell(ambfp);
 		while (readambval(&amb, ambfp))
 			avinsert(avstore(&amb));
 		nambshare = nambvals;		/* share loaded values */
@@ -174,26 +174,26 @@ setambient(void)				/* initialize calculation */
 			return;			/* avoid ambsync() */
 		}
 						/* align file pointer */
-		pos += (long)nambvals*AMBVALSIZ;
+		lastpos += (long)nambvals*AMBVALSIZ;
 		flen = lseek(fileno(ambfp), (off_t)0, SEEK_END);
-		if (flen != pos) {
+		if (flen != lastpos) {
 			sprintf(errmsg,
 			"ignoring last %ld values in ambient file (corrupted)",
-					(flen - pos)/AMBVALSIZ);
+					(flen - lastpos)/AMBVALSIZ);
 			error(WARNING, errmsg);
-			fseek(ambfp, pos, 0);
+			fseek(ambfp, lastpos, SEEK_SET);
 #ifndef _WIN32 /* XXX we need a replacement for that one */
-			ftruncate(fileno(ambfp), (off_t)pos);
+			ftruncate(fileno(ambfp), (off_t)lastpos);
 #endif
 		}
 	} else if ((ambfp = fopen(ambfile, "w+")) != NULL) {
 		initambfile(1);			/* else create new file */
+		lastpos = ftell(ambfp);
 	} else {
 		sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
 		error(SYSTEM, errmsg);
 	}
-	nunflshed++;	/* lie */
-	ambsync();
+	ambsync();			/* load previous values */
 }
 
 
@@ -454,7 +454,7 @@ makeambient(		/* make a new ambient value for storage 
 	for (i = al; i-- > 0; )
 		amb.weight *= AVGREFL;
 	if (r->rweight < 0.1*amb.weight)	/* heuristic override */
-		amb.weight = r->rweight;
+		amb.weight = 1.25*r->rweight;
 	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
 						/* compute ambient */
 	amb.rad = doambient(acol, r, amb.weight, gp, gd);
@@ -864,6 +864,8 @@ aflock(			/* lock/unlock ambient file */
 {
 	static struct flock  fls;	/* static so initialized to zeroes */
 
+	if (typ == fls.l_type)		/* already called? */
+		return;
 	fls.l_type = typ;
 	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
 		error(SYSTEM, "cannot (un)lock ambient file");
@@ -877,12 +879,10 @@ ambsync(void)			/* synchronize ambient file */
 	AMBVAL	avs;
 	register int  n;
 
-	if (nunflshed == 0)
+	if (ambfp == NULL)	/* no ambient file? */
 		return(0);
-	if (lastpos < 0)	/* initializing (locked in initambfile) */
-		goto syncend;
-				/* gain exclusive access */
-	aflock(F_WRLCK);
+				/* gain appropriate access */
+	aflock(nunflshed ? F_WRLCK : F_RDLCK);
 				/* see if file has grown */
 	if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0)
 		goto seekerr;
@@ -892,7 +892,7 @@ ambsync(void)			/* synchronize ambient file */
 			if (ambinp == NULL)
 				error(SYSTEM, "fdopen failed in ambsync");
 		}
-		if (fseek(ambinp, lastpos, 0) < 0)
+		if (fseek(ambinp, lastpos, SEEK_SET) < 0)
 			goto seekerr;
 		while (n >= AMBVALSIZ) {	/* load contributed values */
 			if (!readambval(&avs, ambinp)) {
@@ -905,9 +905,10 @@ ambsync(void)			/* synchronize ambient file */
 			avinsert(avstore(&avs));
 			n -= AMBVALSIZ;
 		}
+		lastpos = flen - n;
 		/*** seek always as safety measure
 		if (n) ***/			/* alignment */
-			if (lseek(fileno(ambfp), (off_t)(flen-n), SEEK_SET) < 0)
+			if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0)
 				goto seekerr;
 	}
 #ifdef  DEBUG
@@ -918,10 +919,12 @@ ambsync(void)			/* synchronize ambient file */
 		error(CONSISTENCY, errmsg);
 	}
 #endif
-syncend:
 	n = fflush(ambfp);			/* calls write() at last */
-	if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0)
+	if (n != EOF)
+		lastpos += (long)nunflshed*AMBVALSIZ;
+	else if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0)
 		goto seekerr;
+		
 	aflock(F_UNLCK);			/* release file */
 	nunflshed = 0;
 	return(n);
@@ -935,7 +938,7 @@ seekerr:
 extern int
 ambsync(void)			/* flush ambient file */
 {
-	if (nunflshed == 0)
+	if (ambfp == NULL)
 		return(0);
 	nunflshed = 0;
 	return(fflush(ambfp));