ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/ray/src/rt/ambient.c

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.17 by greg, Tue Jan 26 09:08:20 1993 UTC vs.
Revision 2.82 by greg, Sat Apr 26 02:59:16 2014 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1993 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  ambient.c - routines dealing with ambient (inter-reflected) component.
6	+	*
7	+	*  Declarations of external symbols in ambient.h
8		*/
9
10	<	#include  "ray.h"
10	>	#include "copyright.h"
11
12	<	#include  "octree.h"
12	>	#include <string.h>
13
14	+	#include  "platform.h"
15	+	#include  "ray.h"
16		#include  "otypes.h"
17	<
17	>	#include  "resolu.h"
18		#include  "ambient.h"
18	–
19		#include  "random.h"
20
21	<	#define  OCTSCALE       0.5     /* ceil((valid rad.)/(cube size)) */
21	>	#ifndef  OCTSCALE
22	>	#define  OCTSCALE       1.0     /* ceil((valid rad.)/(cube size)) */
23	>	#endif
24
25	<	typedef struct ambtree {
24	<	AMBVAL  *alist;         /* ambient value list */
25	<	struct ambtree  *kid;   /* 8 child nodes */
26	<	}  AMBTREE;                     /* ambient octree */
25	>	extern char  *shm_boundary;     /* memory sharing boundary */
26
27	<	extern CUBE  thescene;          /* contains space boundaries */
28	<
29	<	#define  MAXASET        511     /* maximum number of elements in ambient set */
27	>	#ifndef  MAXASET
28	>	#define  MAXASET        4095    /* maximum number of elements in ambient set */
29	>	#endif
30		OBJECT  ambset[MAXASET+1]={0};  /* ambient include/exclude set */
31
32		double  maxarad;                /* maximum ambient radius */
#	Line 38 | Line 37 | static AMBTREE atrunk;         /* our ambient trunk node */
37		static FILE  *ambfp = NULL;     /* ambient file pointer */
38		static int  nunflshed = 0;      /* number of unflushed ambient values */
39
40	+	#ifndef SORT_THRESH
41	+	#ifdef SMLMEM
42	+	#define SORT_THRESH     ((16L<<20)/sizeof(AMBVAL))
43	+	#else
44	+	#define SORT_THRESH     ((64L<<20)/sizeof(AMBVAL))
45	+	#endif
46	+	#endif
47	+	#ifndef SORT_INTVL
48	+	#define SORT_INTVL      (SORT_THRESH<<1)
49	+	#endif
50	+	#ifndef MAX_SORT_INTVL
51	+	#define MAX_SORT_INTVL  (SORT_INTVL<<6)
52	+	#endif
53	+
54	+
55	+	static double  qambacc = 0.;            /* ambient accuracy to the 1/4 power */
56	+	static double  avsum = 0.;              /* computed ambient value sum (log) */
57	+	static unsigned int  navsum = 0;        /* number of values in avsum */
58	+	static unsigned int  nambvals = 0;      /* total number of indirect values */
59	+	static unsigned int  nambshare = 0;     /* number of values from file */
60	+	static unsigned long  ambclock = 0;     /* ambient access clock */
61	+	static unsigned long  lastsort = 0;     /* time of last value sort */
62	+	static long  sortintvl = SORT_INTVL;    /* time until next sort */
63	+	static FILE  *ambinp = NULL;            /* auxiliary file for input */
64	+	static long  lastpos = -1;              /* last flush position */
65	+
66	+	#define MAXACLOCK       (1L<<30)        /* clock turnover value */
67	+	/*
68	+	* Track access times unless we are sharing ambient values
69	+	* through memory on a multiprocessor, when we want to avoid
70	+	* claiming our own memory (copy on write).  Go ahead anyway
71	+	* if more than two thirds of our values are unshared.
72	+	* Compile with -Dtracktime=0 to turn this code off.
73	+	*/
74	+	#ifndef tracktime
75	+	#define tracktime       (shm_boundary == NULL || nambvals > 3*nambshare)
76	+	#endif
77	+
78		#define  AMBFLUSH       (BUFSIZ/AMBVALSIZ)
79
80	<	#define  newambval()    (AMBVAL *)bmalloc(sizeof(AMBVAL))
80	>	#define  newambval()    (AMBVAL *)malloc(sizeof(AMBVAL))
81	>	#define  freeav(av)     free((void *)av);
82
83	<	#define  newambtree()   (AMBTREE *)calloc(8, sizeof(AMBTREE))
83	>	static void initambfile(int creat);
84	>	static void avsave(AMBVAL *av);
85	>	static AMBVAL *avstore(AMBVAL  *aval);
86	>	static AMBTREE *newambtree(void);
87	>	static void freeambtree(AMBTREE  *atp);
88
89	<	extern long  ftell(), lseek();
90	<	static int  initambfile(), avsave(), avinsert();
89	>	typedef void unloadtf_t(AMBVAL *);
90	>	static unloadtf_t avinsert;
91	>	static unloadtf_t av2list;
92	>	static unloadtf_t avfree;
93	>	static void unloadatree(AMBTREE  *at, unloadtf_t *f);
94
95	+	static int aposcmp(const void *avp1, const void *avp2);
96	+	static int avlmemi(AMBVAL *avaddr);
97	+	static void sortambvals(int always);
98
99	<	setambres(ar)                           /* set ambient resolution */
100	<	int  ar;
99	>	#ifdef  F_SETLKW
100	>	static void aflock(int  typ);
101	>	#endif
102	>
103	>
104	>	void
105	>	setambres(                              /* set ambient resolution */
106	>	int  ar
107	>	)
108		{
109	+	ambres = ar < 0 ? 0 : ar;               /* may be done already */
110		/* set min & max radii */
111		if (ar <= 0) {
112	<	minarad = 0.0;
112	>	minarad = 0;
113		maxarad = thescene.cusize / 2.0;
114		} else {
115		minarad = thescene.cusize / ar;
116	<	maxarad = 16.0 * minarad;               /* heuristic */
116	>	maxarad = 64 * minarad;                 /* heuristic */
117		if (maxarad > thescene.cusize / 2.0)
118		maxarad = thescene.cusize / 2.0;
119		}
120	<	if (maxarad <= FTINY)
121	<	maxarad = .001;
120	>	if (minarad <= FTINY)
121	>	minarad = 10*FTINY;
122	>	if (maxarad <= minarad)
123	>	maxarad = 64 * minarad;
124		}
125
126
127	<	setambient(afile)                       /* initialize calculation */
128	<	char  *afile;
127	>	void
128	>	setambacc(                              /* set ambient accuracy */
129	>	double  newa
130	>	)
131		{
132	<	long  headlen;
132	>	double  olda = qambacc*qambacc*qambacc*qambacc;
133	>
134	>	newa *= (newa > 0);
135	>	if (fabs(newa - olda) >= .05*(newa + olda)) {
136	>	qambacc = sqrt(sqrt(ambacc = newa));
137	>	if (nambvals > 0)
138	>	sortambvals(1);         /* rebuild tree */
139	>	}
140	>	}
141	>
142	>
143	>	void
144	>	setambient(void)                                /* initialize calculation */
145	>	{
146	>	int     readonly = 0;
147	>	long    flen;
148		AMBVAL  amb;
149	+	/* make sure we're fresh */
150	+	ambdone();
151		/* init ambient limits */
152		setambres(ambres);
153	+	setambacc(ambacc);
154	+	if (ambfile == NULL || !ambfile[0])
155	+	return;
156	+	if (ambacc <= FTINY) {
157	+	sprintf(errmsg, "zero ambient accuracy so \"%s\" not opened",
158	+	ambfile);
159	+	error(WARNING, errmsg);
160	+	return;
161	+	}
162		/* open ambient file */
163	<	if (afile != NULL) {
164	<	if ((ambfp = fopen(afile, "r+")) != NULL) {
165	<	initambfile(0);
166	<	headlen = ftell(ambfp);
167	<	while (readambval(&amb, ambfp))
168	<	avinsert(&amb, &atrunk, thescene.cuorg,
169	<	thescene.cusize);
170	<	/* align */
171	<	fseek(ambfp, -((ftell(ambfp)-headlen)%AMBVALSIZ), 1);
172	<	} else if ((ambfp = fopen(afile, "w+")) != NULL)
173	<	initambfile(1);
174	<	else {
175	<	sprintf(errmsg, "cannot open ambient file \"%s\"",
176	<	afile);
177	<	error(SYSTEM, errmsg);
163	>	if ((ambfp = fopen(ambfile, "r+")) == NULL)
164	>	readonly = (ambfp = fopen(ambfile, "r")) != NULL;
165	>	if (ambfp != NULL) {
166	>	initambfile(0);                 /* file exists */
167	>	lastpos = ftell(ambfp);
168	>	while (readambval(&amb, ambfp))
169	>	avinsert(avstore(&amb));
170	>	nambshare = nambvals;           /* share loaded values */
171	>	if (readonly) {
172	>	sprintf(errmsg,
173	>	"loaded %u values from read-only ambient file",
174	>	nambvals);
175	>	error(WARNING, errmsg);
176	>	fclose(ambfp);          /* close file so no writes */
177	>	ambfp = NULL;
178	>	return;                 /* avoid ambsync() */
179		}
180	<	nunflshed++;    /* lie */
180	>	/* align file pointer */
181	>	lastpos += (long)nambvals*AMBVALSIZ;
182	>	flen = lseek(fileno(ambfp), (off_t)0, SEEK_END);
183	>	if (flen != lastpos) {
184	>	sprintf(errmsg,
185	>	"ignoring last %ld values in ambient file (corrupted)",
186	>	(flen - lastpos)/AMBVALSIZ);
187	>	error(WARNING, errmsg);
188	>	fseek(ambfp, lastpos, SEEK_SET);
189	>	#ifndef _WIN32 /* XXX we need a replacement for that one */
190	>	ftruncate(fileno(ambfp), (off_t)lastpos);
191	>	#endif
192	>	}
193	>	} else if ((ambfp = fopen(ambfile, "w+")) != NULL) {
194	>	initambfile(1);                 /* else create new file */
195	>	fflush(ambfp);
196	>	lastpos = ftell(ambfp);
197	>	} else {
198	>	sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
199	>	error(SYSTEM, errmsg);
200	>	}
201	>	#ifdef getc_unlocked
202	>	flockfile(ambfp);                       /* application-level lock */
203	>	#endif
204	>	#ifdef  F_SETLKW
205	>	aflock(F_UNLCK);                        /* release file */
206	>	#endif
207	>	}
208	>
209	>
210	>	void
211	>	ambdone(void)                   /* close ambient file and free memory */
212	>	{
213	>	if (ambfp != NULL) {            /* close ambient file */
214		ambsync();
215	+	fclose(ambfp);
216	+	ambfp = NULL;
217	+	if (ambinp != NULL) {
218	+	fclose(ambinp);
219	+	ambinp = NULL;
220	+	}
221	+	lastpos = -1;
222		}
223	+	/* free ambient tree */
224	+	unloadatree(&atrunk, &avfree);
225	+	/* reset state variables */
226	+	avsum = 0.;
227	+	navsum = 0;
228	+	nambvals = 0;
229	+	nambshare = 0;
230	+	ambclock = 0;
231	+	lastsort = 0;
232	+	sortintvl = SORT_INTVL;
233		}
234
235
236	<	ambnotify(obj)                  /* record new modifier */
237	<	OBJECT  obj;
236	>	void
237	>	ambnotify(                      /* record new modifier */
238	>	OBJECT  obj
239	>	)
240		{
241		static int  hitlimit = 0;
242	<	register OBJREC  *o = objptr(obj);
243	<	register char  **amblp;
242	>	OBJREC   *o;
243	>	char  **amblp;
244
245	+	if (obj == OVOID) {             /* starting over */
246	+	ambset[0] = 0;
247	+	hitlimit = 0;
248	+	return;
249	+	}
250	+	o = objptr(obj);
251		if (hitlimit || !ismodifier(o->otype))
252		return;
253		for (amblp = amblist; *amblp != NULL; amblp++)
#	Line 117 | Line 262 | OBJECT obj;
262		}
263		}
264
265	+	/************ THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD ***************/
266
267	<	ambient(acol, r)                /* compute ambient component for ray */
268	<	COLOR  acol;
269	<	register RAY  *r;
267	>	#ifdef NEWAMB
268	>
269	>	#define tfunc(lwr, x, upr)      (((x)-(lwr))/((upr)-(lwr)))
270	>
271	>	static double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
272	>	AMBTREE *at, FVECT c0, double s);
273	>	static int      makeambient(COLOR acol, RAY *r, FVECT rn, int al);
274	>	static void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv,
275	>	FVECT uvw[3]);
276	>
277	>	void
278	>	multambient(            /* compute ambient component & multiply by coef. */
279	>	COLOR  aval,
280	>	RAY  *r,
281	>	FVECT  nrm
282	>	)
283		{
284		static int  rdepth = 0;                 /* ambient recursion */
285	<	double  d;
285	>	COLOR   acol;
286	>	int     ok;
287	>	double  d, l;
288
289		if (ambdiv <= 0)                        /* no ambient calculation */
290		goto dumbamb;
#	Line 136 | Line 297 | register RAY  *r;
297		goto dumbamb;
298
299		if (ambacc <= FTINY) {                  /* no ambient storage */
300	+	copycolor(acol, aval);
301		rdepth++;
302	<	d = doambient(acol, r, r->rweight, NULL, NULL);
302	>	ok = doambient(acol, r, r->rweight, NULL, NULL, NULL, NULL);
303		rdepth--;
304	<	if (d == 0.0)
304	>	if (!ok)
305		goto dumbamb;
306	+	copycolor(aval, acol);
307		return;
308		}
309	<	/* get ambient value */
309	>
310	>	if (tracktime)                          /* sort to minimize thrashing */
311	>	sortambvals(0);
312	>	/* interpolate ambient value */
313		setcolor(acol, 0.0, 0.0, 0.0);
314	<	d = sumambient(acol, r, rdepth,
314	>	d = sumambient(acol, r, nrm, rdepth,
315		&atrunk, thescene.cuorg, thescene.cusize);
316	<	if (d > FTINY)
317	<	scalecolor(acol, 1.0/d);
318	<	else {
319	<	d = makeambient(acol, r, rdepth++);
320	<	rdepth--;
316	>	if (d > FTINY) {
317	>	d = 1.0/d;
318	>	scalecolor(acol, d);
319	>	multcolor(aval, acol);
320	>	return;
321		}
322	<	if (d > FTINY)
322	>	rdepth++;                               /* need to cache new value */
323	>	ok = makeambient(acol, r, nrm, rdepth-1);
324	>	rdepth--;
325	>	if (ok) {
326	>	multcolor(aval, acol);          /* computed new value */
327		return;
328	+	}
329		dumbamb:                                        /* return global value */
330	<	copycolor(acol, ambval);
330	>	if ((ambvwt <= 0) | (navsum == 0)) {
331	>	multcolor(aval, ambval);
332	>	return;
333	>	}
334	>	l = bright(ambval);                     /* average in computations */
335	>	if (l > FTINY) {
336	>	d = (log(l)*(double)ambvwt + avsum) /
337	>	(double)(ambvwt + navsum);
338	>	d = exp(d) / l;
339	>	scalecolor(aval, d);
340	>	multcolor(aval, ambval);        /* apply color of ambval */
341	>	} else {
342	>	d = exp( avsum / (double)navsum );
343	>	scalecolor(aval, d);            /* neutral color */
344	>	}
345		}
346
347
348		double
349	<	sumambient(acol, r, al, at, c0, s)      /* get interpolated ambient value */
350	<	COLOR  acol;
351	<	register RAY  *r;
352	<	int  al;
353	<	AMBTREE  *at;
354	<	FVECT  c0;
355	<	double  s;
349	>	sumambient(             /* get interpolated ambient value */
350	>	COLOR  acol,
351	>	RAY  *r,
352	>	FVECT  rn,
353	>	int  al,
354	>	AMBTREE  *at,
355	>	FVECT  c0,
356	>	double  s
357	>	)
358	>	{                       /* initial limit is 10 degrees plus ambacc radians */
359	>	const double    minangle = 10.0 * PI/180.;
360	>	const double    maxangle = (minangle+ambacc-PI/2.)*pow(r->rweight,0.13)
361	>	+ PI/2.;
362	>	double          wsum = 0.0;
363	>	FVECT           ck0;
364	>	int             i, j;
365	>	AMBVAL          *av;
366	>	/* sum this node */
367	>	for (av = at->alist; av != NULL; av = av->next) {
368	>	double  d, delta_r2, delta_t2;
369	>	COLOR   ct;
370	>	FVECT   uvw[3];
371	>	/* record access */
372	>	if (tracktime)
373	>	av->latick = ambclock;
374	>	/*
375	>	*  Ambient level test
376	>	*/
377	>	if (av->lvl > al)       /* list sorted, so this works */
378	>	break;
379	>	if (av->weight < 0.9*r->rweight)
380	>	continue;
381	>	/*
382	>	*  Direction test using unperturbed normal
383	>	*/
384	>	decodedir(uvw[2], av->ndir);
385	>	d = DOT(uvw[2], r->ron);
386	>	if (d <= 0.0)           /* >= 90 degrees */
387	>	continue;
388	>	delta_r2 = 2.0 - 2.0*d; /* approx. radians^2 */
389	>	if (delta_r2 >= maxangle*maxangle)
390	>	continue;
391	>	/*
392	>	*  Modified ray behind test
393	>	*/
394	>	VSUB(ck0, av->pos, r->rop);
395	>	d = DOT(ck0, uvw[2]);
396	>	if (d < -minarad*qambacc-.001)
397	>	continue;
398	>	d /= av->rad[0];
399	>	delta_t2 = d*d;
400	>	if (delta_t2 >= qambacc*qambacc)
401	>	continue;
402	>	/*
403	>	*  Elliptical radii test based on Hessian
404	>	*/
405	>	decodedir(uvw[0], av->udir);
406	>	VCROSS(uvw[1], uvw[2], uvw[0]);
407	>	d = DOT(ck0, uvw[0]) / av->rad[0];
408	>	delta_t2 += d*d;
409	>	d = DOT(ck0, uvw[1]) / av->rad[1];
410	>	delta_t2 += d*d;
411	>	if (delta_t2 >= qambacc*qambacc)
412	>	continue;
413	>	/*
414	>	*  Extrapolate value and compute final weight (hat function)
415	>	*/
416	>	extambient(ct, av, r->rop, rn, uvw);
417	>	d = tfunc(maxangle, sqrt(delta_r2), 0.0) *
418	>	tfunc(qambacc, sqrt(delta_t2), 0.0);
419	>	scalecolor(ct, d);
420	>	addcolor(acol, ct);
421	>	wsum += d;
422	>	}
423	>	if (at->kid == NULL)
424	>	return(wsum);
425	>	/* sum children */
426	>	s *= 0.5;
427	>	for (i = 0; i < 8; i++) {
428	>	for (j = 0; j < 3; j++) {
429	>	ck0[j] = c0[j];
430	>	if (1<<j & i)
431	>	ck0[j] += s;
432	>	if (r->rop[j] < ck0[j] - OCTSCALE*s)
433	>	break;
434	>	if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s)
435	>	break;
436	>	}
437	>	if (j == 3)
438	>	wsum += sumambient(acol, r, rn, al,
439	>	at->kid+i, ck0, s);
440	>	}
441	>	return(wsum);
442	>	}
443	>
444	>
445	>	int
446	>	makeambient(            /* make a new ambient value for storage */
447	>	COLOR  acol,
448	>	RAY  *r,
449	>	FVECT  rn,
450	>	int  al
451	>	)
452		{
453	+	AMBVAL  amb;
454	+	FVECT   uvw[3];
455	+	int     i;
456	+
457	+	amb.weight = 1.0;                       /* compute weight */
458	+	for (i = al; i-- > 0; )
459	+	amb.weight *= AVGREFL;
460	+	if (r->rweight < 0.1*amb.weight)        /* heuristic override */
461	+	amb.weight = 1.25*r->rweight;
462	+	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
463	+	/* compute ambient */
464	+	i = doambient(acol, r, amb.weight, uvw, amb.rad, amb.gpos, amb.gdir);
465	+	scalecolor(acol, 1./AVGREFL);           /* undo assumed reflectance */
466	+	if (i <= 0 || amb.rad[0] <= FTINY)      /* no Hessian or zero radius */
467	+	return(i);
468	+	/* store value */
469	+	VCOPY(amb.pos, r->rop);
470	+	amb.ndir = encodedir(r->ron);
471	+	amb.udir = encodedir(uvw[0]);
472	+	amb.lvl = al;
473	+	copycolor(amb.val, acol);
474	+	/* insert into tree */
475	+	avsave(&amb);                           /* and save to file */
476	+	if (rn != r->ron) {                     /* texture */
477	+	VCOPY(uvw[2], r->ron);
478	+	extambient(acol, &amb, r->rop, rn, uvw);
479	+	}
480	+	return(1);
481	+	}
482	+
483	+
484	+	void
485	+	extambient(             /* extrapolate value at pv, nv */
486	+	COLOR  cr,
487	+	AMBVAL   *ap,
488	+	FVECT  pv,
489	+	FVECT  nv,
490	+	FVECT  uvw[3]
491	+	)
492	+	{
493	+	static FVECT    my_uvw[3];
494	+	FVECT           v1;
495	+	int             i;
496	+	double          d = 1.0;        /* zeroeth order */
497	+
498	+	if (uvw == NULL) {              /* need local coordinates? */
499	+	decodedir(my_uvw[2], ap->ndir);
500	+	decodedir(my_uvw[0], ap->udir);
501	+	VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]);
502	+	uvw = my_uvw;
503	+	}
504	+	for (i = 3; i--; )              /* gradient due to translation */
505	+	d += (pv[i] - ap->pos[i]) *
506	+	(ap->gpos[0]*uvw[0][i] + ap->gpos[1]*uvw[1][i]);
507	+
508	+	VCROSS(v1, uvw[2], nv);         /* gradient due to rotation */
509	+	for (i = 3; i--; )
510	+	d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]);
511	+
512	+	if (d <= 0.0) {
513	+	setcolor(cr, 0.0, 0.0, 0.0);
514	+	return;
515	+	}
516	+	copycolor(cr, ap->val);
517	+	scalecolor(cr, d);
518	+	}
519	+
520	+
521	+	static void
522	+	avinsert(                               /* insert ambient value in our tree */
523	+	AMBVAL *av
524	+	)
525	+	{
526	+	AMBTREE  *at;
527	+	AMBVAL  *ap;
528	+	AMBVAL  avh;
529	+	FVECT  ck0;
530	+	double  s;
531	+	int  branch;
532	+	int  i;
533	+
534	+	if (av->rad[0] <= FTINY)
535	+	error(CONSISTENCY, "zero ambient radius in avinsert");
536	+	at = &atrunk;
537	+	VCOPY(ck0, thescene.cuorg);
538	+	s = thescene.cusize;
539	+	while (s*(OCTSCALE/2) > av->rad[1]*qambacc) {
540	+	if (at->kid == NULL)
541	+	if ((at->kid = newambtree()) == NULL)
542	+	error(SYSTEM, "out of memory in avinsert");
543	+	s *= 0.5;
544	+	branch = 0;
545	+	for (i = 0; i < 3; i++)
546	+	if (av->pos[i] > ck0[i] + s) {
547	+	ck0[i] += s;
548	+	branch |= 1 << i;
549	+	}
550	+	at = at->kid + branch;
551	+	}
552	+	avh.next = at->alist;           /* order by increasing level */
553	+	for (ap = &avh; ap->next != NULL; ap = ap->next)
554	+	if (ap->next->lvl >= av->lvl)
555	+	break;
556	+	av->next = ap->next;
557	+	ap->next = (AMBVAL*)av;
558	+	at->alist = avh.next;
559	+	}
560	+
561	+
562	+	#else /* ! NEWAMB */
563	+
564	+	static double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
565	+	AMBTREE *at, FVECT c0, double s);
566	+	static double   makeambient(COLOR acol, RAY *r, FVECT rn, int al);
567	+	static void     extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
568	+
569	+
570	+	void
571	+	multambient(            /* compute ambient component & multiply by coef. */
572	+	COLOR  aval,
573	+	RAY  *r,
574	+	FVECT  nrm
575	+	)
576	+	{
577	+	static int  rdepth = 0;                 /* ambient recursion */
578	+	COLOR   acol;
579	+	double  d, l;
580	+
581	+	if (ambdiv <= 0)                        /* no ambient calculation */
582	+	goto dumbamb;
583	+	/* check number of bounces */
584	+	if (rdepth >= ambounce)
585	+	goto dumbamb;
586	+	/* check ambient list */
587	+	if (ambincl != -1 && r->ro != NULL &&
588	+	ambincl != inset(ambset, r->ro->omod))
589	+	goto dumbamb;
590	+
591	+	if (ambacc <= FTINY) {                  /* no ambient storage */
592	+	copycolor(acol, aval);
593	+	rdepth++;
594	+	d = doambient(acol, r, r->rweight, NULL, NULL);
595	+	rdepth--;
596	+	if (d <= FTINY)
597	+	goto dumbamb;
598	+	copycolor(aval, acol);
599	+	return;
600	+	}
601	+
602	+	if (tracktime)                          /* sort to minimize thrashing */
603	+	sortambvals(0);
604	+	/* interpolate ambient value */
605	+	setcolor(acol, 0.0, 0.0, 0.0);
606	+	d = sumambient(acol, r, nrm, rdepth,
607	+	&atrunk, thescene.cuorg, thescene.cusize);
608	+	if (d > FTINY) {
609	+	d = 1.0/d;
610	+	scalecolor(acol, d);
611	+	multcolor(aval, acol);
612	+	return;
613	+	}
614	+	rdepth++;                               /* need to cache new value */
615	+	d = makeambient(acol, r, nrm, rdepth-1);
616	+	rdepth--;
617	+	if (d > FTINY) {
618	+	multcolor(aval, acol);          /* got new value */
619	+	return;
620	+	}
621	+	dumbamb:                                        /* return global value */
622	+	if ((ambvwt <= 0) | (navsum == 0)) {
623	+	multcolor(aval, ambval);
624	+	return;
625	+	}
626	+	l = bright(ambval);                     /* average in computations */
627	+	if (l > FTINY) {
628	+	d = (log(l)*(double)ambvwt + avsum) /
629	+	(double)(ambvwt + navsum);
630	+	d = exp(d) / l;
631	+	scalecolor(aval, d);
632	+	multcolor(aval, ambval);        /* apply color of ambval */
633	+	} else {
634	+	d = exp( avsum / (double)navsum );
635	+	scalecolor(aval, d);            /* neutral color */
636	+	}
637	+	}
638	+
639	+
640	+	static double
641	+	sumambient(     /* get interpolated ambient value */
642	+	COLOR  acol,
643	+	RAY  *r,
644	+	FVECT  rn,
645	+	int  al,
646	+	AMBTREE  *at,
647	+	FVECT  c0,
648	+	double  s
649	+	)
650	+	{
651		double  d, e1, e2, wt, wsum;
652		COLOR  ct;
653		FVECT  ck0;
654		int  i;
655	<	register int  j;
656	<	register AMBVAL  *av;
657	<	/* do this node */
655	>	int  j;
656	>	AMBVAL   *av;
657	>
658		wsum = 0.0;
659	+	/* do this node */
660		for (av = at->alist; av != NULL; av = av->next) {
661	+	double  rn_dot = -2.0;
662	+	if (tracktime)
663	+	av->latick = ambclock;
664		/*
665		*  Ambient level test.
666		*/
667	<	if (av->lvl > al || av->weight < r->rweight-FTINY)
667	>	if (av->lvl > al)       /* list sorted, so this works */
668	>	break;
669	>	if (av->weight < 0.9*r->rweight)
670		continue;
671		/*
672		*  Ambient radius test.
673		*/
674	<	e1 = 0.0;
675	<	for (j = 0; j < 3; j++) {
191	<	d = av->pos[j] - r->rop[j];
192	<	e1 += d * d;
193	<	}
194	<	e1 /= av->rad * av->rad;
674	>	VSUB(ck0, av->pos, r->rop);
675	>	e1 = DOT(ck0, ck0) / (av->rad * av->rad);
676		if (e1 > ambacc*ambacc*1.21)
677		continue;
678		/*
679	<	*  Normal direction test.
679	>	*  Direction test using closest normal.
680		*/
681	<	e2 = (1.0 - DOT(av->dir, r->ron)) * r->rweight;
682	<	if (e2 < 0.0) e2 = 0.0;
683	<	if (e1 + e2 > ambacc*ambacc*1.21)
681	>	d = DOT(av->dir, r->ron);
682	>	if (rn != r->ron) {
683	>	rn_dot = DOT(av->dir, rn);
684	>	if (rn_dot > 1.0-FTINY)
685	>	rn_dot = 1.0-FTINY;
686	>	if (rn_dot >= d-FTINY) {
687	>	d = rn_dot;
688	>	rn_dot = -2.0;
689	>	}
690	>	}
691	>	e2 = (1.0 - d) * r->rweight;
692	>	if (e2 < 0.0)
693	>	e2 = 0.0;
694	>	else if (e1 + e2 > ambacc*ambacc*1.21)
695		continue;
696		/*
697		*  Ray behind test.
#	Line 213 | Line 705 | double s;
705		/*
706		*  Jittering final test reduces image artifacts.
707		*/
708	<	wt = sqrt(e1) + sqrt(e2);
709	<	wt *= .9 + .2*urand(9015+samplendx);
710	<	if (wt > ambacc)
708	>	e1 = sqrt(e1);
709	>	e2 = sqrt(e2);
710	>	wt = e1 + e2;
711	>	if (wt > ambacc*(.9+.2*urand(9015+samplendx)))
712		continue;
713	+	/*
714	+	*  Recompute directional error using perturbed normal
715	+	*/
716	+	if (rn_dot > 0.0) {
717	+	e2 = sqrt((1.0 - rn_dot)*r->rweight);
718	+	wt = e1 + e2;
719	+	}
720		if (wt <= 1e-3)
721		wt = 1e3;
722		else
723		wt = 1.0 / wt;
724		wsum += wt;
725	<	extambient(ct, av, r->rop, r->ron);
725	>	extambient(ct, av, r->rop, rn);
726		scalecolor(ct, wt);
727		addcolor(acol, ct);
728		}
#	Line 241 | Line 741 | double s;
741		break;
742		}
743		if (j == 3)
744	<	wsum += sumambient(acol, r, al, at->kid+i, ck0, s);
744	>	wsum += sumambient(acol, r, rn, al,
745	>	at->kid+i, ck0, s);
746		}
747		return(wsum);
748		}
749
750
751	<	double
752	<	makeambient(acol, r, al)        /* make a new ambient value */
753	<	COLOR  acol;
754	<	register RAY  *r;
755	<	int  al;
751	>	static double
752	>	makeambient(            /* make a new ambient value for storage */
753	>	COLOR  acol,
754	>	RAY  *r,
755	>	FVECT  rn,
756	>	int  al
757	>	)
758		{
759		AMBVAL  amb;
760		FVECT   gp, gd;
761	<	/* compute weight */
762	<	amb.weight = pow(AVGREFL, (double)al);
763	<	if (r->rweight < 0.2*amb.weight)        /* heuristic */
764	<	amb.weight = r->rweight;
761	>	int     i;
762	>
763	>	amb.weight = 1.0;                       /* compute weight */
764	>	for (i = al; i-- > 0; )
765	>	amb.weight *= AVGREFL;
766	>	if (r->rweight < 0.1*amb.weight)        /* heuristic override */
767	>	amb.weight = 1.25*r->rweight;
768	>	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
769		/* compute ambient */
770		amb.rad = doambient(acol, r, amb.weight, gp, gd);
771	<	if (amb.rad == 0.0)
771	>	if (amb.rad <= FTINY) {
772	>	setcolor(acol, 0.0, 0.0, 0.0);
773		return(0.0);
774	<	/* store it */
774	>	}
775	>	scalecolor(acol, 1./AVGREFL);           /* undo assumed reflectance */
776	>	/* store value */
777		VCOPY(amb.pos, r->rop);
778		VCOPY(amb.dir, r->ron);
779		amb.lvl = al;
#	Line 272 | Line 782 | int  al;
782		VCOPY(amb.gdir, gd);
783		/* insert into tree */
784		avsave(&amb);                           /* and save to file */
785	+	if (rn != r->ron)
786	+	extambient(acol, &amb, r->rop, rn);     /* texture */
787		return(amb.rad);
788		}
789
790
791	<	extambient(cr, ap, pv, nv)              /* extrapolate value at pv, nv */
792	<	COLOR  cr;
793	<	register AMBVAL  *ap;
794	<	FVECT  pv, nv;
791	>	static void
792	>	extambient(             /* extrapolate value at pv, nv */
793	>	COLOR  cr,
794	>	AMBVAL   *ap,
795	>	FVECT  pv,
796	>	FVECT  nv
797	>	)
798		{
799	<	FVECT  v1, v2;
800	<	register int  i;
799	>	FVECT  v1;
800	>	int  i;
801		double  d;
802
803		d = 1.0;                        /* zeroeth order */
#	Line 290 | Line 805 | FVECT  pv, nv;
805		for (i = 0; i < 3; i++)
806		d += ap->gpos[i]*(pv[i]-ap->pos[i]);
807		/* gradient due to rotation */
808	<	VCOPY(v1, ap->dir);
809	<	fcross(v2, v1, nv);
295	<	d += DOT(ap->gdir, v2);
808	>	VCROSS(v1, ap->dir, nv);
809	>	d += DOT(ap->gdir, v1);
810		if (d <= 0.0) {
811		setcolor(cr, 0.0, 0.0, 0.0);
812		return;
#	Line 302 | Line 816 | FVECT  pv, nv;
816		}
817
818
819	<	static
820	<	initambfile(creat)              /* initialize ambient file */
821	<	int  creat;
819	>	static void
820	>	avinsert(                               /* insert ambient value in our tree */
821	>	AMBVAL *av
822	>	)
823		{
824	<	extern char  *progname, *octname, VersionID[];
824	>	AMBTREE  *at;
825	>	AMBVAL  *ap;
826	>	AMBVAL  avh;
827	>	FVECT  ck0;
828	>	double  s;
829	>	int  branch;
830	>	int  i;
831
832	<	#ifdef MSDOS
833	<	setmode(fileno(ambfp), O_BINARY);
832	>	if (av->rad <= FTINY)
833	>	error(CONSISTENCY, "zero ambient radius in avinsert");
834	>	at = &atrunk;
835	>	VCOPY(ck0, thescene.cuorg);
836	>	s = thescene.cusize;
837	>	while (s*(OCTSCALE/2) > av->rad*ambacc) {
838	>	if (at->kid == NULL)
839	>	if ((at->kid = newambtree()) == NULL)
840	>	error(SYSTEM, "out of memory in avinsert");
841	>	s *= 0.5;
842	>	branch = 0;
843	>	for (i = 0; i < 3; i++)
844	>	if (av->pos[i] > ck0[i] + s) {
845	>	ck0[i] += s;
846	>	branch |= 1 << i;
847	>	}
848	>	at = at->kid + branch;
849	>	}
850	>	avh.next = at->alist;           /* order by increasing level */
851	>	for (ap = &avh; ap->next != NULL; ap = ap->next)
852	>	if (ap->next->lvl >= av->lvl)
853	>	break;
854	>	av->next = ap->next;
855	>	ap->next = (AMBVAL*)av;
856	>	at->alist = avh.next;
857	>	}
858	>
859	>	#endif  /* ! NEWAMB */
860	>
861	>	/************* FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS ***************/
862	>
863	>	static void
864	>	initambfile(            /* initialize ambient file */
865	>	int  cre8
866	>	)
867	>	{
868	>	extern char  *progname, *octname;
869	>	static char  *mybuf = NULL;
870	>
871	>	#ifdef  F_SETLKW
872	>	aflock(cre8 ? F_WRLCK : F_RDLCK);
873		#endif
874	<	setbuf(ambfp, bmalloc(BUFSIZ));
875	<	if (creat) {                    /* new file */
876	<	fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ",
874	>	SET_FILE_BINARY(ambfp);
875	>	if (mybuf == NULL)
876	>	mybuf = (char *)bmalloc(BUFSIZ+8);
877	>	setbuf(ambfp, mybuf);
878	>	if (cre8) {                     /* new file */
879	>	newheader("RADIANCE", ambfp);
880	>	fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ",
881		progname, colval(ambval,RED),
882		colval(ambval,GRN), colval(ambval,BLU),
883	<	ambounce, ambacc);
884	<	fprintf(ambfp, "-ad %d -as %d -ar %d %s\n",
885	<	ambdiv, ambssamp, ambres,
886	<	octname==NULL ? "" : octname);
883	>	ambvwt, ambounce, ambacc);
884	>	fprintf(ambfp, "-ad %d -as %d -ar %d ",
885	>	ambdiv, ambssamp, ambres);
886	>	if (octname != NULL)
887	>	fputs(octname, ambfp);
888	>	fputc('\n', ambfp);
889		fprintf(ambfp, "SOFTWARE= %s\n", VersionID);
890	+	fputnow(ambfp);
891		fputformat(AMBFMT, ambfp);
892	<	putc('\n', ambfp);
892	>	fputc('\n', ambfp);
893		putambmagic(ambfp);
894		} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp))
895		error(USER, "bad ambient file");
896		}
897
898
899	<	static
900	<	avsave(av)                              /* insert and save an ambient value */
901	<	AMBVAL  *av;
899	>	static void
900	>	avsave(                         /* insert and save an ambient value */
901	>	AMBVAL  *av
902	>	)
903		{
904	<	avinsert(av, &atrunk, thescene.cuorg, thescene.cusize);
904	>	avinsert(avstore(av));
905		if (ambfp == NULL)
906		return;
907		if (writambval(av, ambfp) < 0)
#	Line 343 | Line 911 | AMBVAL *av;
911		goto writerr;
912		return;
913		writerr:
914	<	error(SYSTEM, "error writing ambient file");
914	>	error(SYSTEM, "error writing to ambient file");
915		}
916
917
918	<	static
919	<	avinsert(aval, at, c0, s)               /* insert ambient value in a tree */
920	<	AMBVAL  *aval;
921	<	register AMBTREE  *at;
354	<	FVECT  c0;
355	<	double  s;
918	>	static AMBVAL *
919	>	avstore(                                /* allocate memory and store aval */
920	>	AMBVAL  *aval
921	>	)
922		{
923	<	FVECT  ck0;
924	<	int  branch;
359	<	register AMBVAL  *av;
360	<	register int  i;
923	>	AMBVAL  *av;
924	>	double  d;
925
926		if ((av = newambval()) == NULL)
927	<	goto memerr;
928	<	copystruct(av, aval);
929	<	VCOPY(ck0, c0);
930	<	while (s*(OCTSCALE/2) > av->rad*ambacc) {
931	<	if (at->kid == NULL)
932	<	if ((at->kid = newambtree()) == NULL)
933	<	goto memerr;
934	<	s *= 0.5;
935	<	branch = 0;
936	<	for (i = 0; i < 3; i++)
937	<	if (av->pos[i] > ck0[i] + s) {
938	<	ck0[i] += s;
939	<	branch |= 1 << i;
927	>	error(SYSTEM, "out of memory in avstore");
928	>	*av = *aval;
929	>	av->latick = ambclock;
930	>	av->next = NULL;
931	>	nambvals++;
932	>	d = bright(av->val);
933	>	if (d > FTINY) {                /* add to log sum for averaging */
934	>	avsum += log(d);
935	>	navsum++;
936	>	}
937	>	return(av);
938	>	}
939	>
940	>
941	>	#define ATALLOCSZ       512             /* #/8 trees to allocate at once */
942	>
943	>	static AMBTREE  *atfreelist = NULL;     /* free ambient tree structures */
944	>
945	>
946	>	static AMBTREE *
947	>	newambtree(void)                                /* allocate 8 ambient tree structs */
948	>	{
949	>	AMBTREE  *atp, *upperlim;
950	>
951	>	if (atfreelist == NULL) {       /* get more nodes */
952	>	atfreelist = (AMBTREE *)malloc(ATALLOCSZ*8*sizeof(AMBTREE));
953	>	if (atfreelist == NULL)
954	>	return(NULL);
955	>	/* link new free list */
956	>	upperlim = atfreelist + 8*(ATALLOCSZ-1);
957	>	for (atp = atfreelist; atp < upperlim; atp += 8)
958	>	atp->kid = atp + 8;
959	>	atp->kid = NULL;
960	>	}
961	>	atp = atfreelist;
962	>	atfreelist = atp->kid;
963	>	memset((char *)atp, '\0', 8*sizeof(AMBTREE));
964	>	return(atp);
965	>	}
966	>
967	>
968	>	static void
969	>	freeambtree(                    /* free 8 ambient tree structs */
970	>	AMBTREE  *atp
971	>	)
972	>	{
973	>	atp->kid = atfreelist;
974	>	atfreelist = atp;
975	>	}
976	>
977	>
978	>	static void
979	>	unloadatree(                    /* unload an ambient value tree */
980	>	AMBTREE  *at,
981	>	unloadtf_t *f
982	>	)
983	>	{
984	>	AMBVAL  *av;
985	>	int  i;
986	>	/* transfer values at this node */
987	>	for (av = at->alist; av != NULL; av = at->alist) {
988	>	at->alist = av->next;
989	>	(*f)(av);
990	>	}
991	>	if (at->kid == NULL)
992	>	return;
993	>	for (i = 0; i < 8; i++)         /* transfer and free children */
994	>	unloadatree(at->kid+i, f);
995	>	freeambtree(at->kid);
996	>	at->kid = NULL;
997	>	}
998	>
999	>
1000	>	static struct avl {
1001	>	AMBVAL  *p;
1002	>	unsigned long   t;
1003	>	}       *avlist1;                       /* ambient value list with ticks */
1004	>	static AMBVAL   **avlist2;              /* memory positions for sorting */
1005	>	static int      i_avlist;               /* index for lists */
1006	>
1007	>	static int alatcmp(const void *av1, const void *av2);
1008	>
1009	>	static void
1010	>	avfree(AMBVAL *av)
1011	>	{
1012	>	free(av);
1013	>	}
1014	>
1015	>	static void
1016	>	av2list(
1017	>	AMBVAL *av
1018	>	)
1019	>	{
1020	>	#ifdef DEBUG
1021	>	if (i_avlist >= nambvals)
1022	>	error(CONSISTENCY, "too many ambient values in av2list1");
1023	>	#endif
1024	>	avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
1025	>	avlist1[i_avlist++].t = av->latick;
1026	>	}
1027	>
1028	>
1029	>	static int
1030	>	alatcmp(                        /* compare ambient values for MRA */
1031	>	const void *av1,
1032	>	const void *av2
1033	>	)
1034	>	{
1035	>	long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
1036	>	return(lc<0 ? -1 : lc>0 ? 1 : 0);
1037	>	}
1038	>
1039	>
1040	>	/* GW NOTE 2002/10/3:
1041	>	* I used to compare AMBVAL pointers, but found that this was the
1042	>	* cause of a serious consistency error with gcc, since the optimizer
1043	>	* uses some dangerous trick in pointer subtraction that
1044	>	* assumes pointers differ by exact struct size increments.
1045	>	*/
1046	>	static int
1047	>	aposcmp(                        /* compare ambient value positions */
1048	>	const void      *avp1,
1049	>	const void      *avp2
1050	>	)
1051	>	{
1052	>	long    diff = *(char * const *)avp1 - *(char * const *)avp2;
1053	>	if (diff < 0)
1054	>	return(-1);
1055	>	return(diff > 0);
1056	>	}
1057	>
1058	>
1059	>	static int
1060	>	avlmemi(                                /* find list position from address */
1061	>	AMBVAL  *avaddr
1062	>	)
1063	>	{
1064	>	AMBVAL  **avlpp;
1065	>
1066	>	avlpp = (AMBVAL **)bsearch((char *)&avaddr, (char *)avlist2,
1067	>	nambvals, sizeof(AMBVAL *), &aposcmp);
1068	>	if (avlpp == NULL)
1069	>	error(CONSISTENCY, "address not found in avlmemi");
1070	>	return(avlpp - avlist2);
1071	>	}
1072	>
1073	>
1074	>	static void
1075	>	sortambvals(                    /* resort ambient values */
1076	>	int     always
1077	>	)
1078	>	{
1079	>	AMBTREE  oldatrunk;
1080	>	AMBVAL  tav, *tap, *pnext;
1081	>	int     i, j;
1082	>	/* see if it's time yet */
1083	>	if (!always && (ambclock++ < lastsort+sortintvl ||
1084	>	nambvals < SORT_THRESH))
1085	>	return;
1086	>	/*
1087	>	* The idea here is to minimize memory thrashing
1088	>	* in VM systems by improving reference locality.
1089	>	* We do this by periodically sorting our stored ambient
1090	>	* values in memory in order of most recently to least
1091	>	* recently accessed.  This ordering was chosen so that new
1092	>	* ambient values (which tend to be less important) go into
1093	>	* higher memory with the infrequently accessed values.
1094	>	*      Since we expect our values to need sorting less
1095	>	* frequently as the process continues, we double our
1096	>	* waiting interval after each call.
1097	>	*      This routine is also called by setambacc() with
1098	>	* the "always" parameter set to 1 so that the ambient
1099	>	* tree will be rebuilt with the new accuracy parameter.
1100	>	*/
1101	>	if (tracktime) {                /* allocate pointer arrays to sort */
1102	>	avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *));
1103	>	avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl));
1104	>	} else {
1105	>	avlist2 = NULL;
1106	>	avlist1 = NULL;
1107	>	}
1108	>	if (avlist1 == NULL) {          /* no time tracking -- rebuild tree? */
1109	>	if (avlist2 != NULL)
1110	>	free((void *)avlist2);
1111	>	if (always) {           /* rebuild without sorting */
1112	>	oldatrunk = atrunk;
1113	>	atrunk.alist = NULL;
1114	>	atrunk.kid = NULL;
1115	>	unloadatree(&oldatrunk, &avinsert);
1116	>	}
1117	>	} else {                        /* sort memory by last access time */
1118	>	/*
1119	>	* Sorting memory is tricky because it isn't contiguous.
1120	>	* We have to sort an array of pointers by MRA and also
1121	>	* by memory position.  We then copy values in "loops"
1122	>	* to minimize memory hits.  Nevertheless, we will visit
1123	>	* everyone at least twice, and this is an expensive process
1124	>	* when we're thrashing, which is when we need to do it.
1125	>	*/
1126	>	#ifdef DEBUG
1127	>	sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...",
1128	>	nambvals, ambclock);
1129	>	eputs(errmsg);
1130	>	#endif
1131	>	i_avlist = 0;
1132	>	unloadatree(&atrunk, &av2list); /* empty current tree */
1133	>	#ifdef DEBUG
1134	>	if (i_avlist < nambvals)
1135	>	error(CONSISTENCY, "missing ambient values in sortambvals");
1136	>	#endif
1137	>	qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp);
1138	>	qsort((char *)avlist2, nambvals, sizeof(AMBVAL *), &aposcmp);
1139	>	for (i = 0; i < nambvals; i++) {
1140	>	if (avlist1[i].p == NULL)
1141	>	continue;
1142	>	tap = avlist2[i];
1143	>	tav = *tap;
1144	>	for (j = i; (pnext = avlist1[j].p) != tap;
1145	>	j = avlmemi(pnext)) {
1146	>	*(avlist2[j]) = *pnext;
1147	>	avinsert(avlist2[j]);
1148	>	avlist1[j].p = NULL;
1149		}
1150	<	at = at->kid + branch;
1150	>	*(avlist2[j]) = tav;
1151	>	avinsert(avlist2[j]);
1152	>	avlist1[j].p = NULL;
1153	>	}
1154	>	free((void *)avlist1);
1155	>	free((void *)avlist2);
1156	>	/* compute new sort interval */
1157	>	sortintvl = ambclock - lastsort;
1158	>	if (sortintvl >= MAX_SORT_INTVL/2)
1159	>	sortintvl = MAX_SORT_INTVL;
1160	>	else
1161	>	sortintvl <<= 1;        /* wait twice as long next */
1162	>	#ifdef DEBUG
1163	>	eputs("done\n");
1164	>	#endif
1165		}
1166	<	av->next = at->alist;
1167	<	at->alist = av;
1168	<	return;
382	<	memerr:
383	<	error(SYSTEM, "out of memory in avinsert");
1166	>	if (ambclock >= MAXACLOCK)
1167	>	ambclock = MAXACLOCK/2;
1168	>	lastsort = ambclock;
1169		}
1170
1171
1172	<	#ifdef  NIX
1172	>	#ifdef  F_SETLKW
1173
1174	<	int
1175	<	ambsync()                       /* flush ambient file */
1174	>	static void
1175	>	aflock(                 /* lock/unlock ambient file */
1176	>	int  typ
1177	>	)
1178		{
1179	<	if (nunflshed == 0)
1180	<	return(0);
1181	<	nunflshed = 0;
1182	<	return(fflush(ambfp));
1179	>	static struct flock  fls;       /* static so initialized to zeroes */
1180	>
1181	>	if (typ == fls.l_type)          /* already called? */
1182	>	return;
1183	>	fls.l_type = typ;
1184	>	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
1185	>	error(SYSTEM, "cannot (un)lock ambient file");
1186		}
1187
398	–	#else
1188
1189		int
1190	<	ambsync()                       /* synchronize ambient file */
1190	>	ambsync(void)                   /* synchronize ambient file */
1191		{
403	–	static FILE  *ambinp = NULL;
404	–	static long  lastpos = -1;
405	–	struct flock  fls;
1192		long  flen;
1193		AMBVAL  avs;
1194	<	register int  n;
1194	>	int  n;
1195
1196	<	if (nunflshed == 0)
1196	>	if (ambfp == NULL)      /* no ambient file? */
1197		return(0);
1198	<	/* gain exclusive access */
1199	<	fls.l_type = F_WRLCK;
414	<	fls.l_whence = 0;
415	<	fls.l_start = 0L;
416	<	fls.l_len = 0L;
417	<	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
418	<	error(SYSTEM, "cannot lock ambient file");
419	<	if (lastpos < 0)        /* initializing */
420	<	goto syncend;
1198	>	/* gain appropriate access */
1199	>	aflock(nunflshed ? F_WRLCK : F_RDLCK);
1200		/* see if file has grown */
1201	<	if ((flen = lseek(fileno(ambfp), 0L, 2)) < 0)
1202	<	error(SYSTEM, "cannot seek on ambient file");
1203	<	if (n = flen - lastpos) {               /* file has grown */
1201	>	if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0)
1202	>	goto seekerr;
1203	>	if ((n = flen - lastpos) > 0) {         /* file has grown */
1204		if (ambinp == NULL) {           /* use duplicate filedes */
1205		ambinp = fdopen(dup(fileno(ambfp)), "r");
1206		if (ambinp == NULL)
1207		error(SYSTEM, "fdopen failed in ambsync");
1208		}
1209	<	if (fseek(ambinp, lastpos, 0) < 0)
1210	<	error(SYSTEM, "fseek failed in ambsync");
1209	>	if (fseek(ambinp, lastpos, SEEK_SET) < 0)
1210	>	goto seekerr;
1211		while (n >= AMBVALSIZ) {        /* load contributed values */
1212	<	readambval(&avs, ambinp);
1213	<	avinsert(&avs,&atrunk,thescene.cuorg,thescene.cusize);
1212	>	if (!readambval(&avs, ambinp)) {
1213	>	sprintf(errmsg,
1214	>	"ambient file \"%s\" corrupted near character %ld",
1215	>	ambfile, flen - n);
1216	>	error(WARNING, errmsg);
1217	>	break;
1218	>	}
1219	>	avinsert(avstore(&avs));
1220		n -= AMBVALSIZ;
1221		}
1222	<	if (n)                          /* alignment */
1223	<	lseek(fileno(ambfp), flen-n, 0);
1222	>	lastpos = flen - n;
1223	>	/*** seek always as safety measure
1224	>	if (n) ***/                     /* alignment */
1225	>	if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0)
1226	>	goto seekerr;
1227		}
440	–	syncend:
1228		n = fflush(ambfp);                      /* calls write() at last */
1229	<	lastpos = lseek(fileno(ambfp), 0L, 1);
1230	<	fls.l_type = F_UNLCK;                   /* release file */
1231	<	fcntl(fileno(ambfp), F_SETLKW, &fls);
1229	>	if (n != EOF)
1230	>	lastpos += (long)nunflshed*AMBVALSIZ;
1231	>	else if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0)
1232	>	goto seekerr;
1233	>
1234	>	aflock(F_UNLCK);                        /* release file */
1235		nunflshed = 0;
1236		return(n);
1237	+	seekerr:
1238	+	error(SYSTEM, "seek failed in ambsync");
1239	+	return -1; /* pro forma return */
1240		}
1241
1242	<	#endif
1242	>	#else   /* ! F_SETLKW */
1243	>
1244	>	int
1245	>	ambsync(void)                   /* flush ambient file */
1246	>	{
1247	>	if (ambfp == NULL)
1248	>	return(0);
1249	>	nunflshed = 0;
1250	>	return(fflush(ambfp));
1251	>	}
1252	>
1253	>	#endif  /* ! F_SETLKW */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines