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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.66 by greg, Sat Sep 15 05:16:10 2007 UTC vs.
Revision 2.94 by greg, Tue Feb 24 19:39:26 2015 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 17 \| Line 15 \| static const char RCSid[] = "$Id$";
15		#include "resolu.h"
16		#include "ambient.h"
17		#include "random.h"
18	+	#include "pmapamb.h"
19
20		#ifndef OCTSCALE
21		#define OCTSCALE 1.0 /* ceil((valid rad.)/(cube size)) */
#	Line 25 \| Line 24 \| static const char RCSid[] = "$Id$";
24		extern char shm_boundary; / memory sharing boundary */
25
26		#ifndef MAXASET
27	<	#define MAXASET 2047 /* maximum number of elements in ambient set */
27	>	#define MAXASET 4095 /* maximum number of elements in ambient set */
28		#endif
29		OBJECT ambset[MAXASET+1]={0}; /* ambient include/exclude set */
30
#	Line 39 \| Line 38 \| *static int nunflshed = 0; / number of unflushed ambi**
38
39		#ifndef SORT_THRESH
40		#ifdef SMLMEM
41	<	#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL))
41	>	#define SORT_THRESH ((16L<<20)/sizeof(AMBVAL))
42		#else
43	<	#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL))
43	>	#define SORT_THRESH ((64L<<20)/sizeof(AMBVAL))
44		#endif
45		#endif
46		#ifndef SORT_INTVL
#	Line 51 \| Line 50 \| *static int nunflshed = 0; / number of unflushed ambi**
50		#define MAX_SORT_INTVL (SORT_INTVL<<6)
51		#endif
52
53	+
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 */
#	Line 84 \| Line 84 \| *static AMBVAL avstore(AMBVAL aval);*
84		static AMBTREE *newambtree(void);
85		static void freeambtree(AMBTREE *atp);
86
87	<	typedef void unloadtf_t(void *);
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);
#	Line 98 \| Line 99 \| static void aflock(int typ);
99		#endif
100
101
102	<	extern void
102	>	void
103		setambres( /* set ambient resolution */
104		int ar
105		)
#	Line 107 \| Line 108 \| *setambres( / set ambient resolution /*
108		/* set min & max radii */
109		if (ar <= 0) {
110		minarad = 0;
111	<	maxarad = thescene.cusize / 2.0;
111	>	maxarad = thescene.cusize*0.2;
112		} else {
113		minarad = thescene.cusize / ar;
114	<	maxarad = 64 * minarad; /* heuristic */
115	<	if (maxarad > thescene.cusize / 2.0)
116	<	maxarad = thescene.cusize / 2.0;
114	>	maxarad = 64.0 * minarad; /* heuristic */
115	>	if (maxarad > thescene.cusize*0.2)
116	>	maxarad = thescene.cusize*0.2;
117		}
118		if (minarad <= FTINY)
119	<	minarad = 10*FTINY;
119	>	minarad = 10.0*FTINY;
120		if (maxarad <= minarad)
121	<	maxarad = 64 * minarad;
121	>	maxarad = 64.0 * minarad;
122		}
123
124
125	<	extern void
125	>	void
126		setambacc( /* set ambient accuracy */
127		double newa
128		)
129		{
130	<	double ambdiff;
131	<
132	<	if (newa < 0.0)
133	<	newa = 0.0;
134	<	ambdiff = fabs(newa - ambacc);
135	<	if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0)
136	<	sortambvals(1); /* rebuild tree */
130	>	static double olda; /* remember previous setting here */
131	>
132	>	newa *= (newa > 0);
133	>	if (fabs(newa - olda) >= .05*(newa + olda)) {
134	>	ambacc = newa;
135	>	if (nambvals > 0)
136	>	sortambvals(1); /* rebuild tree */
137	>	}
138		}
139
140
141	<	extern void
141	>	void
142		setambient(void) /* initialize calculation */
143		{
144		int readonly = 0;
#	Line 162 \| Line 164 \| *setambient(void) / initialize calculation /*
164		initambfile(0); /* file exists */
165		lastpos = ftell(ambfp);
166		while (readambval(&amb, ambfp))
167	<	avinsert(avstore(&amb));
167	>	avstore(&amb);
168		nambshare = nambvals; /* share loaded values */
169		if (readonly) {
170		sprintf(errmsg,
#	Line 188 \| Line 190 \| *setambient(void) / initialize calculation /*
190		}
191		} else if ((ambfp = fopen(ambfile, "w+")) != NULL) {
192		initambfile(1); /* else create new file */
193	+	fflush(ambfp);
194		lastpos = ftell(ambfp);
195		} else {
196		sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
197		error(SYSTEM, errmsg);
198		}
199	<	ambsync(); /* load previous values */
199	>	#ifdef getc_unlocked
200	>	flockfile(ambfp); /* application-level lock */
201	>	#endif
202	>	#ifdef F_SETLKW
203	>	aflock(F_UNLCK); /* release file */
204	>	#endif
205		}
206
207
208	<	extern void
208	>	void
209		ambdone(void) /* close ambient file and free memory */
210		{
211		if (ambfp != NULL) { /* close ambient file */
#	Line 211 \| Line 219 \| *ambdone(void) / close ambient file and free memory**
219		lastpos = -1;
220		}
221		/* free ambient tree */
222	<	unloadatree(&atrunk, free);
222	>	unloadatree(&atrunk, &avfree);
223		/* reset state variables */
224		avsum = 0.;
225		navsum = 0;
#	Line 223 \| Line 231 \| *ambdone(void) / close ambient file and free memory**
231		}
232
233
234	<	extern void
234	>	void
235		ambnotify( /* record new modifier */
236		OBJECT obj
237		)
238		{
239		static int hitlimit = 0;
240	<	register OBJREC *o;
241	<	register char **amblp;
240	>	OBJREC *o;
241	>	char **amblp;
242
243		if (obj == OVOID) { /* starting over */
244		ambset[0] = 0;
#	Line 252 \| Line 260 \| *ambnotify( / record new modifier /*
260		}
261		}
262
263	+	/********** THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD *************/
264
265	<	extern void
265	>	#ifndef OLDAMB
266	>
267	>	#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr)))
268	>
269	>	static int plugaleak(RAY r, AMBVAL ap, FVECT anorm, double ang);
270	>	static double sumambient(COLOR acol, RAY *r, FVECT rn, int al,
271	>	AMBTREE *at, FVECT c0, double s);
272	>	static int makeambient(COLOR acol, RAY *r, FVECT rn, int al);
273	>	static int extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv,
274	>	FVECT uvw[3]);
275	>
276	>	void
277		multambient( /* compute ambient component & multiply by coef. */
278		COLOR aval,
279	<	register RAY *r,
279	>	RAY *r,
280		FVECT nrm
281		)
282		{
283		static int rdepth = 0; /* ambient recursion */
284	<	COLOR acol;
284	>	COLOR acol, caustic;
285	>	int ok;
286		double d, l;
287
288	+	/* PMAP: Factor in ambient from photon map, if enabled and ray is
289	+	* ambient. Return as all ambient components accounted for, else
290	+	* continue. */
291	+	if (ambPmap(aval, r, rdepth))
292	+	return;
293	+
294	+	/* PMAP: Factor in specular-diffuse ambient (caustics) from photon
295	+	* map, if enabled and ray is primary, else caustic is zero. Continue
296	+	* with RADIANCE ambient calculation */
297	+	copycolor(caustic, aval);
298	+	ambPmapCaustic(caustic, r, rdepth);
299	+
300		if (ambdiv <= 0) /* no ambient calculation */
301		goto dumbamb;
302		/* check number of bounces */
#	Line 277 \| Line 310 \| *multambient( / compute ambient component & multiply**
310		if (ambacc <= FTINY) { /* no ambient storage */
311		copycolor(acol, aval);
312		rdepth++;
313	+	ok = doambient(acol, r, r->rweight,
314	+	NULL, NULL, NULL, NULL, NULL);
315	+	rdepth--;
316	+	if (!ok)
317	+	goto dumbamb;
318	+	copycolor(aval, acol);
319	+
320	+	/* PMAP: add in caustic */
321	+	addcolor(aval, caustic);
322	+	return;
323	+	}
324	+
325	+	if (tracktime) /* sort to minimize thrashing */
326	+	sortambvals(0);
327	+	/* interpolate ambient value */
328	+	setcolor(acol, 0.0, 0.0, 0.0);
329	+	d = sumambient(acol, r, nrm, rdepth,
330	+	&atrunk, thescene.cuorg, thescene.cusize);
331	+
332	+	if (d > FTINY) {
333	+	d = 1.0/d;
334	+	scalecolor(acol, d);
335	+	multcolor(aval, acol);
336	+
337	+	/* PMAP: add in caustic */
338	+	addcolor(aval, caustic);
339	+	return;
340	+	}
341	+
342	+	rdepth++; /* need to cache new value */
343	+	ok = makeambient(acol, r, nrm, rdepth-1);
344	+	rdepth--;
345	+
346	+	if (ok) {
347	+	multcolor(aval, acol); /* computed new value */
348	+
349	+	/* PMAP: add in caustic */
350	+	addcolor(aval, caustic);
351	+	return;
352	+	}
353	+
354	+	dumbamb: /* return global value */
355	+	if ((ambvwt <= 0) \| (navsum == 0)) {
356	+	multcolor(aval, ambval);
357	+
358	+	/* PMAP: add in caustic */
359	+	addcolor(aval, caustic);
360	+	return;
361	+	}
362	+
363	+	l = bright(ambval); /* average in computations */
364	+	if (l > FTINY) {
365	+	d = (log(l)*(double)ambvwt + avsum) /
366	+	(double)(ambvwt + navsum);
367	+	d = exp(d) / l;
368	+	scalecolor(aval, d);
369	+	multcolor(aval, ambval); /* apply color of ambval */
370	+	} else {
371	+	d = exp( avsum / (double)navsum );
372	+	scalecolor(aval, d); /* neutral color */
373	+	}
374	+	}
375	+
376	+
377	+	/* Plug a potential leak where ambient cache value is occluded */
378	+	static int
379	+	plugaleak(RAY r, AMBVAL ap, FVECT anorm, double ang)
380	+	{
381	+	const double cost70sq = 0.1169778; /* cos(70deg)^2 */
382	+	RAY rtst;
383	+	FVECT vdif;
384	+	double normdot, ndotd, nadotd;
385	+	double a, b, c, t[2];
386	+
387	+	ang += 2.PI(ang < 0); /* check direction flags */
388	+	if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) )
389	+	return(0);
390	+	/*
391	+	* Generate test ray, targeting 20 degrees above sample point plane
392	+	* along surface normal from cache position. This should be high
393	+	* enough to miss local geometry we don't really care about.
394	+	*/
395	+	VSUB(vdif, ap->pos, r->rop);
396	+	normdot = DOT(anorm, r->ron);
397	+	ndotd = DOT(vdif, r->ron);
398	+	nadotd = DOT(vdif, anorm);
399	+	a = normdot*normdot - cost70sq;
400	+	b = 2.0(normdotndotd - nadotd*cost70sq);
401	+	c = ndotdndotd - DOT(vdif,vdif)cost70sq;
402	+	if (quadratic(t, a, b, c) != 2)
403	+	return(1); /* should rarely happen */
404	+	if (t[1] <= FTINY)
405	+	return(0); /* should fail behind test */
406	+	rayorigin(&rtst, SHADOW, r, NULL);
407	+	VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */
408	+	rtst.rmax = normalize(rtst.rdir); /* short ray test */
409	+	while (localhit(&rtst, &thescene)) { /* check for occluder */
410	+	if (rtst.ro->omod != OVOID &&
411	+	(rtst.clipset == NULL \|\|
412	+	!inset(rtst.clipset, rtst.ro->omod)))
413	+	return(1); /* plug light leak */
414	+	VCOPY(rtst.rorg, rtst.rop); /* skip invisible surface */
415	+	rtst.rmax -= rtst.rot;
416	+	rayclear(&rtst);
417	+	}
418	+	return(0); /* seems we're OK */
419	+	}
420	+
421	+
422	+	static double
423	+	sumambient( /* get interpolated ambient value */
424	+	COLOR acol,
425	+	RAY *r,
426	+	FVECT rn,
427	+	int al,
428	+	AMBTREE *at,
429	+	FVECT c0,
430	+	double s
431	+	)
432	+	{ /* initial limit is 10 degrees plus ambacc radians */
433	+	const double minangle = 10.0 * PI/180.;
434	+	double maxangle = minangle + ambacc;
435	+	double wsum = 0.0;
436	+	FVECT ck0;
437	+	int i, j;
438	+	AMBVAL *av;
439	+
440	+	if (at->kid != NULL) { /* sum children first */
441	+	s *= 0.5;
442	+	for (i = 0; i < 8; i++) {
443	+	for (j = 0; j < 3; j++) {
444	+	ck0[j] = c0[j];
445	+	if (1<<j & i)
446	+	ck0[j] += s;
447	+	if (r->rop[j] < ck0[j] - OCTSCALE*s)
448	+	break;
449	+	if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s)
450	+	break;
451	+	}
452	+	if (j == 3)
453	+	wsum += sumambient(acol, r, rn, al,
454	+	at->kid+i, ck0, s);
455	+	}
456	+	/* good enough? */
457	+	if (wsum >= 0.05 && s > minarad*10.0)
458	+	return(wsum);
459	+	}
460	+	/* adjust maximum angle */
461	+	if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6))
462	+	maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.;
463	+	/* sum this node */
464	+	for (av = at->alist; av != NULL; av = av->next) {
465	+	double u, v, d, delta_r2, delta_t2;
466	+	COLOR ct;
467	+	FVECT uvw[3];
468	+	/* record access */
469	+	if (tracktime)
470	+	av->latick = ambclock;
471	+	/*
472	+	* Ambient level test
473	+	*/
474	+	if (av->lvl > al \|\| /* list sorted, so this works */
475	+	(av->lvl == al) & (av->weight < 0.9*r->rweight))
476	+	break;
477	+	/*
478	+	* Direction test using unperturbed normal
479	+	*/
480	+	decodedir(uvw[2], av->ndir);
481	+	d = DOT(uvw[2], r->ron);
482	+	if (d <= 0.0) /* >= 90 degrees */
483	+	continue;
484	+	delta_r2 = 2.0 - 2.0d; / approx. radians^2 */
485	+	if (delta_r2 >= maxangle*maxangle)
486	+	continue;
487	+	/*
488	+	* Modified ray behind test
489	+	*/
490	+	VSUB(ck0, r->rop, av->pos);
491	+	d = DOT(ck0, uvw[2]);
492	+	if (d < -minarad*ambacc-.001)
493	+	continue;
494	+	d /= av->rad[0];
495	+	delta_t2 = d*d;
496	+	if (delta_t2 >= ambacc*ambacc)
497	+	continue;
498	+	/*
499	+	* Elliptical radii test based on Hessian
500	+	*/
501	+	decodedir(uvw[0], av->udir);
502	+	VCROSS(uvw[1], uvw[2], uvw[0]);
503	+	d = (u = DOT(ck0, uvw[0])) / av->rad[0];
504	+	delta_t2 += d*d;
505	+	d = (v = DOT(ck0, uvw[1])) / av->rad[1];
506	+	delta_t2 += d*d;
507	+	if (delta_t2 >= ambacc*ambacc)
508	+	continue;
509	+	/*
510	+	* Test for potential light leak
511	+	*/
512	+	if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u)))
513	+	continue;
514	+	/*
515	+	* Extrapolate value and compute final weight (hat function)
516	+	*/
517	+	if (!extambient(ct, av, r->rop, rn, uvw))
518	+	continue;
519	+	d = tfunc(maxangle, sqrt(delta_r2), 0.0) *
520	+	tfunc(ambacc, sqrt(delta_t2), 0.0);
521	+	scalecolor(ct, d);
522	+	addcolor(acol, ct);
523	+	wsum += d;
524	+	}
525	+	return(wsum);
526	+	}
527	+
528	+
529	+	static int
530	+	makeambient( /* make a new ambient value for storage */
531	+	COLOR acol,
532	+	RAY *r,
533	+	FVECT rn,
534	+	int al
535	+	)
536	+	{
537	+	AMBVAL amb;
538	+	FVECT uvw[3];
539	+	int i;
540	+
541	+	amb.weight = 1.0; /* compute weight */
542	+	for (i = al; i-- > 0; )
543	+	amb.weight *= AVGREFL;
544	+	if (r->rweight < 0.1amb.weight) / heuristic override */
545	+	amb.weight = 1.25*r->rweight;
546	+	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
547	+	/* compute ambient */
548	+	i = doambient(acol, r, amb.weight,
549	+	uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral);
550	+	scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */
551	+	if (i <= 0 \|\| amb.rad[0] <= FTINY) /* no Hessian or zero radius */
552	+	return(i);
553	+	/* store value */
554	+	VCOPY(amb.pos, r->rop);
555	+	amb.ndir = encodedir(r->ron);
556	+	amb.udir = encodedir(uvw[0]);
557	+	amb.lvl = al;
558	+	copycolor(amb.val, acol);
559	+	/* insert into tree */
560	+	avsave(&amb); /* and save to file */
561	+	if (rn != r->ron) { /* texture */
562	+	VCOPY(uvw[2], r->ron);
563	+	extambient(acol, &amb, r->rop, rn, uvw);
564	+	}
565	+	return(1);
566	+	}
567	+
568	+
569	+	static int
570	+	extambient( /* extrapolate value at pv, nv */
571	+	COLOR cr,
572	+	AMBVAL *ap,
573	+	FVECT pv,
574	+	FVECT nv,
575	+	FVECT uvw[3]
576	+	)
577	+	{
578	+	const double min_d = 0.05;
579	+	static FVECT my_uvw[3];
580	+	FVECT v1;
581	+	int i;
582	+	double d = 1.0; /* zeroeth order */
583	+
584	+	if (uvw == NULL) { /* need local coordinates? */
585	+	decodedir(my_uvw[2], ap->ndir);
586	+	decodedir(my_uvw[0], ap->udir);
587	+	VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]);
588	+	uvw = my_uvw;
589	+	}
590	+	for (i = 3; i--; ) /* gradient due to translation */
591	+	d += (pv[i] - ap->pos[i]) *
592	+	(ap->gpos[0]uvw[0][i] + ap->gpos[1]uvw[1][i]);
593	+
594	+	VCROSS(v1, uvw[2], nv); /* gradient due to rotation */
595	+	for (i = 3; i--; )
596	+	d += v1[i] * (ap->gdir[0]uvw[0][i] + ap->gdir[1]uvw[1][i]);
597	+
598	+	if (d < min_d) /* should not use if we can avoid it */
599	+	d = min_d;
600	+	copycolor(cr, ap->val);
601	+	scalecolor(cr, d);
602	+	return(d > min_d);
603	+	}
604	+
605	+
606	+	static void
607	+	avinsert( /* insert ambient value in our tree */
608	+	AMBVAL *av
609	+	)
610	+	{
611	+	AMBTREE *at;
612	+	AMBVAL *ap;
613	+	AMBVAL avh;
614	+	FVECT ck0;
615	+	double s;
616	+	int branch;
617	+	int i;
618	+
619	+	if (av->rad[0] <= FTINY)
620	+	error(CONSISTENCY, "zero ambient radius in avinsert");
621	+	at = &atrunk;
622	+	VCOPY(ck0, thescene.cuorg);
623	+	s = thescene.cusize;
624	+	while (s(OCTSCALE/2) > av->rad[1]ambacc) {
625	+	if (at->kid == NULL)
626	+	if ((at->kid = newambtree()) == NULL)
627	+	error(SYSTEM, "out of memory in avinsert");
628	+	s *= 0.5;
629	+	branch = 0;
630	+	for (i = 0; i < 3; i++)
631	+	if (av->pos[i] > ck0[i] + s) {
632	+	ck0[i] += s;
633	+	branch \|= 1 << i;
634	+	}
635	+	at = at->kid + branch;
636	+	}
637	+	avh.next = at->alist; /* order by increasing level */
638	+	for (ap = &avh; ap->next != NULL; ap = ap->next)
639	+	if ( ap->next->lvl > av->lvl \|\|
640	+	(ap->next->lvl == av->lvl) &
641	+	(ap->next->weight <= av->weight) )
642	+	break;
643	+	av->next = ap->next;
644	+	ap->next = (AMBVAL*)av;
645	+	at->alist = avh.next;
646	+	}
647	+
648	+
649	+	#else /* ! NEWAMB */
650	+
651	+	static double sumambient(COLOR acol, RAY *r, FVECT rn, int al,
652	+	AMBTREE *at, FVECT c0, double s);
653	+	static double makeambient(COLOR acol, RAY *r, FVECT rn, int al);
654	+	static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
655	+
656	+
657	+	void
658	+	multambient( /* compute ambient component & multiply by coef. */
659	+	COLOR aval,
660	+	RAY *r,
661	+	FVECT nrm
662	+	)
663	+	{
664	+	static int rdepth = 0; /* ambient recursion */
665	+	COLOR acol, caustic;
666	+	double d, l;
667	+
668	+	/* PMAP: Factor in ambient from global photon map (if enabled) and return
669	+	* as all ambient components accounted for */
670	+	if (ambGlobalPmap(aval, r, rdepth))
671	+	return;
672	+
673	+	/* PMAP: Otherwise factor in ambient from caustic photon map
674	+	* (ambCausticPmap() returns zero if caustic photons disabled) and
675	+	* continue with RADIANCE ambient calculation */
676	+	copycolor(caustic, aval);
677	+	ambCausticPmap(caustic, r, rdepth);
678	+
679	+	if (ambdiv <= 0) /* no ambient calculation */
680	+	goto dumbamb;
681	+	/* check number of bounces */
682	+	if (rdepth >= ambounce)
683	+	goto dumbamb;
684	+	/* check ambient list */
685	+	if (ambincl != -1 && r->ro != NULL &&
686	+	ambincl != inset(ambset, r->ro->omod))
687	+	goto dumbamb;
688	+
689	+	if (ambacc <= FTINY) { /* no ambient storage */
690	+	copycolor(acol, aval);
691	+	rdepth++;
692		d = doambient(acol, r, r->rweight, NULL, NULL);
693		rdepth--;
694		if (d <= FTINY)
695		goto dumbamb;
696	<	copycolor(aval, acol);
696	>	copycolor(aval, acol);
697	>
698	>	/* PMAP: add in caustic */
699	>	addcolor(aval, caustic);
700		return;
701		}
702
#	Line 291 \| Line 706 \| *multambient( / compute ambient component & multiply**
706		setcolor(acol, 0.0, 0.0, 0.0);
707		d = sumambient(acol, r, nrm, rdepth,
708		&atrunk, thescene.cuorg, thescene.cusize);
709	+
710		if (d > FTINY) {
711		d = 1.0/d;
712		scalecolor(acol, d);
713		multcolor(aval, acol);
714	+
715	+	/* PMAP: add in caustic */
716	+	addcolor(aval, caustic);
717		return;
718		}
719	+
720		rdepth++; /* need to cache new value */
721		d = makeambient(acol, r, nrm, rdepth-1);
722		rdepth--;
723	+
724		if (d > FTINY) {
725		multcolor(aval, acol); /* got new value */
726	+
727	+	/* PMAP: add in caustic */
728	+	addcolor(aval, caustic);
729		return;
730		}
731	+
732		dumbamb: /* return global value */
733		if ((ambvwt <= 0) \| (navsum == 0)) {
734		multcolor(aval, ambval);
735	+
736	+	/* PMAP: add in caustic */
737	+	addcolor(aval, caustic);
738		return;
739		}
740	+
741		l = bright(ambval); /* average in computations */
742		if (l > FTINY) {
743		d = (log(l)*(double)ambvwt + avsum) /
#	Line 323 \| Line 752 \| *dumbamb: / return global value /*
752		}
753
754
755	<	extern double
755	>	static double
756		sumambient( /* get interpolated ambient value */
757		COLOR acol,
758	<	register RAY *r,
758	>	RAY *r,
759		FVECT rn,
760		int al,
761		AMBTREE *at,
#	Line 338 \| Line 767 \| *sumambient( / get interpolated ambient value /*
767		COLOR ct;
768		FVECT ck0;
769		int i;
770	<	register int j;
771	<	register AMBVAL *av;
770	>	int j;
771	>	AMBVAL *av;
772
773		wsum = 0.0;
774		/* do this node */
#	Line 350 \| Line 779 \| *sumambient( / get interpolated ambient value /*
779		/*
780		* Ambient level test.
781		*/
782	<	if (av->lvl > al) /* list sorted, so this works */
782	>	if (av->lvl > al \|\| /* list sorted, so this works */
783	>	(av->lvl == al) & (av->weight < 0.9*r->rweight))
784		break;
355	–	if (av->weight < 0.9*r->rweight)
356	–	continue;
785		/*
786		* Ambient radius test.
787		*/
788	<	d = av->pos[0] - r->rop[0];
789	<	e1 = d * d;
362	<	d = av->pos[1] - r->rop[1];
363	<	e1 += d * d;
364	<	d = av->pos[2] - r->rop[2];
365	<	e1 += d * d;
366	<	e1 /= av->rad * av->rad;
788	>	VSUB(ck0, av->pos, r->rop);
789	>	e1 = DOT(ck0, ck0) / (av->rad * av->rad);
790		if (e1 > ambaccambacc1.21)
791		continue;
792		/*
#	Line 380 \| Line 803 \| *sumambient( / get interpolated ambient value /*
803		}
804		}
805		e2 = (1.0 - d) * r->rweight;
806	<	if (e2 < 0.0) e2 = 0.0;
807	<	if (e1 + e2 > ambaccambacc1.21)
806	>	if (e2 < 0.0)
807	>	e2 = 0.0;
808	>	else if (e1 + e2 > ambaccambacc1.21)
809		continue;
810		/*
811		* Ray behind test.
#	Line 438 \| Line 862 \| *sumambient( / get interpolated ambient value /*
862		}
863
864
865	<	extern double
865	>	static double
866		makeambient( /* make a new ambient value for storage */
867		COLOR acol,
868		RAY *r,
#	Line 478 \| Line 902 \| *makeambient( / make a new ambient value for storage**
902		}
903
904
905	<	extern void
905	>	static void
906		extambient( /* extrapolate value at pv, nv */
907		COLOR cr,
908	<	register AMBVAL *ap,
908	>	AMBVAL *ap,
909		FVECT pv,
910		FVECT nv
911		)
912		{
913		FVECT v1;
914	<	register int i;
914	>	int i;
915		double d;
916
917		d = 1.0; /* zeroeth order */
#	Line 507 \| Line 931 \| *extambient( / extrapolate value at pv, nv /*
931
932
933		static void
934	+	avinsert( /* insert ambient value in our tree */
935	+	AMBVAL *av
936	+	)
937	+	{
938	+	AMBTREE *at;
939	+	AMBVAL *ap;
940	+	AMBVAL avh;
941	+	FVECT ck0;
942	+	double s;
943	+	int branch;
944	+	int i;
945	+
946	+	if (av->rad <= FTINY)
947	+	error(CONSISTENCY, "zero ambient radius in avinsert");
948	+	at = &atrunk;
949	+	VCOPY(ck0, thescene.cuorg);
950	+	s = thescene.cusize;
951	+	while (s(OCTSCALE/2) > av->radambacc) {
952	+	if (at->kid == NULL)
953	+	if ((at->kid = newambtree()) == NULL)
954	+	error(SYSTEM, "out of memory in avinsert");
955	+	s *= 0.5;
956	+	branch = 0;
957	+	for (i = 0; i < 3; i++)
958	+	if (av->pos[i] > ck0[i] + s) {
959	+	ck0[i] += s;
960	+	branch \|= 1 << i;
961	+	}
962	+	at = at->kid + branch;
963	+	}
964	+	avh.next = at->alist; /* order by increasing level */
965	+	for (ap = &avh; ap->next != NULL; ap = ap->next)
966	+	if ( ap->next->lvl > av->lvl \|\|
967	+	(ap->next->lvl == av->lvl) &
968	+	(ap->next->weight <= av->weight) )
969	+	break;
970	+	av->next = ap->next;
971	+	ap->next = (AMBVAL*)av;
972	+	at->alist = avh.next;
973	+	}
974	+
975	+	#endif /* ! NEWAMB */
976	+
977	+	/*********** FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS *************/
978	+
979	+	static void
980		initambfile( /* initialize ambient file */
981	<	int creat
981	>	int cre8
982		)
983		{
984		extern char progname, octname;
985		static char *mybuf = NULL;
986
987		#ifdef F_SETLKW
988	<	aflock(creat ? F_WRLCK : F_RDLCK);
988	>	aflock(cre8 ? F_WRLCK : F_RDLCK);
989		#endif
990		SET_FILE_BINARY(ambfp);
991		if (mybuf == NULL)
992		mybuf = (char *)bmalloc(BUFSIZ+8);
993		setbuf(ambfp, mybuf);
994	<	if (creat) { /* new file */
994	>	if (cre8) { /* new file */
995		newheader("RADIANCE", ambfp);
996		fprintf(ambfp, "%s -av %g %g %g -aw %d -ab %d -aa %g ",
997		progname, colval(ambval,RED),
#	Line 530 \| Line 1000 \| *initambfile( / initialize ambient file /*
1000		fprintf(ambfp, "-ad %d -as %d -ar %d ",
1001		ambdiv, ambssamp, ambres);
1002		if (octname != NULL)
1003	<	printargs(1, &octname, ambfp);
1004	<	else
535	<	fputc('\n', ambfp);
1003	>	fputs(octname, ambfp);
1004	>	fputc('\n', ambfp);
1005		fprintf(ambfp, "SOFTWARE= %s\n", VersionID);
1006		fputnow(ambfp);
1007		fputformat(AMBFMT, ambfp);
1008	<	putc('\n', ambfp);
1008	>	fputc('\n', ambfp);
1009		putambmagic(ambfp);
1010		} else if (checkheader(ambfp, AMBFMT, NULL) < 0 \|\| !hasambmagic(ambfp))
1011		error(USER, "bad ambient file");
#	Line 548 \| Line 1017 \| *avsave( / insert and save an ambient value /*
1017		AMBVAL *av
1018		)
1019		{
1020	<	avinsert(avstore(av));
1020	>	avstore(av);
1021		if (ambfp == NULL)
1022		return;
1023		if (writambval(av, ambfp) < 0)
#	Line 563 \| Line 1032 \| writerr:
1032
1033
1034		static AMBVAL *
1035	<	avstore( /* allocate memory and store aval */
1036	<	register AMBVAL *aval
1035	>	avstore( /* allocate memory and save aval */
1036	>	AMBVAL *aval
1037		)
1038		{
1039	<	register AMBVAL *av;
1039	>	AMBVAL *av;
1040		double d;
1041
1042		if ((av = newambval()) == NULL)
#	Line 581 \| Line 1050 \| *avstore( / allocate memory and store aval /*
1050		avsum += log(d);
1051		navsum++;
1052		}
1053	+	avinsert(av); /* insert in our cache tree */
1054		return(av);
1055		}
1056
#	Line 593 \| Line 1063 \| *static AMBTREE atfreelist = NULL; /* free ambient tr**
1063		static AMBTREE *
1064		newambtree(void) /* allocate 8 ambient tree structs */
1065		{
1066	<	register AMBTREE atp, upperlim;
1066	>	AMBTREE atp, upperlim;
1067
1068		if (atfreelist == NULL) { /* get more nodes */
1069		atfreelist = (AMBTREE )malloc(ATALLOCSZ8*sizeof(AMBTREE));
#	Line 623 \| Line 1093 \| *freeambtree( / free 8 ambient tree structs /*
1093
1094
1095		static void
626	–	avinsert( /* insert ambient value in our tree */
627	–	void *av
628	–	)
629	–	{
630	–	register AMBTREE *at;
631	–	register AMBVAL *ap;
632	–	AMBVAL avh;
633	–	FVECT ck0;
634	–	double s;
635	–	int branch;
636	–	register int i;
637	–
638	–	if (((AMBVAL*)av)->rad <= FTINY)
639	–	error(CONSISTENCY, "zero ambient radius in avinsert");
640	–	at = &atrunk;
641	–	VCOPY(ck0, thescene.cuorg);
642	–	s = thescene.cusize;
643	–	while (s(OCTSCALE/2) > ((AMBVAL)av)->rad*ambacc) {
644	–	if (at->kid == NULL)
645	–	if ((at->kid = newambtree()) == NULL)
646	–	error(SYSTEM, "out of memory in avinsert");
647	–	s *= 0.5;
648	–	branch = 0;
649	–	for (i = 0; i < 3; i++)
650	–	if (((AMBVAL*)av)->pos[i] > ck0[i] + s) {
651	–	ck0[i] += s;
652	–	branch \|= 1 << i;
653	–	}
654	–	at = at->kid + branch;
655	–	}
656	–	avh.next = at->alist; /* order by increasing level */
657	–	for (ap = &avh; ap->next != NULL; ap = ap->next)
658	–	if (ap->next->lvl >= ((AMBVAL*)av)->lvl)
659	–	break;
660	–	((AMBVAL*)av)->next = ap->next;
661	–	ap->next = (AMBVAL*)av;
662	–	at->alist = avh.next;
663	–	}
664	–
665	–
666	–	static void
1096		unloadatree( /* unload an ambient value tree */
1097	<	register AMBTREE *at,
1097	>	AMBTREE *at,
1098		unloadtf_t *f
1099		)
1100		{
1101	<	register AMBVAL *av;
1102	<	register int i;
1101	>	AMBVAL *av;
1102	>	int i;
1103		/* transfer values at this node */
1104		for (av = at->alist; av != NULL; av = at->alist) {
1105		at->alist = av->next;
#	Line 695 \| Line 1124 \| *static int i_avlist; / index for lists /*
1124		static int alatcmp(const void av1, const void av2);
1125
1126		static void
1127	+	avfree(AMBVAL *av)
1128	+	{
1129	+	free(av);
1130	+	}
1131	+
1132	+	static void
1133		av2list(
1134	<	void *av
1134	>	AMBVAL *av
1135		)
1136		{
1137		#ifdef DEBUG
#	Line 704 \| Line 1139 \| av2list(
1139		error(CONSISTENCY, "too many ambient values in av2list1");
1140		#endif
1141		avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
1142	<	avlist1[i_avlist++].t = ((AMBVAL*)av)->latick;
1142	>	avlist1[i_avlist++].t = av->latick;
1143		}
1144
1145
#	Line 714 \| Line 1149 \| *alatcmp( / compare ambient values for MRA /*
1149		const void *av2
1150		)
1151		{
1152	<	register long lc = ((struct avl )av2)->t - ((struct avl )av1)->t;
1152	>	long lc = ((struct avl )av2)->t - ((struct avl )av1)->t;
1153		return(lc<0 ? -1 : lc>0 ? 1 : 0);
1154		}
1155
#	Line 731 \| Line 1166 \| *aposcmp( / compare ambient value positions /*
1166		const void *avp2
1167		)
1168		{
1169	<	register long diff = (char const )avp1 - (char * const *)avp2;
1169	>	long diff = (char const )avp1 - (char * const *)avp2;
1170		if (diff < 0)
1171		return(-1);
1172		return(diff > 0);
1173		}
1174
1175	<	#if 1
1175	>
1176		static int
1177		avlmemi( /* find list position from address */
1178		AMBVAL *avaddr
1179		)
1180		{
1181	<	register AMBVAL **avlpp;
1181	>	AMBVAL **avlpp;
1182
1183		avlpp = (AMBVAL *)bsearch((char )&avaddr, (char *)avlist2,
1184	<	nambvals, sizeof(AMBVAL *), aposcmp);
1184	>	nambvals, sizeof(AMBVAL *), &aposcmp);
1185		if (avlpp == NULL)
1186		error(CONSISTENCY, "address not found in avlmemi");
1187		return(avlpp - avlist2);
1188		}
754	–	#else
755	–	#define avlmemi(avaddr) ((AMBVAL *)bsearch((char )&avaddr,(char *)avlist2, \
756	–	nambvals,sizeof(AMBVAL *),aposcmp) - avlist2)
757	–	#endif
1189
1190
1191		static void
#	Line 764 \| Line 1195 \| *sortambvals( / resort ambient values /*
1195		{
1196		AMBTREE oldatrunk;
1197		AMBVAL tav, tap, pnext;
1198	<	register int i, j;
1198	>	int i, j;
1199		/* see if it's time yet */
1200		if (!always && (ambclock++ < lastsort+sortintvl \|\|
1201		nambvals < SORT_THRESH))
#	Line 798 \| Line 1229 \| *sortambvals( / resort ambient values /*
1229		oldatrunk = atrunk;
1230		atrunk.alist = NULL;
1231		atrunk.kid = NULL;
1232	<	unloadatree(&oldatrunk, avinsert);
1232	>	unloadatree(&oldatrunk, &avinsert);
1233		}
1234		} else { /* sort memory by last access time */
1235		/*
#	Line 815 \| Line 1246 \| *sortambvals( / resort ambient values /*
1246		eputs(errmsg);
1247		#endif
1248		i_avlist = 0;
1249	<	unloadatree(&atrunk, av2list); /* empty current tree */
1249	>	unloadatree(&atrunk, &av2list); /* empty current tree */
1250		#ifdef DEBUG
1251		if (i_avlist < nambvals)
1252		error(CONSISTENCY, "missing ambient values in sortambvals");
#	Line 872 \| Line 1303 \| *aflock( / lock/unlock ambient file /*
1303		}
1304
1305
1306	<	extern int
1306	>	int
1307		ambsync(void) /* synchronize ambient file */
1308		{
1309		long flen;
1310		AMBVAL avs;
1311	<	register int n;
1311	>	int n;
1312
1313		if (ambfp == NULL) /* no ambient file? */
1314		return(0);
#	Line 886 \| Line 1317 \| *ambsync(void) / synchronize ambient file /*
1317		/* see if file has grown */
1318		if ((flen = lseek(fileno(ambfp), (off_t)0, SEEK_END)) < 0)
1319		goto seekerr;
1320	<	if ( (n = flen - lastpos) ) { /* file has grown */
1320	>	if ((n = flen - lastpos) > 0) { /* file has grown */
1321		if (ambinp == NULL) { /* use duplicate filedes */
1322		ambinp = fdopen(dup(fileno(ambfp)), "r");
1323		if (ambinp == NULL)
#	Line 902 \| Line 1333 \| *ambsync(void) / synchronize ambient file /*
1333		error(WARNING, errmsg);
1334		break;
1335		}
1336	<	avinsert(avstore(&avs));
1336	>	avstore(&avs);
1337		n -= AMBVALSIZ;
1338		}
1339		lastpos = flen - n;
#	Line 911 \| Line 1342 \| *ambsync(void) / synchronize ambient file /*
1342		if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0)
1343		goto seekerr;
1344		}
914	–	#ifdef DEBUG
915	–	if (ambfp->_ptr - ambfp->_base != nunflshed*AMBVALSIZ) {
916	–	sprintf(errmsg, "ambient file buffer at %d rather than %d",
917	–	ambfp->_ptr - ambfp->_base,
918	–	nunflshed*AMBVALSIZ);
919	–	error(CONSISTENCY, errmsg);
920	–	}
921	–	#endif
1345		n = fflush(ambfp); /* calls write() at last */
1346		if (n != EOF)
1347		lastpos += (long)nunflshed*AMBVALSIZ;
#	Line 933 \| Line 1356 \| seekerr:
1356		return -1; /* pro forma return */
1357		}
1358
1359	<	#else
1359	>	#else /* ! F_SETLKW */
1360
1361	<	extern int
1361	>	int
1362		ambsync(void) /* flush ambient file */
1363		{
1364		if (ambfp == NULL)
#	Line 944 \| Line 1367 \| *ambsync(void) / flush ambient file /*
1367		return(fflush(ambfp));
1368		}
1369
1370	<	#endif
1370	>	#endif /* ! F_SETLKW */

Diff Legend

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

Comparing ray/src/rt/ambient.c (file contents): Revision 2.66 by greg, Sat Sep 15 05:16:10 2007 UTC vs. Revision 2.94 by greg, Tue Feb 24 19:39:26 2015 UTC

Diff Legend

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.66 by greg, Sat Sep 15 05:16:10 2007 UTC vs.
Revision 2.94 by greg, Tue Feb 24 19:39:26 2015 UTC