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

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.63 by greg, Thu Jun 19 16:26:55 2014 UTC vs.
Revision 2.94 by greg, Wed Apr 17 17:34:11 2024 UTC

#	Line 21 \| Line 21 \| static const char RCSid[] = "$Id$";
21		#include "ambient.h"
22		#include "random.h"
23
24	<	#ifndef OLDAMB
24	>	#ifndef MINADIV
25	>	#define MINADIV 7 /* minimum # divisions in each dimension */
26	>	#endif
27
26	–	extern void SDsquare2disk(double ds[2], double seedx, double seedy);
27	–
28		typedef struct {
29	–	COLOR v; /* hemisphere sample value */
30	–	float d; /* reciprocal distance (1/rt) */
29		FVECT p; /* intersection point */
30	+	float d; /* reciprocal distance */
31	+	SCOLOR v; /* hemisphere sample value */
32		} AMBSAMP; /* sample value */
33
34		typedef struct {
35		RAY rp; / originating ray sample */
36		int ns; /* number of samples per axis */
37		int sampOK; /* acquired full sample set? */
38	<	COLOR acoef; /* division contribution coefficient */
39	<	double acol[3]; /* accumulated color */
38	>	int atyp; /* RAMBIENT or TAMBIENT */
39	>	SCOLOR acoef; /* division contribution coefficient */
40	>	SCOLOR acol; /* accumulated color */
41	>	FVECT onrm; /* oriented unperturbed surface normal */
42		FVECT ux, uy; /* tangent axis unit vectors */
43		AMBSAMP sa[1]; /* sample array (extends struct) */
44		} AMBHEMI; /* ambient sample hemisphere */
#	Line 51 \| Line 53 \| typedef struct {
53
54
55		static int
56	+	ambcollision( /* proposed direciton collides? */
57	+	AMBHEMI *hp,
58	+	int i,
59	+	int j,
60	+	FVECT dv
61	+	)
62	+	{
63	+	double cos_thresh;
64	+	int ii, jj;
65	+	/* min. spacing = 1/4th division */
66	+	cos_thresh = (PI/4.)/(double)hp->ns;
67	+	cos_thresh = 1. - .5cos_threshcos_thresh;
68	+	/* check existing neighbors */
69	+	for (ii = i-1; ii <= i+1; ii++) {
70	+	if (ii < 0) continue;
71	+	if (ii >= hp->ns) break;
72	+	for (jj = j-1; jj <= j+1; jj++) {
73	+	AMBSAMP *ap;
74	+	FVECT avec;
75	+	double dprod;
76	+	if (jj < 0) continue;
77	+	if (jj >= hp->ns) break;
78	+	if ((ii==i) & (jj==j)) continue;
79	+	ap = &ambsam(hp,ii,jj);
80	+	if (ap->d <= .5/FHUGE)
81	+	continue; /* no one home */
82	+	VSUB(avec, ap->p, hp->rp->rop);
83	+	dprod = DOT(avec, dv);
84	+	if (dprod >= cos_thresh*VLEN(avec))
85	+	return(1); /* collision */
86	+	}
87	+	}
88	+	return(0); /* nothing to worry about */
89	+	}
90	+
91	+
92	+	static int
93		ambsample( /* initial ambient division sample */
94		AMBHEMI *hp,
95		int i,
#	Line 61 \| Line 100 \| *ambsample( / initial ambient division sample /*
100		AMBSAMP *ap = &ambsam(hp,i,j);
101		RAY ar;
102		int hlist[3], ii;
103	<	double spt[2], zd;
103	>	double ss[2];
104	>	RREAL spt[2];
105	>	double zd;
106		/* generate hemispherical sample */
107		/* ambient coefficient for weight */
108		if (ambacc > FTINY)
109	<	setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
109	>	setscolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
110		else
111	<	copycolor(ar.rcoef, hp->acoef);
112	<	if (rayorigin(&ar, AMBIENT, hp->rp, ar.rcoef) < 0)
111	>	copyscolor(ar.rcoef, hp->acoef);
112	>	if (rayorigin(&ar, hp->atyp, hp->rp, ar.rcoef) < 0)
113		return(0);
114		if (ambacc > FTINY) {
115	<	multcolor(ar.rcoef, hp->acoef);
116	<	scalecolor(ar.rcoef, 1./AVGREFL);
115	>	smultscolor(ar.rcoef, hp->acoef);
116	>	scalescolor(ar.rcoef, 1./AVGREFL);
117		}
118		hlist[0] = hp->rp->rno;
119	<	hlist[1] = j;
120	<	hlist[2] = i;
121	<	multisamp(spt, 2, urand(ilhash(hlist,3)+n));
122	<	if (!n) { /* avoid border samples for n==0 */
123	<	if ((spt[0] < 0.1) \| (spt[0] >= 0.9))
83	<	spt[0] = 0.1 + 0.8*frandom();
84	<	if ((spt[1] < 0.1) \| (spt[1] >= 0.9))
85	<	spt[1] = 0.1 + 0.8*frandom();
86	<	}
87	<	SDsquare2disk(spt, (j+spt[1])/hp->ns, (i+spt[0])/hp->ns);
119	>	hlist[1] = AI(hp,i,j);
120	>	hlist[2] = samplendx;
121	>	multisamp(ss, 2, urand(ilhash(hlist,3)+n));
122	>	resample:
123	>	square2disk(spt, (j+ss[1])/hp->ns, (i+ss[0])/hp->ns);
124		zd = sqrt(1. - spt[0]spt[0] - spt[1]spt[1]);
125		for (ii = 3; ii--; )
126		ar.rdir[ii] = spt[0]*hp->ux[ii] +
127		spt[1]*hp->uy[ii] +
128	<	zd*hp->rp->ron[ii];
128	>	zd*hp->onrm[ii];
129		checknorm(ar.rdir);
130	+	/* avoid coincident samples */
131	+	if (!n && hp->ns >= 4 && ambcollision(hp, i, j, ar.rdir)) {
132	+	ss[0] = frandom(); ss[1] = frandom();
133	+	goto resample; /* reject this sample */
134	+	}
135		dimlist[ndims++] = AI(hp,i,j) + 90171;
136		rayvalue(&ar); /* evaluate ray */
137		ndims--;
138	<	if (ar.rt <= FTINY)
138	>	zd = raydistance(&ar);
139	>	if (zd <= FTINY)
140		return(0); /* should never happen */
141	<	multcolor(ar.rcol, ar.rcoef); /* apply coefficient */
142	<	if (ar.rtap->d < 1.0) / new/closer distance? */
143	<	ap->d = 1.0/ar.rt;
141	>	smultscolor(ar.rcol, ar.rcoef); /* apply coefficient */
142	>	if (zdap->d < 1.0) / new/closer distance? */
143	>	ap->d = 1.0/zd;
144		if (!n) { /* record first vertex & value */
145	<	if (ar.rt > 10.0*thescene.cusize)
146	<	ar.rt = 10.0*thescene.cusize;
147	<	VSUM(ap->p, ar.rorg, ar.rdir, ar.rt);
148	<	copycolor(ap->v, ar.rcol);
145	>	if (zd > 10.0*thescene.cusize + 1000.)
146	>	zd = 10.0*thescene.cusize + 1000.;
147	>	VSUM(ap->p, ar.rorg, ar.rdir, zd);
148	>	copyscolor(ap->v, ar.rcol);
149		} else { /* else update recorded value */
150	<	hp->acol[RED] -= colval(ap->v,RED);
109	<	hp->acol[GRN] -= colval(ap->v,GRN);
110	<	hp->acol[BLU] -= colval(ap->v,BLU);
150	>	sopscolor(hp->acol, -=, ap->v);
151		zd = 1.0/(double)(n+1);
152	<	scalecolor(ar.rcol, zd);
152	>	scalescolor(ar.rcol, zd);
153		zd *= (double)n;
154	<	scalecolor(ap->v, zd);
155	<	addcolor(ap->v, ar.rcol);
154	>	scalescolor(ap->v, zd);
155	>	saddscolor(ap->v, ar.rcol);
156		}
157	<	addcolor(hp->acol, ap->v); /* add to our sum */
157	>	saddscolor(hp->acol, ap->v); /* add to our sum */
158		return(1);
159		}
160
161
162	<	/* Estimate errors based on ambient division differences */
162	>	/* Estimate variance based on ambient division differences */
163		static float *
164		getambdiffs(AMBHEMI *hp)
165		{
166	<	float earr = (float )calloc(hp->ns*hp->ns, sizeof(float));
166	>	const double normf = 1./(pbright(hp->acoef) + FTINY);
167	>	float earr = (float )calloc(2hp->nshp->ns, sizeof(float));
168		float *ep;
169		AMBSAMP *ap;
170	<	double b, d2;
170	>	double b, b1, d2;
171		int i, j;
172
173		if (earr == NULL) /* out of memory? */
174		return(NULL);
175	<	/* compute squared neighbor diffs */
175	>	/* sum squared neighbor diffs */
176		for (ap = hp->sa, ep = earr, i = 0; i < hp->ns; i++)
177		for (j = 0; j < hp->ns; j++, ap++, ep++) {
178	<	b = bright(ap[0].v);
178	>	b = pbright(ap[0].v);
179		if (i) { /* from above */
180	<	d2 = b - bright(ap[-hp->ns].v);
181	<	d2 *= d2;
180	>	b1 = pbright(ap[-hp->ns].v);
181	>	d2 = b - b1;
182	>	d2 = d2normf/(b + b1 + FTINY);
183		ep[0] += d2;
184		ep[-hp->ns] += d2;
185		}
186		if (!j) continue;
187		/* from behind */
188	<	d2 = b - bright(ap[-1].v);
189	<	d2 *= d2;
188	>	b1 = pbright(ap[-1].v);
189	>	d2 = b - b1;
190	>	d2 = d2normf/(b + b1 + FTINY);
191		ep[0] += d2;
192		ep[-1] += d2;
193		if (!i) continue;
194		/* diagonal */
195	<	d2 = b - bright(ap[-hp->ns-1].v);
196	<	d2 *= d2;
195	>	b1 = pbright(ap[-hp->ns-1].v);
196	>	d2 = b - b1;
197	>	d2 = d2normf/(b + b1 + FTINY);
198		ep[0] += d2;
199		ep[-hp->ns-1] += d2;
200		}
201		/* correct for number of neighbors */
202	<	earr[0] *= 8./3.;
203	<	earr[hp->ns-1] *= 8./3.;
204	<	earr[(hp->ns-1)hp->ns] = 8./3.;
205	<	earr[(hp->ns-1)hp->ns + hp->ns-1] = 8./3.;
202	>	earr[0] *= 6./3.;
203	>	earr[hp->ns-1] *= 6./3.;
204	>	earr[(hp->ns-1)hp->ns] = 6./3.;
205	>	earr[(hp->ns-1)hp->ns + hp->ns-1] = 6./3.;
206		for (i = 1; i < hp->ns-1; i++) {
207	<	earr[ihp->ns] = 8./5.;
208	<	earr[ihp->ns + hp->ns-1] = 8./5.;
207	>	earr[ihp->ns] = 6./5.;
208	>	earr[ihp->ns + hp->ns-1] = 6./5.;
209		}
210		for (j = 1; j < hp->ns-1; j++) {
211	<	earr[j] *= 8./5.;
212	<	earr[(hp->ns-1)hp->ns + j] = 8./5.;
211	>	earr[j] *= 6./5.;
212	>	earr[(hp->ns-1)hp->ns + j] = 6./5.;
213		}
214	+	/* blur map to reduce bias */
215	+	memcpy(earr+hp->nshp->ns, earr, hp->nshp->ns*sizeof(float));
216	+	for (i = 0; i < hp->ns-1; i++) {
217	+	float *ep2;
218	+	ep = earr + i*hp->ns;
219	+	ep2 = ep + hp->ns*hp->ns;
220	+	for (j = 0; j < hp->ns-1; j++, ep++, ep2++) {
221	+	ep[0] += .125(ep2[1] + ep2[hp->ns]) - .5ep2[0];
222	+	ep[1] += .125*ep2[0];
223	+	ep[hp->ns] += .125*ep2[0];
224	+	}
225	+	}
226		return(earr);
227		}
228
#	Line 177 \| Line 233 \| *ambsupersamp(AMBHEMI hp, int cnt)**
233		{
234		float *earr = getambdiffs(hp);
235		double e2rem = 0;
180	–	AMBSAMP *ap;
181	–	RAY ar;
236		float *ep;
237		int i, j, n, nss;
238
#	Line 188 \| Line 242 \| *ambsupersamp(AMBHEMI hp, int cnt)**
242		for (ep = earr + hp->ns*hp->ns; ep > earr; )
243		e2rem += *--ep;
244		ep = earr; /* perform super-sampling */
245	<	for (ap = hp->sa, i = 0; i < hp->ns; i++)
246	<	for (j = 0; j < hp->ns; j++, ap++) {
245	>	for (i = 0; i < hp->ns; i++)
246	>	for (j = 0; j < hp->ns; j++) {
247		if (e2rem <= FTINY)
248		goto done; /* nothing left to do */
249		nss = ep/e2remcnt + frandom();
250		for (n = 1; n <= nss && ambsample(hp,i,j,n); n++)
251	<	--cnt;
251	>	if (!--cnt) goto done;
252		e2rem -= ep++; / update remainder */
253		}
254		done:
#	Line 204 \| Line 258 \| done:
258
259		static AMBHEMI *
260		samp_hemi( /* sample indirect hemisphere */
261	<	COLOR rcol,
261	>	SCOLOR rcol,
262		RAY *r,
263		double wt
264		)
265		{
266	+	int backside = (wt < 0);
267		AMBHEMI *hp;
268		double d;
269		int n, i, j;
270	+	/* insignificance check */
271	+	d = sintens(rcol);
272	+	if (d <= FTINY)
273	+	return(NULL);
274		/* set number of divisions */
275	+	if (backside) wt = -wt;
276		if (ambacc <= FTINY &&
277	<	wt > (d = 0.8intens(rcol)r->rweight/(ambdiv*minweight)))
277	>	wt > (d = 0.8r->rweight/(ambdiv*minweight + 1e-20)))
278		wt = d; /* avoid ray termination */
279		n = sqrt(ambdiv * wt) + 0.5;
280	<	i = 1 + 5(ambacc > FTINY); / minimum number of samples */
281	<	if (n < i)
280	>	i = 1 + (MINADIV-1)*(ambacc > FTINY);
281	>	if (n < i) /* use minimum number of samples? */
282		n = i;
283		/* allocate sampling array */
284		hp = (AMBHEMI )malloc(sizeof(AMBHEMI) + sizeof(AMBSAMP)(n*n - 1));
285		if (hp == NULL)
286		error(SYSTEM, "out of memory in samp_hemi");
287	+
288	+	if (backside) {
289	+	hp->atyp = TAMBIENT;
290	+	hp->onrm[0] = -r->ron[0];
291	+	hp->onrm[1] = -r->ron[1];
292	+	hp->onrm[2] = -r->ron[2];
293	+	} else {
294	+	hp->atyp = RAMBIENT;
295	+	VCOPY(hp->onrm, r->ron);
296	+	}
297		hp->rp = r;
298		hp->ns = n;
299	<	hp->acol[RED] = hp->acol[GRN] = hp->acol[BLU] = 0.0;
299	>	scolorblack(hp->acol);
300		memset(hp->sa, 0, sizeof(AMBSAMP)nn);
301		hp->sampOK = 0;
302		/* assign coefficient */
303	<	copycolor(hp->acoef, rcol);
303	>	copyscolor(hp->acoef, rcol);
304		d = 1.0/(n*n);
305	<	scalecolor(hp->acoef, d);
305	>	scalescolor(hp->acoef, d);
306		/* make tangent plane axes */
307	<	hp->uy[0] = 0.5 - frandom();
238	<	hp->uy[1] = 0.5 - frandom();
239	<	hp->uy[2] = 0.5 - frandom();
240	<	for (i = 3; i--; )
241	<	if ((-0.6 < r->ron[i]) & (r->ron[i] < 0.6))
242	<	break;
243	<	if (i < 0)
307	>	if (!getperpendicular(hp->ux, hp->onrm, 1))
308		error(CONSISTENCY, "bad ray direction in samp_hemi");
309	<	hp->uy[i] = 1.0;
246	<	VCROSS(hp->ux, hp->uy, r->ron);
247	<	normalize(hp->ux);
248	<	VCROSS(hp->uy, r->ron, hp->ux);
309	>	VCROSS(hp->uy, hp->onrm, hp->ux);
310		/* sample divisions */
311		for (i = hp->ns; i--; )
312		for (j = hp->ns; j--; )
313		hp->sampOK += ambsample(hp, i, j, 0);
314	<	copycolor(rcol, hp->acol);
314	>	copyscolor(rcol, hp->acol);
315		if (!hp->sampOK) { /* utter failure? */
316		free(hp);
317		return(NULL);
#	Line 259 \| Line 320 \| *samp_hemi( / sample indirect hemisphere /*
320		hp->sampOK = -1; / soft failure */
321		return(hp);
322		}
323	+	if (hp->sampOK <= MINADIV*MINADIV)
324	+	return(hp); /* don't bother super-sampling */
325		n = ambssamp*wt + 0.5;
326	<	if (n > 8) { /* perform super-sampling? */
326	>	if (n >= 4hp->ns) { / perform super-sampling? */
327		ambsupersamp(hp, n);
328	<	copycolor(rcol, hp->acol);
328	>	copyscolor(rcol, hp->acol);
329		}
330		return(hp); /* all is well */
331		}
#	Line 274 \| Line 337 \| *back_ambval(AMBHEMI hp, const int n1, const int n2, c**
337		{
338		if (hp->sa[n1].d <= hp->sa[n2].d) {
339		if (hp->sa[n1].d <= hp->sa[n3].d)
340	<	return(colval(hp->sa[n1].v,CIEY));
341	<	return(colval(hp->sa[n3].v,CIEY));
340	>	return(hp->sa[n1].v[0]);
341	>	return(hp->sa[n3].v[0]);
342		}
343		if (hp->sa[n2].d <= hp->sa[n3].d)
344	<	return(colval(hp->sa[n2].v,CIEY));
345	<	return(colval(hp->sa[n3].v,CIEY));
344	>	return(hp->sa[n2].v[0]);
345	>	return(hp->sa[n3].v[0]);
346		}
347
348
#	Line 508 \| Line 571 \| *ambHessian( / anisotropic radii & pos. gradient /*
571		for (j = 0; j < hp->ns-1; j++) {
572		comp_fftri(&fftr, hp, AI(hp,0,j), AI(hp,0,j+1));
573		if (hessrow != NULL)
574	<	comp_hessian(hessrow[j], &fftr, hp->rp->ron);
574	>	comp_hessian(hessrow[j], &fftr, hp->onrm);
575		if (gradrow != NULL)
576	<	comp_gradient(gradrow[j], &fftr, hp->rp->ron);
576	>	comp_gradient(gradrow[j], &fftr, hp->onrm);
577		}
578		/* sum each row of triangles */
579		for (i = 0; i < hp->ns-1; i++) {
#	Line 518 \| Line 581 \| *ambHessian( / anisotropic radii & pos. gradient /*
581		FVECT gradcol;
582		comp_fftri(&fftr, hp, AI(hp,i,0), AI(hp,i+1,0));
583		if (hessrow != NULL)
584	<	comp_hessian(hesscol, &fftr, hp->rp->ron);
584	>	comp_hessian(hesscol, &fftr, hp->onrm);
585		if (gradrow != NULL)
586	<	comp_gradient(gradcol, &fftr, hp->rp->ron);
586	>	comp_gradient(gradcol, &fftr, hp->onrm);
587		for (j = 0; j < hp->ns-1; j++) {
588		FVECT hessdia[3]; /* compute triangle contributions */
589		FVECT graddia;
#	Line 530 \| Line 593 \| *ambHessian( / anisotropic radii & pos. gradient /*
593		/* diagonal (inner) edge */
594		comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j));
595		if (hessrow != NULL) {
596	<	comp_hessian(hessdia, &fftr, hp->rp->ron);
596	>	comp_hessian(hessdia, &fftr, hp->onrm);
597		rev_hessian(hesscol);
598		add2hessian(hessian, hessrow[j], hessdia, hesscol, backg);
599		}
600		if (gradrow != NULL) {
601	<	comp_gradient(graddia, &fftr, hp->rp->ron);
601	>	comp_gradient(graddia, &fftr, hp->onrm);
602		rev_gradient(gradcol);
603		add2gradient(gradient, gradrow[j], graddia, gradcol, backg);
604		}
605		/* initialize edge in next row */
606		comp_fftri(&fftr, hp, AI(hp,i+1,j+1), AI(hp,i+1,j));
607		if (hessrow != NULL)
608	<	comp_hessian(hessrow[j], &fftr, hp->rp->ron);
608	>	comp_hessian(hessrow[j], &fftr, hp->onrm);
609		if (gradrow != NULL)
610	<	comp_gradient(gradrow[j], &fftr, hp->rp->ron);
610	>	comp_gradient(gradrow[j], &fftr, hp->onrm);
611		/* new column edge & paired triangle */
612		backg = back_ambval(hp, AI(hp,i+1,j+1),
613		AI(hp,i+1,j), AI(hp,i,j+1));
614		comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j+1));
615		if (hessrow != NULL) {
616	<	comp_hessian(hesscol, &fftr, hp->rp->ron);
616	>	comp_hessian(hesscol, &fftr, hp->onrm);
617		rev_hessian(hessdia);
618		add2hessian(hessian, hessrow[j], hessdia, hesscol, backg);
619		if (i < hp->ns-2)
620		rev_hessian(hessrow[j]);
621		}
622		if (gradrow != NULL) {
623	<	comp_gradient(gradcol, &fftr, hp->rp->ron);
623	>	comp_gradient(gradcol, &fftr, hp->onrm);
624		rev_gradient(graddia);
625		add2gradient(gradient, gradrow[j], graddia, gradcol, backg);
626		if (i < hp->ns-2)
#	Line 593 \| Line 656 \| *ambdirgrad(AMBHEMI hp, FVECT uv[2], float dg[2])**
656		/* use vector for azimuth + 90deg */
657		VSUB(vd, ap->p, hp->rp->rop);
658		/* brightness over cosine factor */
659	<	gfact = colval(ap->v,CIEY) / DOT(hp->rp->ron, vd);
659	>	gfact = ap->v[0] / DOT(hp->onrm, vd);
660		/* sine = proj_radius/vd_length */
661		dgsum[0] -= DOT(uv[1], vd) * gfact;
662		dgsum[1] += DOT(uv[0], vd) * gfact;
#	Line 608 \| Line 671 \| static uint32
671		ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, const double r1)
672		{
673		const double max_d = 1.0/(minarad*ambacc + 0.001);
674	<	const double ang_res = 0.5*PI/(hp->ns-1);
675	<	const double ang_step = ang_res/((int)(16/PI*ang_res) + (1+FTINY));
674	>	const double ang_res = 0.5*PI/hp->ns;
675	>	const double ang_step = ang_res/((int)(16/PI*ang_res) + 1.01);
676		double avg_d = 0;
677		uint32 flgs = 0;
678		FVECT vec;
#	Line 617 \| Line 680 \| *ambcorral(AMBHEMI hp, FVECT uv[2], const double r0, c**
680		double ang, a1;
681		int i, j;
682		/* don't bother for a few samples */
683	<	if (hp->ns < 12)
683	>	if (hp->ns < 8)
684		return(0);
685		/* check distances overhead */
686		for (i = hp->ns*3/4; i-- > hp->ns>>2; )
#	Line 640 \| Line 703 \| *ambcorral(AMBHEMI hp, FVECT uv[2], const double r0, c**
703		if ((r0r0uu + r1r1vv) * ap->dap->d <= uu + v*v)
704		continue; /* occluder outside ellipse */
705		ang = atan2a(v, u); /* else set direction flags */
706	<	for (a1 = ang-.5ang_res; a1 <= ang+.5ang_res; a1 += ang_step)
706	>	for (a1 = ang-ang_res; a1 <= ang+ang_res; a1 += ang_step)
707		flgs \|= 1L<<(int)(16/PI(a1 + 2.PI*(a1 < 0)));
708		}
646	–	/* add low-angle incident (< 20deg) */
647	–	if (fabs(hp->rp->rod) <= 0.342) {
648	–	u = -DOT(hp->rp->rdir, uv[0]);
649	–	v = -DOT(hp->rp->rdir, uv[1]);
650	–	if ((r0r0uu + r1r1vv) > hp->rp->rot*hp->rp->rot) {
651	–	ang = atan2a(v, u);
652	–	ang += 2.PI(ang < 0);
653	–	ang *= 16/PI;
654	–	if ((ang < .5) \| (ang >= 31.5))
655	–	flgs \|= 0x80000001;
656	–	else
657	–	flgs \|= 3L<<(int)(ang-.5);
658	–	}
659	–	}
709		return(flgs);
710		}
711
712
713		int
714		doambient( /* compute ambient component */
715	<	COLOR rcol, /* input/output color */
715	>	SCOLOR rcol, /* input/output color */
716		RAY *r,
717	<	double wt,
717	>	double wt, /* negative for back side */
718		FVECT uv[2], /* returned (optional) */
719		float ra[2], /* returned (optional) */
720		float pg[2], /* returned (optional) */
#	Line 693 \| Line 742 \| *doambient( / compute ambient component /*
742		return(0);
743
744		if ((ra == NULL) & (pg == NULL) & (dg == NULL) \|\|
745	<	(hp->sampOK < 0) \| (hp->ns < 4)) {
745	>	(hp->sampOK < 0) \| (hp->ns < MINADIV)) {
746		free(hp); /* Hessian not requested/possible */
747		return(-1); /* value-only return value */
748		}
749	<	if ((d = bright(rcol)) > FTINY) { /* normalize Y values */
750	<	d = 0.99(hp->nshp->ns)/d;
749	>	if ((d = scolor_mean(rcol)) > FTINY) {
750	>	d = 0.99(hp->nshp->ns)/d; /* normalize avg. values */
751		K = 0.01;
752		} else { /* or fall back on geometric Hessian */
753		K = 1.0;
#	Line 706 \| Line 755 \| *doambient( / compute ambient component /*
755		dg = NULL;
756		crlp = NULL;
757		}
758	<	ap = hp->sa; /* relative Y channel from here on... */
758	>	ap = hp->sa; /* single channel from here on... */
759		for (i = hp->ns*hp->ns; i--; ap++)
760	<	colval(ap->v,CIEY) = bright(ap->v)*d + K;
760	>	ap->v[0] = scolor_mean(ap->v)*d + K;
761
762		if (uv == NULL) /* make sure we have axis pointers */
763		uv = my_uv;
#	Line 732 \| Line 781 \| *doambient( / compute ambient component /*
781		if (ra[1] < minarad)
782		ra[1] = minarad;
783		}
784	<	ra[0] *= d = 1.0/sqrt(wt);
784	>	ra[0] *= d = 1.0/sqrt(fabs(wt));
785		if ((ra[1] = d) > 2.0ra[0])
786		ra[1] = 2.0*ra[0];
787		if (ra[1] > maxarad) {
#	Line 741 \| Line 790 \| *doambient( / compute ambient component /*
790		ra[0] = maxarad;
791		}
792		/* flag encroached directions */
793	<	if ((wt >= 0.89*AVGREFL) & (crlp != NULL))
793	>	if (crlp != NULL) /* XXX doesn't update with changes to ambacc */
794		crlp = ambcorral(hp, uv, ra[0]ambacc, ra[1]*ambacc);
795		if (pg != NULL) { /* cap gradient if necessary */
796		d = pg[0]pg[0]ra[0]ra[0] + pg[1]pg[1]ra[1]ra[1];
#	Line 755 \| Line 804 \| *doambient( / compute ambient component /*
804		free(hp); /* clean up and return */
805		return(1);
806		}
758	–
759	–
760	–	#else /* ! NEWAMB */
761	–
762	–
763	–	void
764	–	inithemi( /* initialize sampling hemisphere */
765	–	AMBHEMI *hp,
766	–	COLOR ac,
767	–	RAY *r,
768	–	double wt
769	–	)
770	–	{
771	–	double d;
772	–	int i;
773	–	/* set number of divisions */
774	–	if (ambacc <= FTINY &&
775	–	wt > (d = 0.8intens(ac)r->rweight/(ambdiv*minweight)))
776	–	wt = d; /* avoid ray termination */
777	–	hp->nt = sqrt(ambdiv * wt / PI) + 0.5;
778	–	i = ambacc > FTINY ? 3 : 1; /* minimum number of samples */
779	–	if (hp->nt < i)
780	–	hp->nt = i;
781	–	hp->np = PI * hp->nt + 0.5;
782	–	/* set number of super-samples */
783	–	hp->ns = ambssamp * wt + 0.5;
784	–	/* assign coefficient */
785	–	copycolor(hp->acoef, ac);
786	–	d = 1.0/(hp->nt*hp->np);
787	–	scalecolor(hp->acoef, d);
788	–	/* make axes */
789	–	VCOPY(hp->uz, r->ron);
790	–	hp->uy[0] = hp->uy[1] = hp->uy[2] = 0.0;
791	–	for (i = 0; i < 3; i++)
792	–	if (hp->uz[i] < 0.6 && hp->uz[i] > -0.6)
793	–	break;
794	–	if (i >= 3)
795	–	error(CONSISTENCY, "bad ray direction in inithemi");
796	–	hp->uy[i] = 1.0;
797	–	fcross(hp->ux, hp->uy, hp->uz);
798	–	normalize(hp->ux);
799	–	fcross(hp->uy, hp->uz, hp->ux);
800	–	}
801	–
802	–
803	–	int
804	–	divsample( /* sample a division */
805	–	AMBSAMP *dp,
806	–	AMBHEMI *h,
807	–	RAY *r
808	–	)
809	–	{
810	–	RAY ar;
811	–	int hlist[3];
812	–	double spt[2];
813	–	double xd, yd, zd;
814	–	double b2;
815	–	double phi;
816	–	int i;
817	–	/* ambient coefficient for weight */
818	–	if (ambacc > FTINY)
819	–	setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
820	–	else
821	–	copycolor(ar.rcoef, h->acoef);
822	–	if (rayorigin(&ar, AMBIENT, r, ar.rcoef) < 0)
823	–	return(-1);
824	–	if (ambacc > FTINY) {
825	–	multcolor(ar.rcoef, h->acoef);
826	–	scalecolor(ar.rcoef, 1./AVGREFL);
827	–	}
828	–	hlist[0] = r->rno;
829	–	hlist[1] = dp->t;
830	–	hlist[2] = dp->p;
831	–	multisamp(spt, 2, urand(ilhash(hlist,3)+dp->n));
832	–	zd = sqrt((dp->t + spt[0])/h->nt);
833	–	phi = 2.0PI (dp->p + spt[1])/h->np;
834	–	xd = tcos(phi) * zd;
835	–	yd = tsin(phi) * zd;
836	–	zd = sqrt(1.0 - zd*zd);
837	–	for (i = 0; i < 3; i++)
838	–	ar.rdir[i] = xd*h->ux[i] +
839	–	yd*h->uy[i] +
840	–	zd*h->uz[i];
841	–	checknorm(ar.rdir);
842	–	dimlist[ndims++] = dp->t*h->np + dp->p + 90171;
843	–	rayvalue(&ar);
844	–	ndims--;
845	–	multcolor(ar.rcol, ar.rcoef); /* apply coefficient */
846	–	addcolor(dp->v, ar.rcol);
847	–	/* use rt to improve gradient calc */
848	–	if (ar.rt > FTINY && ar.rt < FHUGE)
849	–	dp->r += 1.0/ar.rt;
850	–	/* (re)initialize error */
851	–	if (dp->n++) {
852	–	b2 = bright(dp->v)/dp->n - bright(ar.rcol);
853	–	b2 = b2b2 + dp->k((dp->n-1)*(dp->n-1));
854	–	dp->k = b2/(dp->n*dp->n);
855	–	} else
856	–	dp->k = 0.0;
857	–	return(0);
858	–	}
859	–
860	–
861	–	static int
862	–	ambcmp( /* decreasing order */
863	–	const void *p1,
864	–	const void *p2
865	–	)
866	–	{
867	–	const AMBSAMP d1 = (const AMBSAMP )p1;
868	–	const AMBSAMP d2 = (const AMBSAMP )p2;
869	–
870	–	if (d1->k < d2->k)
871	–	return(1);
872	–	if (d1->k > d2->k)
873	–	return(-1);
874	–	return(0);
875	–	}
876	–
877	–
878	–	static int
879	–	ambnorm( /* standard order */
880	–	const void *p1,
881	–	const void *p2
882	–	)
883	–	{
884	–	const AMBSAMP d1 = (const AMBSAMP )p1;
885	–	const AMBSAMP d2 = (const AMBSAMP )p2;
886	–	int c;
887	–
888	–	if ( (c = d1->t - d2->t) )
889	–	return(c);
890	–	return(d1->p - d2->p);
891	–	}
892	–
893	–
894	–	double
895	–	doambient( /* compute ambient component */
896	–	COLOR rcol,
897	–	RAY *r,
898	–	double wt,
899	–	FVECT pg,
900	–	FVECT dg
901	–	)
902	–	{
903	–	double b, d=0;
904	–	AMBHEMI hemi;
905	–	AMBSAMP *div;
906	–	AMBSAMP dnew;
907	–	double acol[3];
908	–	AMBSAMP *dp;
909	–	double arad;
910	–	int divcnt;
911	–	int i, j;
912	–	/* initialize hemisphere */
913	–	inithemi(&hemi, rcol, r, wt);
914	–	divcnt = hemi.nt * hemi.np;
915	–	/* initialize */
916	–	if (pg != NULL)
917	–	pg[0] = pg[1] = pg[2] = 0.0;
918	–	if (dg != NULL)
919	–	dg[0] = dg[1] = dg[2] = 0.0;
920	–	setcolor(rcol, 0.0, 0.0, 0.0);
921	–	if (divcnt == 0)
922	–	return(0.0);
923	–	/* allocate super-samples */
924	–	if (hemi.ns > 0 \|\| pg != NULL \|\| dg != NULL) {
925	–	div = (AMBSAMP )malloc(divcntsizeof(AMBSAMP));
926	–	if (div == NULL)
927	–	error(SYSTEM, "out of memory in doambient");
928	–	} else
929	–	div = NULL;
930	–	/* sample the divisions */
931	–	arad = 0.0;
932	–	acol[0] = acol[1] = acol[2] = 0.0;
933	–	if ((dp = div) == NULL)
934	–	dp = &dnew;
935	–	divcnt = 0;
936	–	for (i = 0; i < hemi.nt; i++)
937	–	for (j = 0; j < hemi.np; j++) {
938	–	dp->t = i; dp->p = j;
939	–	setcolor(dp->v, 0.0, 0.0, 0.0);
940	–	dp->r = 0.0;
941	–	dp->n = 0;
942	–	if (divsample(dp, &hemi, r) < 0) {
943	–	if (div != NULL)
944	–	dp++;
945	–	continue;
946	–	}
947	–	arad += dp->r;
948	–	divcnt++;
949	–	if (div != NULL)
950	–	dp++;
951	–	else
952	–	addcolor(acol, dp->v);
953	–	}
954	–	if (!divcnt) {
955	–	if (div != NULL)
956	–	free((void *)div);
957	–	return(0.0); /* no samples taken */
958	–	}
959	–	if (divcnt < hemi.nt*hemi.np) {
960	–	pg = dg = NULL; /* incomplete sampling */
961	–	hemi.ns = 0;
962	–	} else if (arad > FTINY && divcnt/arad < minarad) {
963	–	hemi.ns = 0; /* close enough */
964	–	} else if (hemi.ns > 0) { /* else perform super-sampling? */
965	–	comperrs(div, &hemi); /* compute errors */
966	–	qsort(div, divcnt, sizeof(AMBSAMP), ambcmp); /* sort divs */
967	–	/* super-sample */
968	–	for (i = hemi.ns; i > 0; i--) {
969	–	dnew = *div;
970	–	if (divsample(&dnew, &hemi, r) < 0) {
971	–	dp++;
972	–	continue;
973	–	}
974	–	dp = div; /* reinsert */
975	–	j = divcnt < i ? divcnt : i;
976	–	while (--j > 0 && dnew.k < dp[1].k) {
977	–	dp = (dp+1);
978	–	dp++;
979	–	}
980	–	*dp = dnew;
981	–	}
982	–	if (pg != NULL \|\| dg != NULL) /* restore order */
983	–	qsort(div, divcnt, sizeof(AMBSAMP), ambnorm);
984	–	}
985	–	/* compute returned values */
986	–	if (div != NULL) {
987	–	arad = 0.0; /* note: divcnt may be < ntnp /
988	–	for (i = hemi.nt*hemi.np, dp = div; i-- > 0; dp++) {
989	–	arad += dp->r;
990	–	if (dp->n > 1) {
991	–	b = 1.0/dp->n;
992	–	scalecolor(dp->v, b);
993	–	dp->r *= b;
994	–	dp->n = 1;
995	–	}
996	–	addcolor(acol, dp->v);
997	–	}
998	–	b = bright(acol);
999	–	if (b > FTINY) {
1000	–	b = 1.0/b; /* compute & normalize gradient(s) */
1001	–	if (pg != NULL) {
1002	–	posgradient(pg, div, &hemi);
1003	–	for (i = 0; i < 3; i++)
1004	–	pg[i] *= b;
1005	–	}
1006	–	if (dg != NULL) {
1007	–	dirgradient(dg, div, &hemi);
1008	–	for (i = 0; i < 3; i++)
1009	–	dg[i] *= b;
1010	–	}
1011	–	}
1012	–	free((void *)div);
1013	–	}
1014	–	copycolor(rcol, acol);
1015	–	if (arad <= FTINY)
1016	–	arad = maxarad;
1017	–	else
1018	–	arad = (divcnt+hemi.ns)/arad;
1019	–	if (pg != NULL) { /* reduce radius if gradient large */
1020	–	d = DOT(pg,pg);
1021	–	if (daradarad > 1.0)
1022	–	arad = 1.0/sqrt(d);
1023	–	}
1024	–	if (arad < minarad) {
1025	–	arad = minarad;
1026	–	if (pg != NULL && daradarad > 1.0) { /* cap gradient */
1027	–	d = 1.0/arad/sqrt(d);
1028	–	for (i = 0; i < 3; i++)
1029	–	pg[i] *= d;
1030	–	}
1031	–	}
1032	–	if ((arad /= sqrt(wt)) > maxarad)
1033	–	arad = maxarad;
1034	–	return(arad);
1035	–	}
1036	–
1037	–
1038	–	void
1039	–	comperrs( /* compute initial error estimates */
1040	–	AMBSAMP da, / assumes standard ordering */
1041	–	AMBHEMI *hp
1042	–	)
1043	–	{
1044	–	double b, b2;
1045	–	int i, j;
1046	–	AMBSAMP *dp;
1047	–	/* sum differences from neighbors */
1048	–	dp = da;
1049	–	for (i = 0; i < hp->nt; i++)
1050	–	for (j = 0; j < hp->np; j++) {
1051	–	#ifdef DEBUG
1052	–	if (dp->t != i \|\| dp->p != j)
1053	–	error(CONSISTENCY,
1054	–	"division order in comperrs");
1055	–	#endif
1056	–	b = bright(dp[0].v);
1057	–	if (i > 0) { /* from above */
1058	–	b2 = bright(dp[-hp->np].v) - b;
1059	–	b2 = b2 0.25;
1060	–	dp[0].k += b2;
1061	–	dp[-hp->np].k += b2;
1062	–	}
1063	–	if (j > 0) { /* from behind */
1064	–	b2 = bright(dp[-1].v) - b;
1065	–	b2 = b2 0.25;
1066	–	dp[0].k += b2;
1067	–	dp[-1].k += b2;
1068	–	} else { /* around */
1069	–	b2 = bright(dp[hp->np-1].v) - b;
1070	–	b2 = b2 0.25;
1071	–	dp[0].k += b2;
1072	–	dp[hp->np-1].k += b2;
1073	–	}
1074	–	dp++;
1075	–	}
1076	–	/* divide by number of neighbors */
1077	–	dp = da;
1078	–	for (j = 0; j < hp->np; j++) /* top row */
1079	–	(dp++)->k *= 1.0/3.0;
1080	–	if (hp->nt < 2)
1081	–	return;
1082	–	for (i = 1; i < hp->nt-1; i++) /* central region */
1083	–	for (j = 0; j < hp->np; j++)
1084	–	(dp++)->k *= 0.25;
1085	–	for (j = 0; j < hp->np; j++) /* bottom row */
1086	–	(dp++)->k *= 1.0/3.0;
1087	–	}
1088	–
1089	–
1090	–	void
1091	–	posgradient( /* compute position gradient */
1092	–	FVECT gv,
1093	–	AMBSAMP da, / assumes standard ordering */
1094	–	AMBHEMI *hp
1095	–	)
1096	–	{
1097	–	int i, j;
1098	–	double nextsine, lastsine, b, d;
1099	–	double mag0, mag1;
1100	–	double phi, cosp, sinp, xd, yd;
1101	–	AMBSAMP *dp;
1102	–
1103	–	xd = yd = 0.0;
1104	–	for (j = 0; j < hp->np; j++) {
1105	–	dp = da + j;
1106	–	mag0 = mag1 = 0.0;
1107	–	lastsine = 0.0;
1108	–	for (i = 0; i < hp->nt; i++) {
1109	–	#ifdef DEBUG
1110	–	if (dp->t != i \|\| dp->p != j)
1111	–	error(CONSISTENCY,
1112	–	"division order in posgradient");
1113	–	#endif
1114	–	b = bright(dp->v);
1115	–	if (i > 0) {
1116	–	d = dp[-hp->np].r;
1117	–	if (dp[0].r > d) d = dp[0].r;
1118	–	/* sin(t)cos(t)^2 /
1119	–	d = lastsine (1.0 - (double)i/hp->nt);
1120	–	mag0 += d*(b - bright(dp[-hp->np].v));
1121	–	}
1122	–	nextsine = sqrt((double)(i+1)/hp->nt);
1123	–	if (j > 0) {
1124	–	d = dp[-1].r;
1125	–	if (dp[0].r > d) d = dp[0].r;
1126	–	mag1 += d * (nextsine - lastsine) *
1127	–	(b - bright(dp[-1].v));
1128	–	} else {
1129	–	d = dp[hp->np-1].r;
1130	–	if (dp[0].r > d) d = dp[0].r;
1131	–	mag1 += d * (nextsine - lastsine) *
1132	–	(b - bright(dp[hp->np-1].v));
1133	–	}
1134	–	dp += hp->np;
1135	–	lastsine = nextsine;
1136	–	}
1137	–	mag0 = 2.0PI / hp->np;
1138	–	phi = 2.0PI (double)j/hp->np;
1139	–	cosp = tcos(phi); sinp = tsin(phi);
1140	–	xd += mag0cosp - mag1sinp;
1141	–	yd += mag0sinp + mag1cosp;
1142	–	}
1143	–	for (i = 0; i < 3; i++)
1144	–	gv[i] = (xdhp->ux[i] + ydhp->uy[i])(hp->nthp->np)/PI;
1145	–	}
1146	–
1147	–
1148	–	void
1149	–	dirgradient( /* compute direction gradient */
1150	–	FVECT gv,
1151	–	AMBSAMP da, / assumes standard ordering */
1152	–	AMBHEMI *hp
1153	–	)
1154	–	{
1155	–	int i, j;
1156	–	double mag;
1157	–	double phi, xd, yd;
1158	–	AMBSAMP *dp;
1159	–
1160	–	xd = yd = 0.0;
1161	–	for (j = 0; j < hp->np; j++) {
1162	–	dp = da + j;
1163	–	mag = 0.0;
1164	–	for (i = 0; i < hp->nt; i++) {
1165	–	#ifdef DEBUG
1166	–	if (dp->t != i \|\| dp->p != j)
1167	–	error(CONSISTENCY,
1168	–	"division order in dirgradient");
1169	–	#endif
1170	–	/* tan(t) */
1171	–	mag += bright(dp->v)/sqrt(hp->nt/(i+.5) - 1.0);
1172	–	dp += hp->np;
1173	–	}
1174	–	phi = 2.0PI (j+.5)/hp->np + PI/2.0;
1175	–	xd += mag * tcos(phi);
1176	–	yd += mag * tsin(phi);
1177	–	}
1178	–	for (i = 0; i < 3; i++)
1179	–	gv[i] = xdhp->ux[i] + ydhp->uy[i];
1180	–	}
1181	–
1182	–	#endif /* ! NEWAMB */

Diff Legend

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

Comparing ray/src/rt/ambcomp.c (file contents): Revision 2.63 by greg, Thu Jun 19 16:26:55 2014 UTC vs. Revision 2.94 by greg, Wed Apr 17 17:34:11 2024 UTC

Diff Legend

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.63 by greg, Thu Jun 19 16:26:55 2014 UTC vs.
Revision 2.94 by greg, Wed Apr 17 17:34:11 2024 UTC