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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.44 by gwlarson, Wed Jun 17 13:29:55 1998 UTC vs.
Revision 2.79 by greg, Fri Apr 25 00:21:52 2014 UTC

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

Diff Legend

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

Comparing ray/src/rt/ambient.c (file contents): Revision 2.44 by gwlarson, Wed Jun 17 13:29:55 1998 UTC vs. Revision 2.79 by greg, Fri Apr 25 00:21:52 2014 UTC

Diff Legend

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.44 by gwlarson, Wed Jun 17 13:29:55 1998 UTC vs.
Revision 2.79 by greg, Fri Apr 25 00:21:52 2014 UTC