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 1.3 by greg, Fri May 26 17:58:01 1989 UTC vs.
Revision 2.93 by greg, Fri Nov 21 00:53:52 2014 UTC

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

Diff Legend

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