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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.63 by greg, Thu Sep 13 20:13:16 2007 UTC vs.
Revision 2.105 by greg, Tue Jan 9 05:01:15 2018 UTC

#	Line 1 \| Line 1
1	–	#ifndef lint
1		static const char RCSid[] = "$Id$";
3	–	#endif
2		/*
3		* ambient.c - routines dealing with ambient (inter-reflected) component.
4		*
#	Line 14 \| Line 12 \| static const char RCSid[] = "$Id$";
12		#include "platform.h"
13		#include "ray.h"
14		#include "otypes.h"
15	+	#include "otspecial.h"
16		#include "resolu.h"
17		#include "ambient.h"
18	+	#include "source.h"
19		#include "random.h"
20	+	#include "pmapamb.h"
21
22		#ifndef OCTSCALE
23		#define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */
#	Line 25 \| Line 26 \| static const char RCSid[] = "$Id$";
26		extern char shm_boundary; / memory sharing boundary */
27
28		#ifndef MAXASET
29	<	#define MAXASET 2047 /* maximum number of elements in ambient set */
29	>	#define MAXASET 4095 /* maximum number of elements in ambient set */
30		#endif
31		OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */
32
#	Line 39 \| Line 40 \| *static int nunflshed = 0; / number of unflushed ambi**
40
41		#ifndef SORT_THRESH
42		#ifdef SMLMEM
43	<	#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL))
43	>	#define SORT_THRESH ((16L<<20)/sizeof(AMBVAL))
44		#else
45	<	#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL))
45	>	#define SORT_THRESH ((64L<<20)/sizeof(AMBVAL))
46		#endif
47		#endif
48		#ifndef SORT_INTVL
#	Line 51 \| Line 52 \| *static int nunflshed = 0; / number of unflushed ambi**
52		#define MAX_SORT_INTVL (SORT_INTVL<<6)
53		#endif
54
55	+
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 76 \| Line 78 \| *static long lastpos = -1; / last flush position /*
78		#define AMBFLUSH (BUFSIZ/AMBVALSIZ)
79
80		#define newambval() (AMBVAL *)malloc(sizeof(AMBVAL))
79	–	#define freeav(av) free((void *)av);
81
82		static void initambfile(int creat);
83		static void avsave(AMBVAL *av);
#	Line 84 \| Line 85 \| *static AMBVAL avstore(AMBVAL aval);*
85		static AMBTREE *newambtree(void);
86		static void freeambtree(AMBTREE *atp);
87
88	<	typedef void unloadtf_t(void *);
88	>	typedef void unloadtf_t(AMBVAL *);
89		static unloadtf_t avinsert;
90		static unloadtf_t av2list;
91	+	static unloadtf_t avfree;
92		static void unloadatree(AMBTREE at, unloadtf_t f);
93
94		static int aposcmp(const void avp1, const void avp2);
#	Line 98 \| Line 100 \| static void aflock(int typ);
100		#endif
101
102
103	<	extern void
103	>	void
104		setambres( /* set ambient resolution */
105		int ar
106		)
#	Line 107 \| Line 109 \| *setambres( / set ambient resolution /*
109		/* set min & max radii */
110		if (ar <= 0) {
111		minarad = 0;
112	<	maxarad = thescene.cusize / 2.0;
112	>	maxarad = thescene.cusize*0.2;
113		} else {
114		minarad = thescene.cusize / ar;
115	<	maxarad = 64 * minarad; /* heuristic */
116	<	if (maxarad > thescene.cusize / 2.0)
117	<	maxarad = thescene.cusize / 2.0;
115	>	maxarad = 64.0 * minarad; /* heuristic */
116	>	if (maxarad > thescene.cusize*0.2)
117	>	maxarad = thescene.cusize*0.2;
118		}
119		if (minarad <= FTINY)
120	<	minarad = 10*FTINY;
120	>	minarad = 10.0*FTINY;
121		if (maxarad <= minarad)
122	<	maxarad = 64 * minarad;
122	>	maxarad = 64.0 * minarad;
123		}
124
125
126	<	extern void
126	>	void
127		setambacc( /* set ambient accuracy */
128		double newa
129		)
130		{
131	<	double ambdiff;
132	<
133	<	if (newa < 0.0)
134	<	newa = 0.0;
135	<	ambdiff = fabs(newa - ambacc);
136	<	if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0)
137	<	sortambvals(1); /* rebuild tree */
131	>	static double olda; /* remember previous setting here */
132	>
133	>	newa *= (newa > 0);
134	>	if (fabs(newa - olda) >= .05*(newa + olda)) {
135	>	ambacc = newa;
136	>	if (nambvals > 0)
137	>	sortambvals(1); /* rebuild tree */
138	>	}
139		}
140
141
142	<	extern void
142	>	void
143		setambient(void) /* initialize calculation */
144		{
145		int readonly = 0;
146	<	long pos, flen;
146	>	long flen;
147		AMBVAL amb;
148		/* make sure we're fresh */
149		ambdone();
#	Line 160 \| Line 163 \| *setambient(void) / initialize calculation /*
163		readonly = (ambfp = fopen(ambfile, "r")) != NULL;
164		if (ambfp != NULL) {
165		initambfile(0); /* file exists */
166	<	pos = ftell(ambfp);
166	>	lastpos = ftell(ambfp);
167		while (readambval(&amb, ambfp))
168	<	avinsert(avstore(&amb));
168	>	avstore(&amb);
169		nambshare = nambvals; /* share loaded values */
170		if (readonly) {
171		sprintf(errmsg,
#	Line 174 \| Line 177 \| *setambient(void) / initialize calculation /*
177		return; /* avoid ambsync() */
178		}
179		/* align file pointer */
180	<	pos += (long)nambvals*AMBVALSIZ;
180	>	lastpos += (long)nambvals*AMBVALSIZ;
181		flen = lseek(fileno(ambfp), (off_t)0, SEEK_END);
182	<	if (flen != pos) {
182	>	if (flen != lastpos) {
183		sprintf(errmsg,
184		"ignoring last %ld values in ambient file (corrupted)",
185	<	(flen - pos)/AMBVALSIZ);
185	>	(flen - lastpos)/AMBVALSIZ);
186		error(WARNING, errmsg);
187	<	fseek(ambfp, pos, 0);
188	<	#ifndef _WIN32 /* XXX we need a replacement for that one */
186	<	ftruncate(fileno(ambfp), (off_t)pos);
187	<	#endif
187	>	fseek(ambfp, lastpos, SEEK_SET);
188	>	ftruncate(fileno(ambfp), (off_t)lastpos);
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	<	ambsync(); /* load previous values */
198	>	#ifdef F_SETLKW
199	>	aflock(F_UNLCK); /* release file */
200	>	#endif
201		}
202
203
204	<	extern void
204	>	void
205		ambdone(void) /* close ambient file and free memory */
206		{
207		if (ambfp != NULL) { /* close ambient file */
#	Line 210 \| Line 215 \| *ambdone(void) / close ambient file and free memory**
215		lastpos = -1;
216		}
217		/* free ambient tree */
218	<	unloadatree(&atrunk, free);
218	>	unloadatree(&atrunk, avfree);
219		/* reset state variables */
220		avsum = 0.;
221		navsum = 0;
#	Line 222 \| Line 227 \| *ambdone(void) / close ambient file and free memory**
227		}
228
229
230	<	extern void
230	>	void
231		ambnotify( /* record new modifier */
232		OBJECT obj
233		)
234		{
235		static int hitlimit = 0;
236	<	register OBJREC *o;
237	<	register char **amblp;
236	>	OBJREC *o;
237	>	char **amblp;
238
239		if (obj == OVOID) { /* starting over */
240		ambset[0] = 0;
#	Line 251 \| Line 256 \| *ambnotify( / record new modifier /*
256		}
257		}
258
259	+	/********** THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD *************/
260
261	<	extern void
261	>	#ifndef OLDAMB
262	>
263	>	#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr)))
264	>
265	>	static int plugaleak(RAY r, AMBVAL ap, FVECT anorm, double ang);
266	>	static double sumambient(COLOR acol, RAY *r, FVECT rn, int al,
267	>	AMBTREE *at, FVECT c0, double s);
268	>	static int makeambient(COLOR acol, RAY *r, FVECT rn, int al);
269	>	static int extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv,
270	>	FVECT uvw[3]);
271	>
272	>	void
273		multambient( /* compute ambient component & multiply by coef. */
274		COLOR aval,
275	<	register RAY *r,
275	>	RAY *r,
276		FVECT nrm
277		)
278		{
279		static int rdepth = 0; /* ambient recursion */
280	<	COLOR acol;
280	>	COLOR acol, caustic;
281	>	int i, ok;
282		double d, l;
283
284	+	/* PMAP: Factor in ambient from photon map, if enabled and ray is
285	+	* ambient. Return as all ambient components accounted for, else
286	+	* continue. */
287	+	if (ambPmap(aval, r, rdepth))
288	+	return;
289	+
290	+	/* PMAP: Factor in specular-diffuse ambient (caustics) from photon
291	+	* map, if enabled and ray is primary, else caustic is zero. Continue
292	+	* with RADIANCE ambient calculation */
293	+	copycolor(caustic, aval);
294	+	ambPmapCaustic(caustic, r, rdepth);
295	+
296		if (ambdiv <= 0) /* no ambient calculation */
297		goto dumbamb;
298		/* check number of bounces */
#	Line 274 \| Line 304 \| *multambient( / compute ambient component & multiply**
304		goto dumbamb;
305
306		if (ambacc <= FTINY) { /* no ambient storage */
307	+	FVECT uvd[2];
308	+	float dgrad[2], *dgp = NULL;
309	+
310	+	if (nrm != r->ron && DOT(nrm,r->ron) < 0.9999)
311	+	dgp = dgrad; /* compute rotational grad. */
312		copycolor(acol, aval);
313		rdepth++;
314	+	ok = doambient(acol, r, r->rweight,
315	+	uvd, NULL, NULL, dgp, NULL);
316	+	rdepth--;
317	+	if (!ok)
318	+	goto dumbamb;
319	+	if ((ok > 0) & (dgp != NULL)) { /* apply texture */
320	+	FVECT v1;
321	+	VCROSS(v1, r->ron, nrm);
322	+	d = 1.0;
323	+	for (i = 3; i--; )
324	+	d += v1[i] * (dgp[0]uvd[0][i] + dgp[1]uvd[1][i]);
325	+	if (d >= 0.05)
326	+	scalecolor(acol, d);
327	+	}
328	+	copycolor(aval, acol);
329	+
330	+	/* PMAP: add in caustic */
331	+	addcolor(aval, caustic);
332	+	return;
333	+	}
334	+
335	+	if (tracktime) /* sort to minimize thrashing */
336	+	sortambvals(0);
337	+	/* interpolate ambient value */
338	+	setcolor(acol, 0.0, 0.0, 0.0);
339	+	d = sumambient(acol, r, nrm, rdepth,
340	+	&atrunk, thescene.cuorg, thescene.cusize);
341	+
342	+	if (d > FTINY) {
343	+	d = 1.0/d;
344	+	scalecolor(acol, d);
345	+	multcolor(aval, acol);
346	+
347	+	/* PMAP: add in caustic */
348	+	addcolor(aval, caustic);
349	+	return;
350	+	}
351	+
352	+	rdepth++; /* need to cache new value */
353	+	ok = makeambient(acol, r, nrm, rdepth-1);
354	+	rdepth--;
355	+
356	+	if (ok) {
357	+	multcolor(aval, acol); /* computed new value */
358	+
359	+	/* PMAP: add in caustic */
360	+	addcolor(aval, caustic);
361	+	return;
362	+	}
363	+
364	+	dumbamb: /* return global value */
365	+	if ((ambvwt <= 0) \| (navsum == 0)) {
366	+	multcolor(aval, ambval);
367	+
368	+	/* PMAP: add in caustic */
369	+	addcolor(aval, caustic);
370	+	return;
371	+	}
372	+
373	+	l = bright(ambval); /* average in computations */
374	+	if (l > FTINY) {
375	+	d = (log(l)*(double)ambvwt + avsum) /
376	+	(double)(ambvwt + navsum);
377	+	d = exp(d) / l;
378	+	scalecolor(aval, d);
379	+	multcolor(aval, ambval); /* apply color of ambval */
380	+	} else {
381	+	d = exp( avsum / (double)navsum );
382	+	scalecolor(aval, d); /* neutral color */
383	+	}
384	+	}
385	+
386	+
387	+	/* Plug a potential leak where ambient cache value is occluded */
388	+	static int
389	+	plugaleak(RAY r, AMBVAL ap, FVECT anorm, double ang)
390	+	{
391	+	const double cost70sq = 0.1169778; /* cos(70deg)^2 */
392	+	RAY rtst;
393	+	FVECT vdif;
394	+	double normdot, ndotd, nadotd;
395	+	double a, b, c, t[2];
396	+
397	+	ang += 2.PI(ang < 0); /* check direction flags */
398	+	if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) )
399	+	return(0);
400	+	/*
401	+	* Generate test ray, targeting 20 degrees above sample point plane
402	+	* along surface normal from cache position. This should be high
403	+	* enough to miss local geometry we don't really care about.
404	+	*/
405	+	VSUB(vdif, ap->pos, r->rop);
406	+	normdot = DOT(anorm, r->ron);
407	+	ndotd = DOT(vdif, r->ron);
408	+	nadotd = DOT(vdif, anorm);
409	+	a = normdot*normdot - cost70sq;
410	+	b = 2.0(normdotndotd - nadotd*cost70sq);
411	+	c = ndotdndotd - DOT(vdif,vdif)cost70sq;
412	+	if (quadratic(t, a, b, c) != 2)
413	+	return(1); /* should rarely happen */
414	+	if (t[1] <= FTINY)
415	+	return(0); /* should fail behind test */
416	+	rayorigin(&rtst, SHADOW, r, NULL);
417	+	VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */
418	+	rtst.rmax = normalize(rtst.rdir); /* short ray test */
419	+	while (localhit(&rtst, &thescene)) { /* check for occluder */
420	+	OBJREC *m = findmaterial(rtst.ro);
421	+	if (m != NULL && !istransp(m->otype) && !isBSDFproxy(m) &&
422	+	(rtst.clipset == NULL \|\|
423	+	!inset(rtst.clipset, rtst.ro->omod)))
424	+	return(1); /* plug light leak */
425	+	VCOPY(rtst.rorg, rtst.rop); /* skip invisible surface */
426	+	rtst.rmax -= rtst.rot;
427	+	rayclear(&rtst);
428	+	}
429	+	return(0); /* seems we're OK */
430	+	}
431	+
432	+
433	+	static double
434	+	sumambient( /* get interpolated ambient value */
435	+	COLOR acol,
436	+	RAY *r,
437	+	FVECT rn,
438	+	int al,
439	+	AMBTREE *at,
440	+	FVECT c0,
441	+	double s
442	+	)
443	+	{ /* initial limit is 10 degrees plus ambacc radians */
444	+	const double minangle = 10.0 * PI/180.;
445	+	double maxangle = minangle + ambacc;
446	+	double wsum = 0.0;
447	+	FVECT ck0;
448	+	int i, j;
449	+	AMBVAL *av;
450	+
451	+	if (at->kid != NULL) { /* sum children first */
452	+	s *= 0.5;
453	+	for (i = 0; i < 8; i++) {
454	+	for (j = 0; j < 3; j++) {
455	+	ck0[j] = c0[j];
456	+	if (1<<j & i)
457	+	ck0[j] += s;
458	+	if (r->rop[j] < ck0[j] - OCTSCALE*s)
459	+	break;
460	+	if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s)
461	+	break;
462	+	}
463	+	if (j == 3)
464	+	wsum += sumambient(acol, r, rn, al,
465	+	at->kid+i, ck0, s);
466	+	}
467	+	/* good enough? */
468	+	if (wsum >= 0.05 && s > minarad*10.0)
469	+	return(wsum);
470	+	}
471	+	/* adjust maximum angle */
472	+	if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6))
473	+	maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.;
474	+	/* sum this node */
475	+	for (av = at->alist; av != NULL; av = av->next) {
476	+	double u, v, d, delta_r2, delta_t2;
477	+	COLOR ct;
478	+	FVECT uvw[3];
479	+	/* record access */
480	+	if (tracktime)
481	+	av->latick = ambclock;
482	+	/*
483	+	* Ambient level test
484	+	*/
485	+	if (av->lvl > al \|\| /* list sorted, so this works */
486	+	(av->lvl == al) & (av->weight < 0.9*r->rweight))
487	+	break;
488	+	/*
489	+	* Direction test using unperturbed normal
490	+	*/
491	+	decodedir(uvw[2], av->ndir);
492	+	d = DOT(uvw[2], r->ron);
493	+	if (d <= 0.0) /* >= 90 degrees */
494	+	continue;
495	+	delta_r2 = 2.0 - 2.0d; / approx. radians^2 */
496	+	if (delta_r2 >= maxangle*maxangle)
497	+	continue;
498	+	/*
499	+	* Modified ray behind test
500	+	*/
501	+	VSUB(ck0, r->rop, av->pos);
502	+	d = DOT(ck0, uvw[2]);
503	+	if (d < -minarad*ambacc-.001)
504	+	continue;
505	+	d /= av->rad[0];
506	+	delta_t2 = d*d;
507	+	if (delta_t2 >= ambacc*ambacc)
508	+	continue;
509	+	/*
510	+	* Elliptical radii test based on Hessian
511	+	*/
512	+	decodedir(uvw[0], av->udir);
513	+	VCROSS(uvw[1], uvw[2], uvw[0]);
514	+	d = (u = DOT(ck0, uvw[0])) / av->rad[0];
515	+	delta_t2 += d*d;
516	+	d = (v = DOT(ck0, uvw[1])) / av->rad[1];
517	+	delta_t2 += d*d;
518	+	if (delta_t2 >= ambacc*ambacc)
519	+	continue;
520	+	/*
521	+	* Test for potential light leak
522	+	*/
523	+	if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u)))
524	+	continue;
525	+	/*
526	+	* Extrapolate value and compute final weight (hat function)
527	+	*/
528	+	if (!extambient(ct, av, r->rop, rn, uvw))
529	+	continue;
530	+	d = tfunc(maxangle, sqrt(delta_r2), 0.0) *
531	+	tfunc(ambacc, sqrt(delta_t2), 0.0);
532	+	scalecolor(ct, d);
533	+	addcolor(acol, ct);
534	+	wsum += d;
535	+	}
536	+	return(wsum);
537	+	}
538	+
539	+
540	+	static int
541	+	makeambient( /* make a new ambient value for storage */
542	+	COLOR acol,
543	+	RAY *r,
544	+	FVECT rn,
545	+	int al
546	+	)
547	+	{
548	+	AMBVAL amb;
549	+	FVECT uvw[3];
550	+	int i;
551	+
552	+	amb.weight = 1.0; /* compute weight */
553	+	for (i = al; i-- > 0; )
554	+	amb.weight *= AVGREFL;
555	+	if (r->rweight < 0.1amb.weight) / heuristic override */
556	+	amb.weight = 1.25*r->rweight;
557	+	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
558	+	/* compute ambient */
559	+	i = doambient(acol, r, amb.weight,
560	+	uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral);
561	+	scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */
562	+	if (i <= 0 \|\| amb.rad[0] <= FTINY) /* no Hessian or zero radius */
563	+	return(i);
564	+	/* store value */
565	+	VCOPY(amb.pos, r->rop);
566	+	amb.ndir = encodedir(r->ron);
567	+	amb.udir = encodedir(uvw[0]);
568	+	amb.lvl = al;
569	+	copycolor(amb.val, acol);
570	+	/* insert into tree */
571	+	avsave(&amb); /* and save to file */
572	+	if (rn != r->ron) { /* texture */
573	+	VCOPY(uvw[2], r->ron);
574	+	extambient(acol, &amb, r->rop, rn, uvw);
575	+	}
576	+	return(1);
577	+	}
578	+
579	+
580	+	static int
581	+	extambient( /* extrapolate value at pv, nv */
582	+	COLOR cr,
583	+	AMBVAL *ap,
584	+	FVECT pv,
585	+	FVECT nv,
586	+	FVECT uvw[3]
587	+	)
588	+	{
589	+	const double min_d = 0.05;
590	+	static FVECT my_uvw[3];
591	+	FVECT v1;
592	+	int i;
593	+	double d = 1.0; /* zeroeth order */
594	+
595	+	if (uvw == NULL) { /* need local coordinates? */
596	+	decodedir(my_uvw[2], ap->ndir);
597	+	decodedir(my_uvw[0], ap->udir);
598	+	VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]);
599	+	uvw = my_uvw;
600	+	}
601	+	for (i = 3; i--; ) /* gradient due to translation */
602	+	d += (pv[i] - ap->pos[i]) *
603	+	(ap->gpos[0]uvw[0][i] + ap->gpos[1]uvw[1][i]);
604	+
605	+	VCROSS(v1, uvw[2], nv); /* gradient due to rotation */
606	+	for (i = 3; i--; )
607	+	d += v1[i] * (ap->gdir[0]uvw[0][i] + ap->gdir[1]uvw[1][i]);
608	+
609	+	if (d < min_d) /* should not use if we can avoid it */
610	+	d = min_d;
611	+	copycolor(cr, ap->val);
612	+	scalecolor(cr, d);
613	+	return(d > min_d);
614	+	}
615	+
616	+
617	+	static void
618	+	avinsert( /* insert ambient value in our tree */
619	+	AMBVAL *av
620	+	)
621	+	{
622	+	AMBTREE *at;
623	+	AMBVAL *ap;
624	+	AMBVAL avh;
625	+	FVECT ck0;
626	+	double s;
627	+	int branch;
628	+	int i;
629	+
630	+	if (av->rad[0] <= FTINY)
631	+	error(CONSISTENCY, "zero ambient radius in avinsert");
632	+	at = &atrunk;
633	+	VCOPY(ck0, thescene.cuorg);
634	+	s = thescene.cusize;
635	+	while (s(OCTSCALE/2) > av->rad[1]ambacc) {
636	+	if (at->kid == NULL)
637	+	if ((at->kid = newambtree()) == NULL)
638	+	error(SYSTEM, "out of memory in avinsert");
639	+	s *= 0.5;
640	+	branch = 0;
641	+	for (i = 0; i < 3; i++)
642	+	if (av->pos[i] > ck0[i] + s) {
643	+	ck0[i] += s;
644	+	branch \|= 1 << i;
645	+	}
646	+	at = at->kid + branch;
647	+	}
648	+	avh.next = at->alist; /* order by increasing level */
649	+	for (ap = &avh; ap->next != NULL; ap = ap->next)
650	+	if ( ap->next->lvl > av->lvl \|\|
651	+	(ap->next->lvl == av->lvl) &
652	+	(ap->next->weight <= av->weight) )
653	+	break;
654	+	av->next = ap->next;
655	+	ap->next = (AMBVAL*)av;
656	+	at->alist = avh.next;
657	+	}
658	+
659	+
660	+	#else /* ! NEWAMB */
661	+
662	+	static double sumambient(COLOR acol, RAY *r, FVECT rn, int al,
663	+	AMBTREE *at, FVECT c0, double s);
664	+	static double makeambient(COLOR acol, RAY *r, FVECT rn, int al);
665	+	static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
666	+
667	+
668	+	void
669	+	multambient( /* compute ambient component & multiply by coef. */
670	+	COLOR aval,
671	+	RAY *r,
672	+	FVECT nrm
673	+	)
674	+	{
675	+	static int rdepth = 0; /* ambient recursion */
676	+	COLOR acol, caustic;
677	+	double d, l;
678	+
679	+	/* PMAP: Factor in ambient from global photon map (if enabled) and return
680	+	* as all ambient components accounted for */
681	+	if (ambPmap(aval, r, rdepth))
682	+	return;
683	+
684	+	/* PMAP: Otherwise factor in ambient from caustic photon map
685	+	* (ambPmapCaustic() returns zero if caustic photons disabled) and
686	+	* continue with RADIANCE ambient calculation */
687	+	copycolor(caustic, aval);
688	+	ambPmapCaustic(caustic, r, rdepth);
689	+
690	+	if (ambdiv <= 0) /* no ambient calculation */
691	+	goto dumbamb;
692	+	/* check number of bounces */
693	+	if (rdepth >= ambounce)
694	+	goto dumbamb;
695	+	/* check ambient list */
696	+	if (ambincl != -1 && r->ro != NULL &&
697	+	ambincl != inset(ambset, r->ro->omod))
698	+	goto dumbamb;
699	+
700	+	if (ambacc <= FTINY) { /* no ambient storage */
701	+	copycolor(acol, aval);
702	+	rdepth++;
703		d = doambient(acol, r, r->rweight, NULL, NULL);
704		rdepth--;
705		if (d <= FTINY)
706		goto dumbamb;
707	<	copycolor(aval, acol);
707	>	copycolor(aval, acol);
708	>
709	>	/* PMAP: add in caustic */
710	>	addcolor(aval, caustic);
711		return;
712		}
713
#	Line 290 \| Line 717 \| *multambient( / compute ambient component & multiply**
717		setcolor(acol, 0.0, 0.0, 0.0);
718		d = sumambient(acol, r, nrm, rdepth,
719		&atrunk, thescene.cuorg, thescene.cusize);
720	+
721		if (d > FTINY) {
722		d = 1.0/d;
723		scalecolor(acol, d);
724		multcolor(aval, acol);
725	+
726	+	/* PMAP: add in caustic */
727	+	addcolor(aval, caustic);
728		return;
729		}
730	+
731		rdepth++; /* need to cache new value */
732		d = makeambient(acol, r, nrm, rdepth-1);
733		rdepth--;
734	+
735		if (d > FTINY) {
736		multcolor(aval, acol); /* got new value */
737	+
738	+	/* PMAP: add in caustic */
739	+	addcolor(aval, caustic);
740		return;
741		}
742	+
743		dumbamb: /* return global value */
744		if ((ambvwt <= 0) \| (navsum == 0)) {
745		multcolor(aval, ambval);
746	+
747	+	/* PMAP: add in caustic */
748	+	addcolor(aval, caustic);
749		return;
750		}
751	+
752		l = bright(ambval); /* average in computations */
753		if (l > FTINY) {
754		d = (log(l)*(double)ambvwt + avsum) /
#	Line 322 \| Line 763 \| *dumbamb: / return global value /*
763		}
764
765
766	<	extern double
766	>	static double
767		sumambient( /* get interpolated ambient value */
768		COLOR acol,
769	<	register RAY *r,
769	>	RAY *r,
770		FVECT rn,
771		int al,
772		AMBTREE *at,
#	Line 337 \| Line 778 \| *sumambient( / get interpolated ambient value /*
778		COLOR ct;
779		FVECT ck0;
780		int i;
781	<	register int j;
782	<	register AMBVAL *av;
781	>	int j;
782	>	AMBVAL *av;
783
784		wsum = 0.0;
785		/* do this node */
#	Line 349 \| Line 790 \| *sumambient( / get interpolated ambient value /*
790		/*
791		* Ambient level test.
792		*/
793	<	if (av->lvl > al) /* list sorted, so this works */
793	>	if (av->lvl > al \|\| /* list sorted, so this works */
794	>	(av->lvl == al) & (av->weight < 0.9*r->rweight))
795		break;
354	–	if (av->weight < 0.9*r->rweight)
355	–	continue;
796		/*
797		* Ambient radius test.
798		*/
799	<	d = av->pos[0] - r->rop[0];
800	<	e1 = d * d;
361	<	d = av->pos[1] - r->rop[1];
362	<	e1 += d * d;
363	<	d = av->pos[2] - r->rop[2];
364	<	e1 += d * d;
365	<	e1 /= av->rad * av->rad;
799	>	VSUB(ck0, av->pos, r->rop);
800	>	e1 = DOT(ck0, ck0) / (av->rad * av->rad);
801		if (e1 > ambaccambacc1.21)
802		continue;
803		/*
#	Line 379 \| Line 814 \| *sumambient( / get interpolated ambient value /*
814		}
815		}
816		e2 = (1.0 - d) * r->rweight;
817	<	if (e2 < 0.0) e2 = 0.0;
818	<	if (e1 + e2 > ambaccambacc1.21)
817	>	if (e2 < 0.0)
818	>	e2 = 0.0;
819	>	else if (e1 + e2 > ambaccambacc1.21)
820		continue;
821		/*
822		* Ray behind test.
#	Line 437 \| Line 873 \| *sumambient( / get interpolated ambient value /*
873		}
874
875
876	<	extern double
876	>	static double
877		makeambient( /* make a new ambient value for storage */
878		COLOR acol,
879		RAY *r,
#	Line 477 \| Line 913 \| *makeambient( / make a new ambient value for storage**
913		}
914
915
916	<	extern void
916	>	static void
917		extambient( /* extrapolate value at pv, nv */
918		COLOR cr,
919	<	register AMBVAL *ap,
919	>	AMBVAL *ap,
920		FVECT pv,
921		FVECT nv
922		)
923		{
924		FVECT v1;
925	<	register int i;
925	>	int i;
926		double d;
927
928		d = 1.0; /* zeroeth order */
#	Line 506 \| Line 942 \| *extambient( / extrapolate value at pv, nv /*
942
943
944		static void
945	+	avinsert( /* insert ambient value in our tree */
946	+	AMBVAL *av
947	+	)
948	+	{
949	+	AMBTREE *at;
950	+	AMBVAL *ap;
951	+	AMBVAL avh;
952	+	FVECT ck0;
953	+	double s;
954	+	int branch;
955	+	int i;
956	+
957	+	if (av->rad <= FTINY)
958	+	error(CONSISTENCY, "zero ambient radius in avinsert");
959	+	at = &atrunk;
960	+	VCOPY(ck0, thescene.cuorg);
961	+	s = thescene.cusize;
962	+	while (s(OCTSCALE/2) > av->radambacc) {
963	+	if (at->kid == NULL)
964	+	if ((at->kid = newambtree()) == NULL)
965	+	error(SYSTEM, "out of memory in avinsert");
966	+	s *= 0.5;
967	+	branch = 0;
968	+	for (i = 0; i < 3; i++)
969	+	if (av->pos[i] > ck0[i] + s) {
970	+	ck0[i] += s;
971	+	branch \|= 1 << i;
972	+	}
973	+	at = at->kid + branch;
974	+	}
975	+	avh.next = at->alist; /* order by increasing level */
976	+	for (ap = &avh; ap->next != NULL; ap = ap->next)
977	+	if ( ap->next->lvl > av->lvl \|\|
978	+	(ap->next->lvl == av->lvl) &
979	+	(ap->next->weight <= av->weight) )
980	+	break;
981	+	av->next = ap->next;
982	+	ap->next = (AMBVAL*)av;
983	+	at->alist = avh.next;
984	+	}
985	+
986	+	#endif /* ! NEWAMB */
987	+
988	+	/*********** FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS *************/
989	+
990	+	static void
991		initambfile( /* initialize ambient file */
992	<	int creat
992	>	int cre8
993		)
994		{
995		extern char progname, octname;
996		static char *mybuf = NULL;
997
998		#ifdef F_SETLKW
999	<	aflock(creat ? F_WRLCK : F_RDLCK);
999	>	aflock(cre8 ? F_WRLCK : F_RDLCK);
1000		#endif
1001		SET_FILE_BINARY(ambfp);
1002		if (mybuf == NULL)
1003		mybuf = (char *)bmalloc(BUFSIZ+8);
1004		setbuf(ambfp, mybuf);
1005	<	if (creat) { /* new file */
1005	>	if (cre8) { /* new file */
1006		newheader("RADIANCE", ambfp);
1007		fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ",
1008		progname, colval(ambval,RED),
#	Line 529 \| Line 1011 \| *initambfile( / initialize ambient file /*
1011		fprintf(ambfp, "-ad %d -as %d -ar %d ",
1012		ambdiv, ambssamp, ambres);
1013		if (octname != NULL)
1014	<	printargs(1, &octname, ambfp);
1015	<	else
534	<	fputc('\n', ambfp);
1014	>	fputs(octname, ambfp);
1015	>	fputc('\n', ambfp);
1016		fprintf(ambfp, "SOFTWARE= %s\n", VersionID);
1017		fputnow(ambfp);
1018		fputformat(AMBFMT, ambfp);
1019	<	putc('\n', ambfp);
1019	>	fputc('\n', ambfp);
1020		putambmagic(ambfp);
1021		} else if (checkheader(ambfp, AMBFMT, NULL) < 0 \|\| !hasambmagic(ambfp))
1022		error(USER, "bad ambient file");
#	Line 547 \| Line 1028 \| *avsave( / insert and save an ambient value /*
1028		AMBVAL *av
1029		)
1030		{
1031	<	avinsert(avstore(av));
1031	>	avstore(av);
1032		if (ambfp == NULL)
1033		return;
1034		if (writambval(av, ambfp) < 0)
#	Line 562 \| Line 1043 \| writerr:
1043
1044
1045		static AMBVAL *
1046	<	avstore( /* allocate memory and store aval */
1047	<	register AMBVAL *aval
1046	>	avstore( /* allocate memory and save aval */
1047	>	AMBVAL *aval
1048		)
1049		{
1050	<	register AMBVAL *av;
1050	>	AMBVAL *av;
1051		double d;
1052
1053		if ((av = newambval()) == NULL)
#	Line 580 \| Line 1061 \| *avstore( / allocate memory and store aval /*
1061		avsum += log(d);
1062		navsum++;
1063		}
1064	+	avinsert(av); /* insert in our cache tree */
1065		return(av);
1066		}
1067
#	Line 592 \| Line 1074 \| *static AMBTREE atfreelist = NULL; /* free ambient tr**
1074		static AMBTREE *
1075		newambtree(void) /* allocate 8 ambient tree structs */
1076		{
1077	<	register AMBTREE atp, upperlim;
1077	>	AMBTREE atp, upperlim;
1078
1079		if (atfreelist == NULL) { /* get more nodes */
1080		atfreelist = (AMBTREE )malloc(ATALLOCSZ8*sizeof(AMBTREE));
#	Line 606 \| Line 1088 \| *newambtree(void) / allocate 8 ambient tree structs**
1088		}
1089		atp = atfreelist;
1090		atfreelist = atp->kid;
1091	<	memset((char )atp, '\0', 8sizeof(AMBTREE));
1091	>	memset(atp, 0, 8*sizeof(AMBTREE));
1092		return(atp);
1093		}
1094
#	Line 622 \| Line 1104 \| *freeambtree( / free 8 ambient tree structs /*
1104
1105
1106		static void
625	–	avinsert( /* insert ambient value in our tree */
626	–	void *av
627	–	)
628	–	{
629	–	register AMBTREE *at;
630	–	register AMBVAL *ap;
631	–	AMBVAL avh;
632	–	FVECT ck0;
633	–	double s;
634	–	int branch;
635	–	register int i;
636	–
637	–	if (((AMBVAL*)av)->rad <= FTINY)
638	–	error(CONSISTENCY, "zero ambient radius in avinsert");
639	–	at = &atrunk;
640	–	VCOPY(ck0, thescene.cuorg);
641	–	s = thescene.cusize;
642	–	while (s(OCTSCALE/2) > ((AMBVAL)av)->rad*ambacc) {
643	–	if (at->kid == NULL)
644	–	if ((at->kid = newambtree()) == NULL)
645	–	error(SYSTEM, "out of memory in avinsert");
646	–	s *= 0.5;
647	–	branch = 0;
648	–	for (i = 0; i < 3; i++)
649	–	if (((AMBVAL*)av)->pos[i] > ck0[i] + s) {
650	–	ck0[i] += s;
651	–	branch \|= 1 << i;
652	–	}
653	–	at = at->kid + branch;
654	–	}
655	–	avh.next = at->alist; /* order by increasing level */
656	–	for (ap = &avh; ap->next != NULL; ap = ap->next)
657	–	if (ap->next->lvl >= ((AMBVAL*)av)->lvl)
658	–	break;
659	–	((AMBVAL*)av)->next = ap->next;
660	–	ap->next = (AMBVAL*)av;
661	–	at->alist = avh.next;
662	–	}
663	–
664	–
665	–	static void
1107		unloadatree( /* unload an ambient value tree */
1108	<	register AMBTREE *at,
1108	>	AMBTREE *at,
1109		unloadtf_t *f
1110		)
1111		{
1112	<	register AMBVAL *av;
1113	<	register int i;
1112	>	AMBVAL *av;
1113	>	int i;
1114		/* transfer values at this node */
1115		for (av = at->alist; av != NULL; av = at->alist) {
1116		at->alist = av->next;
1117	+	av->next = NULL;
1118		(*f)(av);
1119		}
1120		if (at->kid == NULL)
#	Line 694 \| Line 1136 \| *static int i_avlist; / index for lists /*
1136		static int alatcmp(const void av1, const void av2);
1137
1138		static void
1139	+	avfree(AMBVAL *av)
1140	+	{
1141	+	free(av);
1142	+	}
1143	+
1144	+	static void
1145		av2list(
1146	<	void *av
1146	>	AMBVAL *av
1147		)
1148		{
1149		#ifdef DEBUG
#	Line 703 \| Line 1151 \| av2list(
1151		error(CONSISTENCY, "too many ambient values in av2list1");
1152		#endif
1153		avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
1154	<	avlist1[i_avlist++].t = ((AMBVAL*)av)->latick;
1154	>	avlist1[i_avlist++].t = av->latick;
1155		}
1156
1157
#	Line 713 \| Line 1161 \| *alatcmp( / compare ambient values for MRA /*
1161		const void *av2
1162		)
1163		{
1164	<	register long lc = ((struct avl )av2)->t - ((struct avl )av1)->t;
1164	>	long lc = ((struct avl )av2)->t - ((struct avl )av1)->t;
1165		return(lc<0 ? -1 : lc>0 ? 1 : 0);
1166		}
1167
#	Line 730 \| Line 1178 \| *aposcmp( / compare ambient value positions /*
1178		const void *avp2
1179		)
1180		{
1181	<	register long diff = (char const )avp1 - (char * const *)avp2;
1181	>	long diff = (char const )avp1 - (char * const *)avp2;
1182		if (diff < 0)
1183		return(-1);
1184		return(diff > 0);
1185		}
1186
1187	<	#if 1
1187	>
1188		static int
1189		avlmemi( /* find list position from address */
1190		AMBVAL *avaddr
1191		)
1192		{
1193	<	register AMBVAL **avlpp;
1193	>	AMBVAL **avlpp;
1194
1195	<	avlpp = (AMBVAL *)bsearch((char )&avaddr, (char *)avlist2,
1195	>	avlpp = (AMBVAL **)bsearch(&avaddr, avlist2,
1196		nambvals, sizeof(AMBVAL *), aposcmp);
1197		if (avlpp == NULL)
1198		error(CONSISTENCY, "address not found in avlmemi");
1199		return(avlpp - avlist2);
1200		}
753	–	#else
754	–	#define avlmemi(avaddr) ((AMBVAL *)bsearch((char )&avaddr,(char *)avlist2, \
755	–	nambvals,sizeof(AMBVAL *),aposcmp) - avlist2)
756	–	#endif
1201
1202
1203		static void
#	Line 763 \| Line 1207 \| *sortambvals( / resort ambient values /*
1207		{
1208		AMBTREE oldatrunk;
1209		AMBVAL tav, tap, pnext;
1210	<	register int i, j;
1210	>	int i, j;
1211		/* see if it's time yet */
1212		if (!always && (ambclock++ < lastsort+sortintvl \|\|
1213		nambvals < SORT_THRESH))
#	Line 792 \| Line 1236 \| *sortambvals( / resort ambient values /*
1236		}
1237		if (avlist1 == NULL) { /* no time tracking -- rebuild tree? */
1238		if (avlist2 != NULL)
1239	<	free((void *)avlist2);
1239	>	free(avlist2);
1240		if (always) { /* rebuild without sorting */
1241		oldatrunk = atrunk;
1242		atrunk.alist = NULL;
#	Line 819 \| Line 1263 \| *sortambvals( / resort ambient values /*
1263		if (i_avlist < nambvals)
1264		error(CONSISTENCY, "missing ambient values in sortambvals");
1265		#endif
1266	<	qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp);
1267	<	qsort((char )avlist2, nambvals, sizeof(AMBVAL ), aposcmp);
1266	>	qsort(avlist1, nambvals, sizeof(struct avl), alatcmp);
1267	>	qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
1268		for (i = 0; i < nambvals; i++) {
1269		if (avlist1[i].p == NULL)
1270		continue;
#	Line 836 \| Line 1280 \| *sortambvals( / resort ambient values /*
1280		avinsert(avlist2[j]);
1281		avlist1[j].p = NULL;
1282		}
1283	<	free((void *)avlist1);
1284	<	free((void *)avlist2);
1283	>	free(avlist1);
1284	>	free(avlist2);
1285		/* compute new sort interval */
1286		sortintvl = ambclock - lastsort;
1287		if (sortintvl >= MAX_SORT_INTVL/2)
#	Line 863 \| Line 1307 \| *aflock( / lock/unlock ambient file /*
1307		{
1308		static struct flock fls; /* static so initialized to zeroes */
1309
1310	+	if (typ == fls.l_type) /* already called? */
1311	+	return;
1312		fls.l_type = typ;
1313		if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
1314		error(SYSTEM, "cannot (un)lock ambient file");
1315		}
1316
1317
1318	<	extern int
1318	>	int
1319		ambsync(void) /* synchronize ambient file */
1320		{
1321		long flen;
1322		AMBVAL avs;
1323	<	register int n;
1323	>	int n;
1324
1325	<	if (lastpos < 0) /* initializing (locked in initambfile) */
1326	<	goto syncend;
1325	>	if (ambfp == NULL) /* no ambient file? */
1326	>	return(0);
1327		/* gain appropriate access */
1328		aflock(nunflshed ? F_WRLCK : F_RDLCK);
1329		/* see if file has grown */
1330		if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0)
1331		goto seekerr;
1332	<	if ( (n = flen - lastpos) ) { /* file has grown */
1333	<	if (ambinp == NULL) { /* use duplicate filedes */
1334	<	ambinp = fdopen(dup(fileno(ambfp)), "r");
1332	>	if ((n = flen - lastpos) > 0) { /* file has grown */
1333	>	if (ambinp == NULL) { /* get new file pointer */
1334	>	ambinp = fopen(ambfile, "rb");
1335		if (ambinp == NULL)
1336	<	error(SYSTEM, "fdopen failed in ambsync");
1336	>	error(SYSTEM, "fopen failed in ambsync");
1337		}
1338	<	if (fseek(ambinp, lastpos, 0) < 0)
1338	>	if (fseek(ambinp, lastpos, SEEK_SET) < 0)
1339		goto seekerr;
1340		while (n >= AMBVALSIZ) { /* load contributed values */
1341		if (!readambval(&avs, ambinp)) {
#	Line 899 \| Line 1345 \| *ambsync(void) / synchronize ambient file /*
1345		error(WARNING, errmsg);
1346		break;
1347		}
1348	<	avinsert(avstore(&avs));
1348	>	avstore(&avs);
1349		n -= AMBVALSIZ;
1350		}
1351	<	/*** seek always as safety measure
1352	<	if (n) **/ / alignment */
1353	<	if (lseek(fileno(ambfp), (off_t)(flen-n), SEEK_SET) < 0)
908	<	goto seekerr;
1351	>	lastpos = flen - n; /* check alignment */
1352	>	if (n && lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0)
1353	>	goto seekerr;
1354		}
910	–	#ifdef DEBUG
911	–	if (ambfp->_ptr - ambfp->_base != nunflshed*AMBVALSIZ) {
912	–	sprintf(errmsg, "ambient file buffer at %d rather than %d",
913	–	ambfp->_ptr - ambfp->_base,
914	–	nunflshed*AMBVALSIZ);
915	–	error(CONSISTENCY, errmsg);
916	–	}
917	–	#endif
918	–	syncend:
1355		n = fflush(ambfp); /* calls write() at last */
1356	<	if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0)
921	<	goto seekerr;
1356	>	lastpos += (long)nunflshed*AMBVALSIZ;
1357		aflock(F_UNLCK); /* release file */
1358		nunflshed = 0;
1359		return(n);
1360		seekerr:
1361		error(SYSTEM, "seek failed in ambsync");
1362	<	return -1; /* pro forma return */
1362	>	return(EOF); /* pro forma return */
1363		}
1364
1365	<	#else
1365	>	#else /* ! F_SETLKW */
1366
1367	<	extern int
1367	>	int
1368		ambsync(void) /* flush ambient file */
1369		{
1370	+	if (ambfp == NULL)
1371	+	return(0);
1372		nunflshed = 0;
1373		return(fflush(ambfp));
1374		}
1375
1376	<	#endif
1376	>	#endif /* ! F_SETLKW */

Diff Legend

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

Comparing ray/src/rt/ambient.c (file contents): Revision 2.63 by greg, Thu Sep 13 20:13:16 2007 UTC vs. Revision 2.105 by greg, Tue Jan 9 05:01:15 2018 UTC

Diff Legend

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.63 by greg, Thu Sep 13 20:13:16 2007 UTC vs.
Revision 2.105 by greg, Tue Jan 9 05:01:15 2018 UTC