[ViewVC] Diff of: radiance/ray/src/rt/ambient.c

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.36 by greg, Wed Feb 14 15:43:22 1996 UTC vs.
Revision 2.73 by greg, Wed Apr 16 20:32:00 2014 UTC

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

Diff Legend

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

Comparing ray/src/rt/ambient.c (file contents): Revision 2.36 by greg, Wed Feb 14 15:43:22 1996 UTC vs. Revision 2.73 by greg, Wed Apr 16 20:32:00 2014 UTC

Diff Legend

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.36 by greg, Wed Feb 14 15:43:22 1996 UTC vs.
Revision 2.73 by greg, Wed Apr 16 20:32:00 2014 UTC