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.1 by greg, Thu Feb 2 10:41:17 1989 UTC vs.
Revision 2.94 by greg, Tue Feb 24 19:39:26 2015 UTC

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

Diff Legend

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