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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.68 by greg, Thu Oct 14 05:54:44 2010 UTC vs.
Revision 2.86 by greg, Wed May 7 01:16:03 2014 UTC

#	Line 39 \| Line 39 \| *static int nunflshed = 0; / number of unflushed ambi**
39
40		#ifndef SORT_THRESH
41		#ifdef SMLMEM
42	<	#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL))
42	>	#define SORT_THRESH ((16L<<20)/sizeof(AMBVAL))
43		#else
44	<	#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL))
44	>	#define SORT_THRESH ((64L<<20)/sizeof(AMBVAL))
45		#endif
46		#endif
47		#ifndef SORT_INTVL
#	Line 51 \| 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 avsum = 0.; /* computed ambient value sum (log) */
56		static unsigned int navsum = 0; /* number of values in avsum */
57		static unsigned int nambvals = 0; /* total number of indirect values */
#	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.5;
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.5)
117	>	maxarad = thescene.cusize*0.5;
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;
#	Line 194 \| Line 197 \| *setambient(void) / initialize calculation /*
197		sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
198		error(SYSTEM, errmsg);
199		}
200	+	#ifdef getc_unlocked
201	+	flockfile(ambfp); /* application-level lock */
202	+	#endif
203		#ifdef F_SETLKW
204		aflock(F_UNLCK); /* release file */
205		#endif
206		}
207
208
209	<	extern void
209	>	void
210		ambdone(void) /* close ambient file and free memory */
211		{
212		if (ambfp != NULL) { /* close ambient file */
#	Line 214 \| Line 220 \| *ambdone(void) / close ambient file and free memory**
220		lastpos = -1;
221		}
222		/* free ambient tree */
223	<	unloadatree(&atrunk, free);
223	>	unloadatree(&atrunk, &avfree);
224		/* reset state variables */
225		avsum = 0.;
226		navsum = 0;
#	Line 226 \| Line 232 \| *ambdone(void) / close ambient file and free memory**
232		}
233
234
235	<	extern void
235	>	void
236		ambnotify( /* record new modifier */
237		OBJECT obj
238		)
239		{
240		static int hitlimit = 0;
241	<	register OBJREC *o;
242	<	register char **amblp;
241	>	OBJREC *o;
242	>	char **amblp;
243
244		if (obj == OVOID) { /* starting over */
245		ambset[0] = 0;
#	Line 255 \| Line 261 \| *ambnotify( / record new modifier /*
261		}
262		}
263
264	+	/********** THE FOLLOWING ROUTINES DIFFER BETWEEN NEW & OLD *************/
265
266	<	extern void
266	>	#ifdef NEWAMB
267	>
268	>	#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr)))
269	>
270	>	static int plugaleak(RAY r, AMBVAL ap, FVECT anorm, double ang);
271	>	static double sumambient(COLOR acol, RAY *r, FVECT rn, int al,
272	>	AMBTREE *at, FVECT c0, double s);
273	>	static int makeambient(COLOR acol, RAY *r, FVECT rn, int al);
274	>	static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv,
275	>	FVECT uvw[3]);
276	>
277	>	void
278		multambient( /* compute ambient component & multiply by coef. */
279		COLOR aval,
280	<	register RAY *r,
280	>	RAY *r,
281		FVECT nrm
282		)
283		{
284		static int rdepth = 0; /* ambient recursion */
285		COLOR acol;
286	+	int ok;
287		double d, l;
288
289		if (ambdiv <= 0) /* no ambient calculation */
#	Line 280 \| Line 299 \| *multambient( / compute ambient component & multiply**
299		if (ambacc <= FTINY) { /* no ambient storage */
300		copycolor(acol, aval);
301		rdepth++;
302	+	ok = doambient(acol, r, r->rweight,
303	+	NULL, NULL, NULL, NULL, NULL);
304	+	rdepth--;
305	+	if (!ok)
306	+	goto dumbamb;
307	+	copycolor(aval, acol);
308	+	return;
309	+	}
310	+
311	+	if (tracktime) /* sort to minimize thrashing */
312	+	sortambvals(0);
313	+	/* interpolate ambient value */
314	+	setcolor(acol, 0.0, 0.0, 0.0);
315	+	d = sumambient(acol, r, nrm, rdepth,
316	+	&atrunk, thescene.cuorg, thescene.cusize);
317	+	if (d > FTINY) {
318	+	d = 1.0/d;
319	+	scalecolor(acol, d);
320	+	multcolor(aval, acol);
321	+	return;
322	+	}
323	+	rdepth++; /* need to cache new value */
324	+	ok = makeambient(acol, r, nrm, rdepth-1);
325	+	rdepth--;
326	+	if (ok) {
327	+	multcolor(aval, acol); /* computed new value */
328	+	return;
329	+	}
330	+	dumbamb: /* return global value */
331	+	if ((ambvwt <= 0) \| (navsum == 0)) {
332	+	multcolor(aval, ambval);
333	+	return;
334	+	}
335	+	l = bright(ambval); /* average in computations */
336	+	if (l > FTINY) {
337	+	d = (log(l)*(double)ambvwt + avsum) /
338	+	(double)(ambvwt + navsum);
339	+	d = exp(d) / l;
340	+	scalecolor(aval, d);
341	+	multcolor(aval, ambval); /* apply color of ambval */
342	+	} else {
343	+	d = exp( avsum / (double)navsum );
344	+	scalecolor(aval, d); /* neutral color */
345	+	}
346	+	}
347	+
348	+
349	+	/* Plug a potential leak where ambient cache value is occluded */
350	+	static int
351	+	plugaleak(RAY r, AMBVAL ap, FVECT anorm, double ang)
352	+	{
353	+	const double cost70sq = 0.1169778; /* cos(70deg)^2 */
354	+	RAY rtst;
355	+	FVECT vdif;
356	+	double normdot, ndotd, nadotd;
357	+	double a, b, c, t[2];
358	+
359	+	ang += 2.PI(ang < 0); /* check direction flags */
360	+	if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) )
361	+	return(0);
362	+	/*
363	+	* Generate test ray, targeting 20 degrees above sample point plane
364	+	* along surface normal from cache position. This should be high
365	+	* enough to miss local geometry we don't really care about.
366	+	*/
367	+	VSUB(vdif, ap->pos, r->rop);
368	+	normdot = DOT(anorm, r->ron);
369	+	ndotd = DOT(vdif, r->ron);
370	+	nadotd = DOT(vdif, anorm);
371	+	a = normdot*normdot - cost70sq;
372	+	b = 2.0(normdotndotd - nadotd*cost70sq);
373	+	c = ndotdndotd - DOT(vdif,vdif)cost70sq;
374	+	if (quadratic(t, a, b, c) != 2)
375	+	return(1); /* should rarely happen */
376	+	if (t[1] <= FTINY)
377	+	return(0); /* should fail behind test */
378	+	rayorigin(&rtst, SHADOW, r, NULL);
379	+	VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */
380	+	rtst.rmax = normalize(rtst.rdir); /* short ray test */
381	+	while (localhit(&rtst, &thescene)) { /* check for occluder */
382	+	if (rtst.ro->omod != OVOID &&
383	+	(rtst.clipset == NULL \|\|
384	+	!inset(rtst.clipset, rtst.ro->omod)))
385	+	return(1); /* plug light leak */
386	+	VCOPY(rtst.rorg, rtst.rop); /* skip invisible surface */
387	+	rtst.rmax -= rtst.rot;
388	+	rayclear(&rtst);
389	+	}
390	+	return(0); /* seems we're OK */
391	+	}
392	+
393	+
394	+	static double
395	+	sumambient( /* get interpolated ambient value */
396	+	COLOR acol,
397	+	RAY *r,
398	+	FVECT rn,
399	+	int al,
400	+	AMBTREE *at,
401	+	FVECT c0,
402	+	double s
403	+	)
404	+	{ /* initial limit is 10 degrees plus ambacc radians */
405	+	const double minangle = 10.0 * PI/180.;
406	+	double maxangle = minangle + ambacc;
407	+	double wsum = 0.0;
408	+	FVECT ck0;
409	+	int i, j;
410	+	AMBVAL *av;
411	+
412	+	if (at->kid != NULL) { /* sum children first */
413	+	s *= 0.5;
414	+	for (i = 0; i < 8; i++) {
415	+	for (j = 0; j < 3; j++) {
416	+	ck0[j] = c0[j];
417	+	if (1<<j & i)
418	+	ck0[j] += s;
419	+	if (r->rop[j] < ck0[j] - OCTSCALE*s)
420	+	break;
421	+	if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s)
422	+	break;
423	+	}
424	+	if (j == 3)
425	+	wsum += sumambient(acol, r, rn, al,
426	+	at->kid+i, ck0, s);
427	+	}
428	+	/* good enough? */
429	+	if (wsum >= 0.05 && s > minarad*10.0)
430	+	return(wsum);
431	+	}
432	+	/* adjust maximum angle */
433	+	if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6))
434	+	maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.;
435	+	/* sum this node */
436	+	for (av = at->alist; av != NULL; av = av->next) {
437	+	double u, v, d, delta_r2, delta_t2;
438	+	COLOR ct;
439	+	FVECT uvw[3];
440	+	/* record access */
441	+	if (tracktime)
442	+	av->latick = ambclock;
443	+	/*
444	+	* Ambient level test
445	+	*/
446	+	if (av->lvl > al) /* list sorted, so this works */
447	+	break;
448	+	if (av->weight < 0.9*r->rweight)
449	+	continue;
450	+	/*
451	+	* Direction test using unperturbed normal
452	+	*/
453	+	decodedir(uvw[2], av->ndir);
454	+	d = DOT(uvw[2], r->ron);
455	+	if (d <= 0.0) /* >= 90 degrees */
456	+	continue;
457	+	delta_r2 = 2.0 - 2.0d; / approx. radians^2 */
458	+	if (delta_r2 >= maxangle*maxangle)
459	+	continue;
460	+	/*
461	+	* Modified ray behind test
462	+	*/
463	+	VSUB(ck0, r->rop, av->pos);
464	+	d = DOT(ck0, uvw[2]);
465	+	if (d < -minarad*ambacc-.001)
466	+	continue;
467	+	d /= av->rad[0];
468	+	delta_t2 = d*d;
469	+	if (delta_t2 >= ambacc*ambacc)
470	+	continue;
471	+	/*
472	+	* Elliptical radii test based on Hessian
473	+	*/
474	+	decodedir(uvw[0], av->udir);
475	+	VCROSS(uvw[1], uvw[2], uvw[0]);
476	+	d = (u = DOT(ck0, uvw[0])) / av->rad[0];
477	+	delta_t2 += d*d;
478	+	d = (v = DOT(ck0, uvw[1])) / av->rad[1];
479	+	delta_t2 += d*d;
480	+	if (delta_t2 >= ambacc*ambacc)
481	+	continue;
482	+	/*
483	+	* Test for potential light leak
484	+	*/
485	+	if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u)))
486	+	continue;
487	+	/*
488	+	* Extrapolate value and compute final weight (hat function)
489	+	*/
490	+	extambient(ct, av, r->rop, rn, uvw);
491	+	d = tfunc(maxangle, sqrt(delta_r2), 0.0) *
492	+	tfunc(ambacc, sqrt(delta_t2), 0.0);
493	+	scalecolor(ct, d);
494	+	addcolor(acol, ct);
495	+	wsum += d;
496	+	}
497	+	return(wsum);
498	+	}
499	+
500	+
501	+	static int
502	+	makeambient( /* make a new ambient value for storage */
503	+	COLOR acol,
504	+	RAY *r,
505	+	FVECT rn,
506	+	int al
507	+	)
508	+	{
509	+	AMBVAL amb;
510	+	FVECT uvw[3];
511	+	int i;
512	+
513	+	amb.weight = 1.0; /* compute weight */
514	+	for (i = al; i-- > 0; )
515	+	amb.weight *= AVGREFL;
516	+	if (r->rweight < 0.1amb.weight) / heuristic override */
517	+	amb.weight = 1.25*r->rweight;
518	+	setcolor(acol, AVGREFL, AVGREFL, AVGREFL);
519	+	/* compute ambient */
520	+	i = doambient(acol, r, amb.weight,
521	+	uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral);
522	+	scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */
523	+	if (i <= 0 \|\| amb.rad[0] <= FTINY) /* no Hessian or zero radius */
524	+	return(i);
525	+	/* store value */
526	+	VCOPY(amb.pos, r->rop);
527	+	amb.ndir = encodedir(r->ron);
528	+	amb.udir = encodedir(uvw[0]);
529	+	amb.lvl = al;
530	+	copycolor(amb.val, acol);
531	+	/* insert into tree */
532	+	avsave(&amb); /* and save to file */
533	+	if (rn != r->ron) { /* texture */
534	+	VCOPY(uvw[2], r->ron);
535	+	extambient(acol, &amb, r->rop, rn, uvw);
536	+	}
537	+	return(1);
538	+	}
539	+
540	+
541	+	static void
542	+	extambient( /* extrapolate value at pv, nv */
543	+	COLOR cr,
544	+	AMBVAL *ap,
545	+	FVECT pv,
546	+	FVECT nv,
547	+	FVECT uvw[3]
548	+	)
549	+	{
550	+	static FVECT my_uvw[3];
551	+	FVECT v1;
552	+	int i;
553	+	double d = 1.0; /* zeroeth order */
554	+
555	+	if (uvw == NULL) { /* need local coordinates? */
556	+	decodedir(my_uvw[2], ap->ndir);
557	+	decodedir(my_uvw[0], ap->udir);
558	+	VCROSS(my_uvw[1], my_uvw[2], my_uvw[0]);
559	+	uvw = my_uvw;
560	+	}
561	+	for (i = 3; i--; ) /* gradient due to translation */
562	+	d += (pv[i] - ap->pos[i]) *
563	+	(ap->gpos[0]uvw[0][i] + ap->gpos[1]uvw[1][i]);
564	+
565	+	VCROSS(v1, uvw[2], nv); /* gradient due to rotation */
566	+	for (i = 3; i--; )
567	+	d += v1[i] * (ap->gdir[0]uvw[0][i] + ap->gdir[1]uvw[1][i]);
568	+
569	+	if (d <= 0.0) {
570	+	setcolor(cr, 0.0, 0.0, 0.0);
571	+	return;
572	+	}
573	+	copycolor(cr, ap->val);
574	+	scalecolor(cr, d);
575	+	}
576	+
577	+
578	+	static void
579	+	avinsert( /* insert ambient value in our tree */
580	+	AMBVAL *av
581	+	)
582	+	{
583	+	AMBTREE *at;
584	+	AMBVAL *ap;
585	+	AMBVAL avh;
586	+	FVECT ck0;
587	+	double s;
588	+	int branch;
589	+	int i;
590	+
591	+	if (av->rad[0] <= FTINY)
592	+	error(CONSISTENCY, "zero ambient radius in avinsert");
593	+	at = &atrunk;
594	+	VCOPY(ck0, thescene.cuorg);
595	+	s = thescene.cusize;
596	+	while (s(OCTSCALE/2) > av->rad[1]ambacc) {
597	+	if (at->kid == NULL)
598	+	if ((at->kid = newambtree()) == NULL)
599	+	error(SYSTEM, "out of memory in avinsert");
600	+	s *= 0.5;
601	+	branch = 0;
602	+	for (i = 0; i < 3; i++)
603	+	if (av->pos[i] > ck0[i] + s) {
604	+	ck0[i] += s;
605	+	branch \|= 1 << i;
606	+	}
607	+	at = at->kid + branch;
608	+	}
609	+	avh.next = at->alist; /* order by increasing level */
610	+	for (ap = &avh; ap->next != NULL; ap = ap->next)
611	+	if (ap->next->lvl >= av->lvl)
612	+	break;
613	+	av->next = ap->next;
614	+	ap->next = (AMBVAL*)av;
615	+	at->alist = avh.next;
616	+	}
617	+
618	+
619	+	#else /* ! NEWAMB */
620	+
621	+	static double sumambient(COLOR acol, RAY *r, FVECT rn, int al,
622	+	AMBTREE *at, FVECT c0, double s);
623	+	static double makeambient(COLOR acol, RAY *r, FVECT rn, int al);
624	+	static void extambient(COLOR cr, AMBVAL *ap, FVECT pv, FVECT nv);
625	+
626	+
627	+	void
628	+	multambient( /* compute ambient component & multiply by coef. */
629	+	COLOR aval,
630	+	RAY *r,
631	+	FVECT nrm
632	+	)
633	+	{
634	+	static int rdepth = 0; /* ambient recursion */
635	+	COLOR acol;
636	+	double d, l;
637	+
638	+	if (ambdiv <= 0) /* no ambient calculation */
639	+	goto dumbamb;
640	+	/* check number of bounces */
641	+	if (rdepth >= ambounce)
642	+	goto dumbamb;
643	+	/* check ambient list */
644	+	if (ambincl != -1 && r->ro != NULL &&
645	+	ambincl != inset(ambset, r->ro->omod))
646	+	goto dumbamb;
647	+
648	+	if (ambacc <= FTINY) { /* no ambient storage */
649	+	copycolor(acol, aval);
650	+	rdepth++;
651		d = doambient(acol, r, r->rweight, NULL, NULL);
652		rdepth--;
653		if (d <= FTINY)
#	Line 326 \| Line 694 \| *dumbamb: / return global value /*
694		}
695
696
697	<	extern double
697	>	static double
698		sumambient( /* get interpolated ambient value */
699		COLOR acol,
700	<	register RAY *r,
700	>	RAY *r,
701		FVECT rn,
702		int al,
703		AMBTREE *at,
#	Line 341 \| Line 709 \| *sumambient( / get interpolated ambient value /*
709		COLOR ct;
710		FVECT ck0;
711		int i;
712	<	register int j;
713	<	register AMBVAL *av;
712	>	int j;
713	>	AMBVAL *av;
714
715		wsum = 0.0;
716		/* do this node */
#	Line 360 \| Line 728 \| *sumambient( / get interpolated ambient value /*
728		/*
729		* Ambient radius test.
730		*/
731	<	d = av->pos[0] - r->rop[0];
732	<	e1 = d * d;
365	<	d = av->pos[1] - r->rop[1];
366	<	e1 += d * d;
367	<	d = av->pos[2] - r->rop[2];
368	<	e1 += d * d;
369	<	e1 /= av->rad * av->rad;
731	>	VSUB(ck0, av->pos, r->rop);
732	>	e1 = DOT(ck0, ck0) / (av->rad * av->rad);
733		if (e1 > ambaccambacc1.21)
734		continue;
735		/*
#	Line 383 \| Line 746 \| *sumambient( / get interpolated ambient value /*
746		}
747		}
748		e2 = (1.0 - d) * r->rweight;
749	<	if (e2 < 0.0) e2 = 0.0;
750	<	if (e1 + e2 > ambaccambacc1.21)
749	>	if (e2 < 0.0)
750	>	e2 = 0.0;
751	>	else if (e1 + e2 > ambaccambacc1.21)
752		continue;
753		/*
754		* Ray behind test.
#	Line 441 \| Line 805 \| *sumambient( / get interpolated ambient value /*
805		}
806
807
808	<	extern double
808	>	static double
809		makeambient( /* make a new ambient value for storage */
810		COLOR acol,
811		RAY *r,
#	Line 481 \| Line 845 \| *makeambient( / make a new ambient value for storage**
845		}
846
847
848	<	extern void
848	>	static void
849		extambient( /* extrapolate value at pv, nv */
850		COLOR cr,
851	<	register AMBVAL *ap,
851	>	AMBVAL *ap,
852		FVECT pv,
853		FVECT nv
854		)
855		{
856		FVECT v1;
857	<	register int i;
857	>	int i;
858		double d;
859
860		d = 1.0; /* zeroeth order */
#	Line 510 \| Line 874 \| *extambient( / extrapolate value at pv, nv /*
874
875
876		static void
877	+	avinsert( /* insert ambient value in our tree */
878	+	AMBVAL *av
879	+	)
880	+	{
881	+	AMBTREE *at;
882	+	AMBVAL *ap;
883	+	AMBVAL avh;
884	+	FVECT ck0;
885	+	double s;
886	+	int branch;
887	+	int i;
888	+
889	+	if (av->rad <= FTINY)
890	+	error(CONSISTENCY, "zero ambient radius in avinsert");
891	+	at = &atrunk;
892	+	VCOPY(ck0, thescene.cuorg);
893	+	s = thescene.cusize;
894	+	while (s(OCTSCALE/2) > av->radambacc) {
895	+	if (at->kid == NULL)
896	+	if ((at->kid = newambtree()) == NULL)
897	+	error(SYSTEM, "out of memory in avinsert");
898	+	s *= 0.5;
899	+	branch = 0;
900	+	for (i = 0; i < 3; i++)
901	+	if (av->pos[i] > ck0[i] + s) {
902	+	ck0[i] += s;
903	+	branch \|= 1 << i;
904	+	}
905	+	at = at->kid + branch;
906	+	}
907	+	avh.next = at->alist; /* order by increasing level */
908	+	for (ap = &avh; ap->next != NULL; ap = ap->next)
909	+	if (ap->next->lvl >= av->lvl)
910	+	break;
911	+	av->next = ap->next;
912	+	ap->next = (AMBVAL*)av;
913	+	at->alist = avh.next;
914	+	}
915	+
916	+	#endif /* ! NEWAMB */
917	+
918	+	/*********** FOLLOWING ROUTINES SAME FOR NEW & OLD METHODS *************/
919	+
920	+	static void
921		initambfile( /* initialize ambient file */
922		int cre8
923		)
#	Line 518 \| Line 926 \| *initambfile( / initialize ambient file /*
926		static char *mybuf = NULL;
927
928		#ifdef F_SETLKW
929	<	aflock(creat ? F_WRLCK : F_RDLCK);
929	>	aflock(cre8 ? F_WRLCK : F_RDLCK);
930		#endif
931		SET_FILE_BINARY(ambfp);
932		if (mybuf == NULL)
#	Line 566 \| Line 974 \| writerr:
974
975		static AMBVAL *
976		avstore( /* allocate memory and store aval */
977	<	register AMBVAL *aval
977	>	AMBVAL *aval
978		)
979		{
980	<	register AMBVAL *av;
980	>	AMBVAL *av;
981		double d;
982
983		if ((av = newambval()) == NULL)
#	Line 595 \| Line 1003 \| *static AMBTREE atfreelist = NULL; /* free ambient tr**
1003		static AMBTREE *
1004		newambtree(void) /* allocate 8 ambient tree structs */
1005		{
1006	<	register AMBTREE atp, upperlim;
1006	>	AMBTREE atp, upperlim;
1007
1008		if (atfreelist == NULL) { /* get more nodes */
1009		atfreelist = (AMBTREE )malloc(ATALLOCSZ8*sizeof(AMBTREE));
#	Line 625 \| Line 1033 \| *freeambtree( / free 8 ambient tree structs /*
1033
1034
1035		static void
628	–	avinsert( /* insert ambient value in our tree */
629	–	void *av
630	–	)
631	–	{
632	–	register AMBTREE *at;
633	–	register AMBVAL *ap;
634	–	AMBVAL avh;
635	–	FVECT ck0;
636	–	double s;
637	–	int branch;
638	–	register int i;
639	–
640	–	if (((AMBVAL*)av)->rad <= FTINY)
641	–	error(CONSISTENCY, "zero ambient radius in avinsert");
642	–	at = &atrunk;
643	–	VCOPY(ck0, thescene.cuorg);
644	–	s = thescene.cusize;
645	–	while (s(OCTSCALE/2) > ((AMBVAL)av)->rad*ambacc) {
646	–	if (at->kid == NULL)
647	–	if ((at->kid = newambtree()) == NULL)
648	–	error(SYSTEM, "out of memory in avinsert");
649	–	s *= 0.5;
650	–	branch = 0;
651	–	for (i = 0; i < 3; i++)
652	–	if (((AMBVAL*)av)->pos[i] > ck0[i] + s) {
653	–	ck0[i] += s;
654	–	branch \|= 1 << i;
655	–	}
656	–	at = at->kid + branch;
657	–	}
658	–	avh.next = at->alist; /* order by increasing level */
659	–	for (ap = &avh; ap->next != NULL; ap = ap->next)
660	–	if (ap->next->lvl >= ((AMBVAL*)av)->lvl)
661	–	break;
662	–	((AMBVAL*)av)->next = ap->next;
663	–	ap->next = (AMBVAL*)av;
664	–	at->alist = avh.next;
665	–	}
666	–
667	–
668	–	static void
1036		unloadatree( /* unload an ambient value tree */
1037	<	register AMBTREE *at,
1037	>	AMBTREE *at,
1038		unloadtf_t *f
1039		)
1040		{
1041	<	register AMBVAL *av;
1042	<	register int i;
1041	>	AMBVAL *av;
1042	>	int i;
1043		/* transfer values at this node */
1044		for (av = at->alist; av != NULL; av = at->alist) {
1045		at->alist = av->next;
#	Line 697 \| Line 1064 \| *static int i_avlist; / index for lists /*
1064		static int alatcmp(const void av1, const void av2);
1065
1066		static void
1067	+	avfree(AMBVAL *av)
1068	+	{
1069	+	free(av);
1070	+	}
1071	+
1072	+	static void
1073		av2list(
1074	<	void *av
1074	>	AMBVAL *av
1075		)
1076		{
1077		#ifdef DEBUG
#	Line 706 \| Line 1079 \| av2list(
1079		error(CONSISTENCY, "too many ambient values in av2list1");
1080		#endif
1081		avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
1082	<	avlist1[i_avlist++].t = ((AMBVAL*)av)->latick;
1082	>	avlist1[i_avlist++].t = av->latick;
1083		}
1084
1085
#	Line 716 \| Line 1089 \| *alatcmp( / compare ambient values for MRA /*
1089		const void *av2
1090		)
1091		{
1092	<	register long lc = ((struct avl )av2)->t - ((struct avl )av1)->t;
1092	>	long lc = ((struct avl )av2)->t - ((struct avl )av1)->t;
1093		return(lc<0 ? -1 : lc>0 ? 1 : 0);
1094		}
1095
#	Line 733 \| Line 1106 \| *aposcmp( / compare ambient value positions /*
1106		const void *avp2
1107		)
1108		{
1109	<	register long diff = (char const )avp1 - (char * const *)avp2;
1109	>	long diff = (char const )avp1 - (char * const *)avp2;
1110		if (diff < 0)
1111		return(-1);
1112		return(diff > 0);
1113		}
1114
1115	<	#if 1
1115	>
1116		static int
1117		avlmemi( /* find list position from address */
1118		AMBVAL *avaddr
1119		)
1120		{
1121	<	register AMBVAL **avlpp;
1121	>	AMBVAL **avlpp;
1122
1123		avlpp = (AMBVAL *)bsearch((char )&avaddr, (char *)avlist2,
1124	<	nambvals, sizeof(AMBVAL *), aposcmp);
1124	>	nambvals, sizeof(AMBVAL *), &aposcmp);
1125		if (avlpp == NULL)
1126		error(CONSISTENCY, "address not found in avlmemi");
1127		return(avlpp - avlist2);
1128		}
756	–	#else
757	–	#define avlmemi(avaddr) ((AMBVAL *)bsearch((char )&avaddr,(char *)avlist2, \
758	–	nambvals,sizeof(AMBVAL *),aposcmp) - avlist2)
759	–	#endif
1129
1130
1131		static void
#	Line 766 \| Line 1135 \| *sortambvals( / resort ambient values /*
1135		{
1136		AMBTREE oldatrunk;
1137		AMBVAL tav, tap, pnext;
1138	<	register int i, j;
1138	>	int i, j;
1139		/* see if it's time yet */
1140		if (!always && (ambclock++ < lastsort+sortintvl \|\|
1141		nambvals < SORT_THRESH))
#	Line 800 \| Line 1169 \| *sortambvals( / resort ambient values /*
1169		oldatrunk = atrunk;
1170		atrunk.alist = NULL;
1171		atrunk.kid = NULL;
1172	<	unloadatree(&oldatrunk, avinsert);
1172	>	unloadatree(&oldatrunk, &avinsert);
1173		}
1174		} else { /* sort memory by last access time */
1175		/*
#	Line 817 \| Line 1186 \| *sortambvals( / resort ambient values /*
1186		eputs(errmsg);
1187		#endif
1188		i_avlist = 0;
1189	<	unloadatree(&atrunk, av2list); /* empty current tree */
1189	>	unloadatree(&atrunk, &av2list); /* empty current tree */
1190		#ifdef DEBUG
1191		if (i_avlist < nambvals)
1192		error(CONSISTENCY, "missing ambient values in sortambvals");
1193		#endif
1194	<	qsort((char *)avlist1, nambvals, sizeof(struct avl), alatcmp);
1195	<	qsort((char )avlist2, nambvals, sizeof(AMBVAL ), aposcmp);
1194	>	qsort((char *)avlist1, nambvals, sizeof(struct avl), &alatcmp);
1195	>	qsort((char )avlist2, nambvals, sizeof(AMBVAL ), &aposcmp);
1196		for (i = 0; i < nambvals; i++) {
1197		if (avlist1[i].p == NULL)
1198		continue;
#	Line 874 \| Line 1243 \| *aflock( / lock/unlock ambient file /*
1243		}
1244
1245
1246	<	extern int
1246	>	int
1247		ambsync(void) /* synchronize ambient file */
1248		{
1249		long flen;
1250		AMBVAL avs;
1251	<	register int n;
1251	>	int n;
1252
1253		if (ambfp == NULL) /* no ambient file? */
1254		return(0);
#	Line 927 \| Line 1296 \| seekerr:
1296		return -1; /* pro forma return */
1297		}
1298
1299	<	#else
1299	>	#else /* ! F_SETLKW */
1300
1301	<	extern int
1301	>	int
1302		ambsync(void) /* flush ambient file */
1303		{
1304		if (ambfp == NULL)
#	Line 938 \| Line 1307 \| *ambsync(void) / flush ambient file /*
1307		return(fflush(ambfp));
1308		}
1309
1310	<	#endif
1310	>	#endif /* ! F_SETLKW */

Diff Legend

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

Comparing ray/src/rt/ambient.c (file contents): Revision 2.68 by greg, Thu Oct 14 05:54:44 2010 UTC vs. Revision 2.86 by greg, Wed May 7 01:16:03 2014 UTC

Diff Legend

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.68 by greg, Thu Oct 14 05:54:44 2010 UTC vs.
Revision 2.86 by greg, Wed May 7 01:16:03 2014 UTC