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

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.72 by greg, Wed Mar 16 15:43:04 2016 UTC vs.
Revision 2.100 by greg, Mon Apr 28 19:30:01 2025 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	>	#ifndef MINSDIST
28	>	#define MINSDIST 0.25 /* def. min. spacing = 1/4th division */
29	>	#endif
30
26	–	extern void SDsquare2disk(double ds[2], double seedx, double seedy);
27	–
31		typedef struct {
29	–	COLOR v; /* hemisphere sample value */
30	–	float d; /* reciprocal distance (1/rt) */
32		FVECT p; /* intersection point */
33	+	float d; /* reciprocal distance */
34	+	SCOLOR v; /* hemisphere sample value */
35		} AMBSAMP; /* sample value */
36
37		typedef struct {
38		RAY rp; / originating ray sample */
39		int ns; /* number of samples per axis */
40		int sampOK; /* acquired full sample set? */
41	<	COLOR acoef; /* division contribution coefficient */
42	<	double acol[3]; /* accumulated color */
41	>	int atyp; /* RAMBIENT or TAMBIENT */
42	>	SCOLOR acoef; /* division contribution coefficient */
43	>	SCOLOR acol; /* accumulated color */
44	>	FVECT onrm; /* oriented unperturbed surface normal */
45		FVECT ux, uy; /* tangent axis unit vectors */
46		AMBSAMP sa[1]; /* sample array (extends struct) */
47		} AMBHEMI; /* ambient sample hemisphere */
#	Line 51 \| Line 56 \| typedef struct {
56
57
58		static int
59	+	ambcollision( /* proposed direciton collides? */
60	+	AMBHEMI *hp,
61	+	int i,
62	+	int j,
63	+	FVECT dv
64	+	)
65	+	{
66	+	double cos_thresh;
67	+	int ii, jj;
68	+
69	+	cos_thresh = (PI*MINSDIST)/(double)hp->ns;
70	+	cos_thresh = 1. - .5cos_threshcos_thresh;
71	+	/* check existing neighbors */
72	+	for (ii = i-1; ii <= i+1; ii++) {
73	+	if (ii < 0) continue;
74	+	if (ii >= hp->ns) break;
75	+	for (jj = j-1; jj <= j+1; jj++) {
76	+	AMBSAMP *ap;
77	+	FVECT avec;
78	+	double dprod;
79	+	if (jj < 0) continue;
80	+	if (jj >= hp->ns) break;
81	+	if ((ii==i) & (jj==j)) continue;
82	+	ap = &ambsam(hp,ii,jj);
83	+	if (ap->d <= .5/FHUGE)
84	+	continue; /* no one home */
85	+	VSUB(avec, ap->p, hp->rp->rop);
86	+	dprod = DOT(avec, dv);
87	+	if (dprod >= cos_thresh*VLEN(avec))
88	+	return(1); /* collision */
89	+	}
90	+	}
91	+	return(0); /* nothing to worry about */
92	+	}
93	+
94	+
95	+	#define XLOTSIZ 251 /* size of used car lot */
96	+	#define CFIRST 0 /* first corner */
97	+	#define COTHER (CFIRST+4) /* non-corner sample */
98	+	#define CMAXTARGET (int)(XLOTSIZ*MINSDIST/(1-MINSDIST))
99	+	#define CXCOPY(d,s) (excharr[d][0]=excharr[s][0], excharr[d][1]=excharr[s][1])
100	+
101	+	static int
102	+	psample_class(double ss[2]) /* classify patch sample */
103	+	{
104	+	if (ss[0] < MINSDIST) {
105	+	if (ss[1] < MINSDIST)
106	+	return(CFIRST);
107	+	if (ss[1] > 1.-MINSDIST)
108	+	return(CFIRST+2);
109	+	} else if (ss[0] > 1.-MINSDIST) {
110	+	if (ss[1] < MINSDIST)
111	+	return(CFIRST+1);
112	+	if (ss[1] > 1.-MINSDIST)
113	+	return(CFIRST+3);
114	+	}
115	+	return(COTHER); /* not in a corner */
116	+	}
117	+
118	+	static void
119	+	trade_patchsamp(double ss[2]) /* trade in problem patch position */
120	+	{
121	+	static float excharr[XLOTSIZ][2];
122	+	static short gterm[COTHER+1];
123	+	double srep[2];
124	+	int sclass, rclass;
125	+	int x;
126	+	/* reset on corner overload */
127	+	if (gterm[COTHER-1] >= (CMAXTARGET+XLOTSIZ)/2)
128	+	memset(gterm, 0, sizeof(gterm));
129	+	/* (re-)initialize? */
130	+	while (gterm[COTHER] < XLOTSIZ) {
131	+	excharr[gterm[COTHER]][0] = frandom();
132	+	excharr[gterm[COTHER]][1] = frandom();
133	+	++gterm[COTHER];
134	+	} /* get trade-in candidate... */
135	+	sclass = psample_class(ss); /* submitted corner or not? */
136	+	switch (sclass) {
137	+	case COTHER: /* trade mid-edge with corner/any */
138	+	x = irandom( gterm[COTHER-1] > CMAXTARGET
139	+	? gterm[COTHER-1] : XLOTSIZ );
140	+	break;
141	+	case CFIRST: /* kick out of first corner */
142	+	x = gterm[CFIRST] + irandom(XLOTSIZ - gterm[CFIRST]);
143	+	break;
144	+	default: /* kick out of 2nd-4th corner */
145	+	x = irandom(XLOTSIZ - (gterm[sclass] - gterm[sclass-1]));
146	+	x += (x >= gterm[sclass-1])*(gterm[sclass] - gterm[sclass-1]);
147	+	break;
148	+	}
149	+	srep[0] = excharr[x][0]; /* save selected replacement (result) */
150	+	srep[1] = excharr[x][1];
151	+	/* identify replacement class */
152	+	for (rclass = CFIRST; rclass < COTHER; rclass++)
153	+	if (x < gterm[rclass])
154	+	break; /* repark to keep classes grouped */
155	+	while (rclass > sclass) { /* replacement group after submitted? */
156	+	CXCOPY(x, gterm[rclass-1]);
157	+	x = gterm[--rclass]++;
158	+	}
159	+	while (rclass < sclass) { /* replacement group before submitted? */
160	+	--gterm[rclass];
161	+	CXCOPY(x, gterm[rclass]);
162	+	x = gterm[rclass++];
163	+	}
164	+	excharr[x][0] = ss[0]; /* complete the trade-in */
165	+	excharr[x][1] = ss[1];
166	+	ss[0] = srep[0];
167	+	ss[1] = srep[1];
168	+	}
169	+
170	+	#undef CXCOPY
171	+	#undef XLOTSIZ
172	+	#undef COTHER
173	+	#undef CFIRST
174	+
175	+
176	+	static int
177		ambsample( /* initial ambient division sample */
178		AMBHEMI *hp,
179		int i,
#	Line 61 \| Line 184 \| *ambsample( / initial ambient division sample /*
184		AMBSAMP *ap = &ambsam(hp,i,j);
185		RAY ar;
186		int hlist[3], ii;
187	<	double spt[2], zd;
187	>	double ss[2];
188	>	RREAL spt[2];
189	>	double zd;
190		/* generate hemispherical sample */
191		/* ambient coefficient for weight */
192		if (ambacc > FTINY)
193	<	setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
193	>	setscolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
194		else
195	<	copycolor(ar.rcoef, hp->acoef);
196	<	if (rayorigin(&ar, AMBIENT, hp->rp, ar.rcoef) < 0)
195	>	copyscolor(ar.rcoef, hp->acoef);
196	>	if (rayorigin(&ar, hp->atyp, hp->rp, ar.rcoef) < 0)
197		return(0);
198		if (ambacc > FTINY) {
199	<	multcolor(ar.rcoef, hp->acoef);
200	<	scalecolor(ar.rcoef, 1./AVGREFL);
199	>	smultscolor(ar.rcoef, hp->acoef);
200	>	scalescolor(ar.rcoef, 1./AVGREFL);
201		}
202		hlist[0] = hp->rp->rno;
203	<	hlist[1] = j;
204	<	hlist[2] = i;
205	<	multisamp(spt, 2, urand(ilhash(hlist,3)+n));
206	<	/* avoid coincident samples */
207	<	if (!n && (0 < i) & (i < hp->ns-1) &&
83	<	(0 < j) & (j < hp->ns-1)) {
84	<	if ((spt[0] < 0.1) \| (spt[0] >= 0.9))
85	<	spt[0] = 0.1 + 0.8*frandom();
86	<	if ((spt[1] < 0.1) \| (spt[1] >= 0.9))
87	<	spt[1] = 0.1 + 0.8*frandom();
88	<	}
89	<	SDsquare2disk(spt, (j+spt[1])/hp->ns, (i+spt[0])/hp->ns);
203	>	hlist[1] = AI(hp,i,j);
204	>	hlist[2] = samplendx;
205	>	multisamp(ss, 2, urand(ilhash(hlist,3)+n));
206	>	patch_redo:
207	>	square2disk(spt, (j+ss[1])/hp->ns, (i+ss[0])/hp->ns);
208		zd = sqrt(1. - spt[0]spt[0] - spt[1]spt[1]);
209		for (ii = 3; ii--; )
210		ar.rdir[ii] = spt[0]*hp->ux[ii] +
211		spt[1]*hp->uy[ii] +
212	<	zd*hp->rp->ron[ii];
212	>	zd*hp->onrm[ii];
213		checknorm(ar.rdir);
214	+	/* avoid coincident samples */
215	+	if (!n & (hp->ns >= 4) && ambcollision(hp, i, j, ar.rdir)) {
216	+	trade_patchsamp(ss);
217	+	goto patch_redo;
218	+	}
219		dimlist[ndims++] = AI(hp,i,j) + 90171;
220		rayvalue(&ar); /* evaluate ray */
221		ndims--;
222	<	if (ar.rt <= FTINY)
222	>	zd = raydistance(&ar);
223	>	if (zd <= FTINY)
224		return(0); /* should never happen */
225	<	multcolor(ar.rcol, ar.rcoef); /* apply coefficient */
226	<	if (ar.rtap->d < 1.0) / new/closer distance? */
227	<	ap->d = 1.0/ar.rt;
225	>	smultscolor(ar.rcol, ar.rcoef); /* apply coefficient */
226	>	if (zdap->d < 1.0) / new/closer distance? */
227	>	ap->d = 1.0/zd;
228		if (!n) { /* record first vertex & value */
229	<	if (ar.rt > 10.0*thescene.cusize)
230	<	ar.rt = 10.0*thescene.cusize;
231	<	VSUM(ap->p, ar.rorg, ar.rdir, ar.rt);
232	<	copycolor(ap->v, ar.rcol);
229	>	if (zd > 10.0*thescene.cusize + 1000.)
230	>	zd = 10.0*thescene.cusize + 1000.;
231	>	VSUM(ap->p, ar.rorg, ar.rdir, zd);
232	>	copyscolor(ap->v, ar.rcol);
233		} else { /* else update recorded value */
234	<	hp->acol[RED] -= colval(ap->v,RED);
111	<	hp->acol[GRN] -= colval(ap->v,GRN);
112	<	hp->acol[BLU] -= colval(ap->v,BLU);
234	>	sopscolor(hp->acol, -=, ap->v);
235		zd = 1.0/(double)(n+1);
236	<	scalecolor(ar.rcol, zd);
236	>	scalescolor(ar.rcol, zd);
237		zd *= (double)n;
238	<	scalecolor(ap->v, zd);
239	<	addcolor(ap->v, ar.rcol);
238	>	scalescolor(ap->v, zd);
239	>	saddscolor(ap->v, ar.rcol);
240		}
241	<	addcolor(hp->acol, ap->v); /* add to our sum */
241	>	saddscolor(hp->acol, ap->v); /* add to our sum */
242		return(1);
243		}
244
245
246	<	/* Estimate errors based on ambient division differences */
246	>	/* Estimate variance based on ambient division differences */
247		static float *
248		getambdiffs(AMBHEMI *hp)
249		{
250	<	float earr = (float )calloc(hp->ns*hp->ns, sizeof(float));
250	>	const double normf = 1./(pbright(hp->acoef) + FTINY);
251	>	float earr = (float )calloc(2hp->nshp->ns, sizeof(float));
252		float *ep;
253		AMBSAMP *ap;
254	<	double b, d2;
254	>	double b, b1, d2;
255		int i, j;
256
257		if (earr == NULL) /* out of memory? */
258		return(NULL);
259	<	/* compute squared neighbor diffs */
260	<	for (ap = hp->sa, ep = earr, i = 0; i < hp->ns; i++)
259	>	/* sum squared neighbor diffs */
260	>	ap = hp->sa;
261	>	ep = earr + hp->nshp->ns; / original estimates to scratch */
262	>	for (i = 0; i < hp->ns; i++)
263		for (j = 0; j < hp->ns; j++, ap++, ep++) {
264	<	b = bright(ap[0].v);
264	>	b = pbright(ap[0].v);
265		if (i) { /* from above */
266	<	d2 = b - bright(ap[-hp->ns].v);
267	<	d2 *= d2;
266	>	b1 = pbright(ap[-hp->ns].v);
267	>	d2 = b - b1;
268	>	d2 = d2normf/(b + b1 + FTINY);
269		ep[0] += d2;
270		ep[-hp->ns] += d2;
271		}
272		if (!j) continue;
273		/* from behind */
274	<	d2 = b - bright(ap[-1].v);
275	<	d2 *= d2;
274	>	b1 = pbright(ap[-1].v);
275	>	d2 = b - b1;
276	>	d2 = d2normf/(b + b1 + FTINY);
277		ep[0] += d2;
278		ep[-1] += d2;
279		if (!i) continue;
280		/* diagonal */
281	<	d2 = b - bright(ap[-hp->ns-1].v);
282	<	d2 *= d2;
281	>	b1 = pbright(ap[-hp->ns-1].v);
282	>	d2 = b - b1;
283	>	d2 = d2normf/(b + b1 + FTINY);
284		ep[0] += d2;
285		ep[-hp->ns-1] += d2;
286		}
287		/* correct for number of neighbors */
288	<	earr[0] *= 8./3.;
289	<	earr[hp->ns-1] *= 8./3.;
290	<	earr[(hp->ns-1)hp->ns] = 8./3.;
291	<	earr[(hp->ns-1)hp->ns + hp->ns-1] = 8./3.;
288	>	ep = earr + hp->ns*hp->ns;
289	>	ep[0] *= 6./3.;
290	>	ep[hp->ns-1] *= 6./3.;
291	>	ep[(hp->ns-1)hp->ns] = 6./3.;
292	>	ep[(hp->ns-1)hp->ns + hp->ns-1] = 6./3.;
293		for (i = 1; i < hp->ns-1; i++) {
294	<	earr[ihp->ns] = 8./5.;
295	<	earr[ihp->ns + hp->ns-1] = 8./5.;
294	>	ep[ihp->ns] = 6./5.;
295	>	ep[ihp->ns + hp->ns-1] = 6./5.;
296		}
297		for (j = 1; j < hp->ns-1; j++) {
298	<	earr[j] *= 8./5.;
299	<	earr[(hp->ns-1)hp->ns + j] = 8./5.;
298	>	ep[j] *= 6./5.;
299	>	ep[(hp->ns-1)hp->ns + j] = 6./5.;
300		}
301	+	/* blur final map to reduce bias */
302	+	for (i = 0; i < hp->ns-1; i++) {
303	+	float *ep2;
304	+	ep = earr + i*hp->ns;
305	+	ep2 = ep + hp->ns*hp->ns;
306	+	for (j = 0; j < hp->ns-1; j++, ep++, ep2++) {
307	+	ep[0] += .5ep2[0] + .125(ep2[1] + ep2[hp->ns]);
308	+	ep[1] += .125*ep2[0];
309	+	ep[hp->ns] += .125*ep2[0];
310	+	}
311	+	}
312		return(earr);
313		}
314
#	Line 179 \| Line 319 \| *ambsupersamp(AMBHEMI hp, int cnt)**
319		{
320		float *earr = getambdiffs(hp);
321		double e2rem = 0;
182	–	AMBSAMP *ap;
322		float *ep;
323		int i, j, n, nss;
324
#	Line 189 \| Line 328 \| *ambsupersamp(AMBHEMI hp, int cnt)**
328		for (ep = earr + hp->ns*hp->ns; ep > earr; )
329		e2rem += *--ep;
330		ep = earr; /* perform super-sampling */
331	<	for (ap = hp->sa, i = 0; i < hp->ns; i++)
332	<	for (j = 0; j < hp->ns; j++, ap++) {
331	>	for (i = 0; i < hp->ns; i++)
332	>	for (j = 0; j < hp->ns; j++) {
333		if (e2rem <= FTINY)
334		goto done; /* nothing left to do */
335		nss = ep/e2remcnt + frandom();
336		for (n = 1; n <= nss && ambsample(hp,i,j,n); n++)
337	<	--cnt;
337	>	if (!--cnt) goto done;
338		e2rem -= ep++; / update remainder */
339		}
340		done:
#	Line 205 \| Line 344 \| done:
344
345		static AMBHEMI *
346		samp_hemi( /* sample indirect hemisphere */
347	<	COLOR rcol,
347	>	SCOLOR rcol,
348		RAY *r,
349		double wt
350		)
351		{
352	+	int backside = (wt < 0);
353		AMBHEMI *hp;
354		double d;
355		int n, i, j;
356	+	/* insignificance check */
357	+	d = sintens(rcol);
358	+	if (d <= FTINY)
359	+	return(NULL);
360		/* set number of divisions */
361	+	if (backside) wt = -wt;
362		if (ambacc <= FTINY &&
363	<	wt > (d = 0.8intens(rcol)r->rweight/(ambdiv*minweight)))
363	>	wt > (d = 0.8r->rweight/(ambdiv*minweight + 1e-20)))
364		wt = d; /* avoid ray termination */
365		n = sqrt(ambdiv * wt) + 0.5;
366	<	i = 1 + 5(ambacc > FTINY); / minimum number of samples */
367	<	if (n < i)
366	>	i = 1 + (MINADIV-1)*(ambacc > FTINY);
367	>	if (n < i) /* use minimum number of samples? */
368		n = i;
369		/* allocate sampling array */
370		hp = (AMBHEMI )malloc(sizeof(AMBHEMI) + sizeof(AMBSAMP)(n*n - 1));
371		if (hp == NULL)
372		error(SYSTEM, "out of memory in samp_hemi");
373	+
374	+	if (backside) {
375	+	hp->atyp = TAMBIENT;
376	+	hp->onrm[0] = -r->ron[0];
377	+	hp->onrm[1] = -r->ron[1];
378	+	hp->onrm[2] = -r->ron[2];
379	+	} else {
380	+	hp->atyp = RAMBIENT;
381	+	VCOPY(hp->onrm, r->ron);
382	+	}
383		hp->rp = r;
384		hp->ns = n;
385	<	hp->acol[RED] = hp->acol[GRN] = hp->acol[BLU] = 0.0;
385	>	scolorblack(hp->acol);
386		memset(hp->sa, 0, sizeof(AMBSAMP)nn);
387		hp->sampOK = 0;
388		/* assign coefficient */
389	<	copycolor(hp->acoef, rcol);
389	>	copyscolor(hp->acoef, rcol);
390		d = 1.0/(n*n);
391	<	scalecolor(hp->acoef, d);
391	>	scalescolor(hp->acoef, d);
392		/* make tangent plane axes */
393	<	if (!getperpendicular(hp->ux, r->ron, 1))
393	>	if (!getperpendicular(hp->ux, hp->onrm, 1))
394		error(CONSISTENCY, "bad ray direction in samp_hemi");
395	<	VCROSS(hp->uy, r->ron, hp->ux);
395	>	VCROSS(hp->uy, hp->onrm, hp->ux);
396		/* sample divisions */
397		for (i = hp->ns; i--; )
398		for (j = hp->ns; j--; )
399		hp->sampOK += ambsample(hp, i, j, 0);
400	<	copycolor(rcol, hp->acol);
400	>	copyscolor(rcol, hp->acol);
401		if (!hp->sampOK) { /* utter failure? */
402		free(hp);
403		return(NULL);
#	Line 251 \| Line 406 \| *samp_hemi( / sample indirect hemisphere /*
406		hp->sampOK = -1; / soft failure */
407		return(hp);
408		}
409	+	if (hp->sampOK <= MINADIV*MINADIV)
410	+	return(hp); /* don't bother super-sampling */
411		n = ambssamp*wt + 0.5;
412	<	if (n > 8) { /* perform super-sampling? */
412	>	if (n >= 4hp->ns) { / perform super-sampling? */
413		ambsupersamp(hp, n);
414	<	copycolor(rcol, hp->acol);
414	>	copyscolor(rcol, hp->acol);
415		}
416		return(hp); /* all is well */
417		}
#	Line 266 \| Line 423 \| *back_ambval(AMBHEMI hp, const int n1, const int n2, c**
423		{
424		if (hp->sa[n1].d <= hp->sa[n2].d) {
425		if (hp->sa[n1].d <= hp->sa[n3].d)
426	<	return(colval(hp->sa[n1].v,CIEY));
427	<	return(colval(hp->sa[n3].v,CIEY));
426	>	return(hp->sa[n1].v[0]);
427	>	return(hp->sa[n3].v[0]);
428		}
429		if (hp->sa[n2].d <= hp->sa[n3].d)
430	<	return(colval(hp->sa[n2].v,CIEY));
431	<	return(colval(hp->sa[n3].v,CIEY));
430	>	return(hp->sa[n2].v[0]);
431	>	return(hp->sa[n3].v[0]);
432		}
433
434
#	Line 500 \| Line 657 \| *ambHessian( / anisotropic radii & pos. gradient /*
657		for (j = 0; j < hp->ns-1; j++) {
658		comp_fftri(&fftr, hp, AI(hp,0,j), AI(hp,0,j+1));
659		if (hessrow != NULL)
660	<	comp_hessian(hessrow[j], &fftr, hp->rp->ron);
660	>	comp_hessian(hessrow[j], &fftr, hp->onrm);
661		if (gradrow != NULL)
662	<	comp_gradient(gradrow[j], &fftr, hp->rp->ron);
662	>	comp_gradient(gradrow[j], &fftr, hp->onrm);
663		}
664		/* sum each row of triangles */
665		for (i = 0; i < hp->ns-1; i++) {
#	Line 510 \| Line 667 \| *ambHessian( / anisotropic radii & pos. gradient /*
667		FVECT gradcol;
668		comp_fftri(&fftr, hp, AI(hp,i,0), AI(hp,i+1,0));
669		if (hessrow != NULL)
670	<	comp_hessian(hesscol, &fftr, hp->rp->ron);
670	>	comp_hessian(hesscol, &fftr, hp->onrm);
671		if (gradrow != NULL)
672	<	comp_gradient(gradcol, &fftr, hp->rp->ron);
672	>	comp_gradient(gradcol, &fftr, hp->onrm);
673		for (j = 0; j < hp->ns-1; j++) {
674		FVECT hessdia[3]; /* compute triangle contributions */
675		FVECT graddia;
#	Line 522 \| Line 679 \| *ambHessian( / anisotropic radii & pos. gradient /*
679		/* diagonal (inner) edge */
680		comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j));
681		if (hessrow != NULL) {
682	<	comp_hessian(hessdia, &fftr, hp->rp->ron);
682	>	comp_hessian(hessdia, &fftr, hp->onrm);
683		rev_hessian(hesscol);
684		add2hessian(hessian, hessrow[j], hessdia, hesscol, backg);
685		}
686		if (gradrow != NULL) {
687	<	comp_gradient(graddia, &fftr, hp->rp->ron);
687	>	comp_gradient(graddia, &fftr, hp->onrm);
688		rev_gradient(gradcol);
689		add2gradient(gradient, gradrow[j], graddia, gradcol, backg);
690		}
691		/* initialize edge in next row */
692		comp_fftri(&fftr, hp, AI(hp,i+1,j+1), AI(hp,i+1,j));
693		if (hessrow != NULL)
694	<	comp_hessian(hessrow[j], &fftr, hp->rp->ron);
694	>	comp_hessian(hessrow[j], &fftr, hp->onrm);
695		if (gradrow != NULL)
696	<	comp_gradient(gradrow[j], &fftr, hp->rp->ron);
696	>	comp_gradient(gradrow[j], &fftr, hp->onrm);
697		/* new column edge & paired triangle */
698		backg = back_ambval(hp, AI(hp,i+1,j+1),
699		AI(hp,i+1,j), AI(hp,i,j+1));
700		comp_fftri(&fftr, hp, AI(hp,i,j+1), AI(hp,i+1,j+1));
701		if (hessrow != NULL) {
702	<	comp_hessian(hesscol, &fftr, hp->rp->ron);
702	>	comp_hessian(hesscol, &fftr, hp->onrm);
703		rev_hessian(hessdia);
704		add2hessian(hessian, hessrow[j], hessdia, hesscol, backg);
705		if (i < hp->ns-2)
706		rev_hessian(hessrow[j]);
707		}
708		if (gradrow != NULL) {
709	<	comp_gradient(gradcol, &fftr, hp->rp->ron);
709	>	comp_gradient(gradcol, &fftr, hp->onrm);
710		rev_gradient(graddia);
711		add2gradient(gradient, gradrow[j], graddia, gradcol, backg);
712		if (i < hp->ns-2)
#	Line 585 \| Line 742 \| *ambdirgrad(AMBHEMI hp, FVECT uv[2], float dg[2])**
742		/* use vector for azimuth + 90deg */
743		VSUB(vd, ap->p, hp->rp->rop);
744		/* brightness over cosine factor */
745	<	gfact = colval(ap->v,CIEY) / DOT(hp->rp->ron, vd);
745	>	gfact = ap->v[0] / DOT(hp->onrm, vd);
746		/* sine = proj_radius/vd_length */
747		dgsum[0] -= DOT(uv[1], vd) * gfact;
748		dgsum[1] += DOT(uv[0], vd) * gfact;
#	Line 635 \| Line 792 \| *ambcorral(AMBHEMI hp, FVECT uv[2], const double r0, c**
792		for (a1 = ang-ang_res; a1 <= ang+ang_res; a1 += ang_step)
793		flgs \|= 1L<<(int)(16/PI(a1 + 2.PI*(a1 < 0)));
794		}
638	–	/* add low-angle incident (< 20deg) */
639	–	if (fabs(hp->rp->rod) <= 0.342) {
640	–	u = -DOT(hp->rp->rdir, uv[0]);
641	–	v = -DOT(hp->rp->rdir, uv[1]);
642	–	if ((r0r0uu + r1r1vv) > hp->rp->rot*hp->rp->rot) {
643	–	ang = atan2a(v, u);
644	–	ang += 2.PI(ang < 0);
645	–	ang *= 16/PI;
646	–	if ((ang < .5) \| (ang >= 31.5))
647	–	flgs \|= 0x80000001;
648	–	else
649	–	flgs \|= 3L<<(int)(ang-.5);
650	–	}
651	–	}
795		return(flgs);
796		}
797
798
799		int
800		doambient( /* compute ambient component */
801	<	COLOR rcol, /* input/output color */
801	>	SCOLOR rcol, /* input/output color */
802		RAY *r,
803	<	double wt,
803	>	double wt, /* negative for back side */
804		FVECT uv[2], /* returned (optional) */
805		float ra[2], /* returned (optional) */
806		float pg[2], /* returned (optional) */
#	Line 685 \| Line 828 \| *doambient( / compute ambient component /*
828		return(0);
829
830		if ((ra == NULL) & (pg == NULL) & (dg == NULL) \|\|
831	<	(hp->sampOK < 0) \| (hp->ns < 6)) {
831	>	(hp->sampOK < 0) \| (hp->ns < MINADIV)) {
832		free(hp); /* Hessian not requested/possible */
833		return(-1); /* value-only return value */
834		}
835	<	if ((d = bright(rcol)) > FTINY) { /* normalize Y values */
836	<	d = 0.99(hp->nshp->ns)/d;
835	>	if ((d = scolor_mean(rcol)) > FTINY) {
836	>	d = 0.99(hp->nshp->ns)/d; /* normalize avg. values */
837		K = 0.01;
838		} else { /* or fall back on geometric Hessian */
839		K = 1.0;
#	Line 698 \| Line 841 \| *doambient( / compute ambient component /*
841		dg = NULL;
842		crlp = NULL;
843		}
844	<	ap = hp->sa; /* relative Y channel from here on... */
844	>	ap = hp->sa; /* single channel from here on... */
845		for (i = hp->ns*hp->ns; i--; ap++)
846	<	colval(ap->v,CIEY) = bright(ap->v)*d + K;
846	>	ap->v[0] = scolor_mean(ap->v)*d + K;
847
848		if (uv == NULL) /* make sure we have axis pointers */
849		uv = my_uv;
#	Line 724 \| Line 867 \| *doambient( / compute ambient component /*
867		if (ra[1] < minarad)
868		ra[1] = minarad;
869		}
870	<	ra[0] *= d = 1.0/sqrt(wt);
870	>	ra[0] *= d = 1.0/sqrt(fabs(wt));
871		if ((ra[1] = d) > 2.0ra[0])
872		ra[1] = 2.0*ra[0];
873		if (ra[1] > maxarad) {
#	Line 733 \| Line 876 \| *doambient( / compute ambient component /*
876		ra[0] = maxarad;
877		}
878		/* flag encroached directions */
879	<	if (crlp != NULL)
879	>	if (crlp != NULL) /* XXX doesn't update with changes to ambacc */
880		crlp = ambcorral(hp, uv, ra[0]ambacc, ra[1]*ambacc);
881		if (pg != NULL) { /* cap gradient if necessary */
882		d = pg[0]pg[0]ra[0]ra[0] + pg[1]pg[1]ra[1]ra[1];
#	Line 747 \| Line 890 \| *doambient( / compute ambient component /*
890		free(hp); /* clean up and return */
891		return(1);
892		}
750	–
751	–
752	–	#else /* ! NEWAMB */
753	–
754	–
755	–	void
756	–	inithemi( /* initialize sampling hemisphere */
757	–	AMBHEMI *hp,
758	–	COLOR ac,
759	–	RAY *r,
760	–	double wt
761	–	)
762	–	{
763	–	double d;
764	–	int i;
765	–	/* set number of divisions */
766	–	if (ambacc <= FTINY &&
767	–	wt > (d = 0.8intens(ac)r->rweight/(ambdiv*minweight)))
768	–	wt = d; /* avoid ray termination */
769	–	hp->nt = sqrt(ambdiv * wt / PI) + 0.5;
770	–	i = ambacc > FTINY ? 3 : 1; /* minimum number of samples */
771	–	if (hp->nt < i)
772	–	hp->nt = i;
773	–	hp->np = PI * hp->nt + 0.5;
774	–	/* set number of super-samples */
775	–	hp->ns = ambssamp * wt + 0.5;
776	–	/* assign coefficient */
777	–	copycolor(hp->acoef, ac);
778	–	d = 1.0/(hp->nt*hp->np);
779	–	scalecolor(hp->acoef, d);
780	–	/* make axes */
781	–	VCOPY(hp->uz, r->ron);
782	–	hp->uy[0] = hp->uy[1] = hp->uy[2] = 0.0;
783	–	for (i = 0; i < 3; i++)
784	–	if (hp->uz[i] < 0.6 && hp->uz[i] > -0.6)
785	–	break;
786	–	if (i >= 3)
787	–	error(CONSISTENCY, "bad ray direction in inithemi");
788	–	hp->uy[i] = 1.0;
789	–	fcross(hp->ux, hp->uy, hp->uz);
790	–	normalize(hp->ux);
791	–	fcross(hp->uy, hp->uz, hp->ux);
792	–	}
793	–
794	–
795	–	int
796	–	divsample( /* sample a division */
797	–	AMBSAMP *dp,
798	–	AMBHEMI *h,
799	–	RAY *r
800	–	)
801	–	{
802	–	RAY ar;
803	–	int hlist[3];
804	–	double spt[2];
805	–	double xd, yd, zd;
806	–	double b2;
807	–	double phi;
808	–	int i;
809	–	/* ambient coefficient for weight */
810	–	if (ambacc > FTINY)
811	–	setcolor(ar.rcoef, AVGREFL, AVGREFL, AVGREFL);
812	–	else
813	–	copycolor(ar.rcoef, h->acoef);
814	–	if (rayorigin(&ar, AMBIENT, r, ar.rcoef) < 0)
815	–	return(-1);
816	–	if (ambacc > FTINY) {
817	–	multcolor(ar.rcoef, h->acoef);
818	–	scalecolor(ar.rcoef, 1./AVGREFL);
819	–	}
820	–	hlist[0] = r->rno;
821	–	hlist[1] = dp->t;
822	–	hlist[2] = dp->p;
823	–	multisamp(spt, 2, urand(ilhash(hlist,3)+dp->n));
824	–	zd = sqrt((dp->t + spt[0])/h->nt);
825	–	phi = 2.0PI (dp->p + spt[1])/h->np;
826	–	xd = tcos(phi) * zd;
827	–	yd = tsin(phi) * zd;
828	–	zd = sqrt(1.0 - zd*zd);
829	–	for (i = 0; i < 3; i++)
830	–	ar.rdir[i] = xd*h->ux[i] +
831	–	yd*h->uy[i] +
832	–	zd*h->uz[i];
833	–	checknorm(ar.rdir);
834	–	dimlist[ndims++] = dp->t*h->np + dp->p + 90171;
835	–	rayvalue(&ar);
836	–	ndims--;
837	–	multcolor(ar.rcol, ar.rcoef); /* apply coefficient */
838	–	addcolor(dp->v, ar.rcol);
839	–	/* use rt to improve gradient calc */
840	–	if (ar.rt > FTINY && ar.rt < FHUGE)
841	–	dp->r += 1.0/ar.rt;
842	–	/* (re)initialize error */
843	–	if (dp->n++) {
844	–	b2 = bright(dp->v)/dp->n - bright(ar.rcol);
845	–	b2 = b2b2 + dp->k((dp->n-1)*(dp->n-1));
846	–	dp->k = b2/(dp->n*dp->n);
847	–	} else
848	–	dp->k = 0.0;
849	–	return(0);
850	–	}
851	–
852	–
853	–	static int
854	–	ambcmp( /* decreasing order */
855	–	const void *p1,
856	–	const void *p2
857	–	)
858	–	{
859	–	const AMBSAMP d1 = (const AMBSAMP )p1;
860	–	const AMBSAMP d2 = (const AMBSAMP )p2;
861	–
862	–	if (d1->k < d2->k)
863	–	return(1);
864	–	if (d1->k > d2->k)
865	–	return(-1);
866	–	return(0);
867	–	}
868	–
869	–
870	–	static int
871	–	ambnorm( /* standard order */
872	–	const void *p1,
873	–	const void *p2
874	–	)
875	–	{
876	–	const AMBSAMP d1 = (const AMBSAMP )p1;
877	–	const AMBSAMP d2 = (const AMBSAMP )p2;
878	–	int c;
879	–
880	–	if ( (c = d1->t - d2->t) )
881	–	return(c);
882	–	return(d1->p - d2->p);
883	–	}
884	–
885	–
886	–	double
887	–	doambient( /* compute ambient component */
888	–	COLOR rcol,
889	–	RAY *r,
890	–	double wt,
891	–	FVECT pg,
892	–	FVECT dg
893	–	)
894	–	{
895	–	double b, d=0;
896	–	AMBHEMI hemi;
897	–	AMBSAMP *div;
898	–	AMBSAMP dnew;
899	–	double acol[3];
900	–	AMBSAMP *dp;
901	–	double arad;
902	–	int divcnt;
903	–	int i, j;
904	–	/* initialize hemisphere */
905	–	inithemi(&hemi, rcol, r, wt);
906	–	divcnt = hemi.nt * hemi.np;
907	–	/* initialize */
908	–	if (pg != NULL)
909	–	pg[0] = pg[1] = pg[2] = 0.0;
910	–	if (dg != NULL)
911	–	dg[0] = dg[1] = dg[2] = 0.0;
912	–	setcolor(rcol, 0.0, 0.0, 0.0);
913	–	if (divcnt == 0)
914	–	return(0.0);
915	–	/* allocate super-samples */
916	–	if (hemi.ns > 0 \|\| pg != NULL \|\| dg != NULL) {
917	–	div = (AMBSAMP )malloc(divcntsizeof(AMBSAMP));
918	–	if (div == NULL)
919	–	error(SYSTEM, "out of memory in doambient");
920	–	} else
921	–	div = NULL;
922	–	/* sample the divisions */
923	–	arad = 0.0;
924	–	acol[0] = acol[1] = acol[2] = 0.0;
925	–	if ((dp = div) == NULL)
926	–	dp = &dnew;
927	–	divcnt = 0;
928	–	for (i = 0; i < hemi.nt; i++)
929	–	for (j = 0; j < hemi.np; j++) {
930	–	dp->t = i; dp->p = j;
931	–	setcolor(dp->v, 0.0, 0.0, 0.0);
932	–	dp->r = 0.0;
933	–	dp->n = 0;
934	–	if (divsample(dp, &hemi, r) < 0) {
935	–	if (div != NULL)
936	–	dp++;
937	–	continue;
938	–	}
939	–	arad += dp->r;
940	–	divcnt++;
941	–	if (div != NULL)
942	–	dp++;
943	–	else
944	–	addcolor(acol, dp->v);
945	–	}
946	–	if (!divcnt) {
947	–	if (div != NULL)
948	–	free((void *)div);
949	–	return(0.0); /* no samples taken */
950	–	}
951	–	if (divcnt < hemi.nt*hemi.np) {
952	–	pg = dg = NULL; /* incomplete sampling */
953	–	hemi.ns = 0;
954	–	} else if (arad > FTINY && divcnt/arad < minarad) {
955	–	hemi.ns = 0; /* close enough */
956	–	} else if (hemi.ns > 0) { /* else perform super-sampling? */
957	–	comperrs(div, &hemi); /* compute errors */
958	–	qsort(div, divcnt, sizeof(AMBSAMP), ambcmp); /* sort divs */
959	–	/* super-sample */
960	–	for (i = hemi.ns; i > 0; i--) {
961	–	dnew = *div;
962	–	if (divsample(&dnew, &hemi, r) < 0) {
963	–	dp++;
964	–	continue;
965	–	}
966	–	dp = div; /* reinsert */
967	–	j = divcnt < i ? divcnt : i;
968	–	while (--j > 0 && dnew.k < dp[1].k) {
969	–	dp = (dp+1);
970	–	dp++;
971	–	}
972	–	*dp = dnew;
973	–	}
974	–	if (pg != NULL \|\| dg != NULL) /* restore order */
975	–	qsort(div, divcnt, sizeof(AMBSAMP), ambnorm);
976	–	}
977	–	/* compute returned values */
978	–	if (div != NULL) {
979	–	arad = 0.0; /* note: divcnt may be < ntnp /
980	–	for (i = hemi.nt*hemi.np, dp = div; i-- > 0; dp++) {
981	–	arad += dp->r;
982	–	if (dp->n > 1) {
983	–	b = 1.0/dp->n;
984	–	scalecolor(dp->v, b);
985	–	dp->r *= b;
986	–	dp->n = 1;
987	–	}
988	–	addcolor(acol, dp->v);
989	–	}
990	–	b = bright(acol);
991	–	if (b > FTINY) {
992	–	b = 1.0/b; /* compute & normalize gradient(s) */
993	–	if (pg != NULL) {
994	–	posgradient(pg, div, &hemi);
995	–	for (i = 0; i < 3; i++)
996	–	pg[i] *= b;
997	–	}
998	–	if (dg != NULL) {
999	–	dirgradient(dg, div, &hemi);
1000	–	for (i = 0; i < 3; i++)
1001	–	dg[i] *= b;
1002	–	}
1003	–	}
1004	–	free((void *)div);
1005	–	}
1006	–	copycolor(rcol, acol);
1007	–	if (arad <= FTINY)
1008	–	arad = maxarad;
1009	–	else
1010	–	arad = (divcnt+hemi.ns)/arad;
1011	–	if (pg != NULL) { /* reduce radius if gradient large */
1012	–	d = DOT(pg,pg);
1013	–	if (daradarad > 1.0)
1014	–	arad = 1.0/sqrt(d);
1015	–	}
1016	–	if (arad < minarad) {
1017	–	arad = minarad;
1018	–	if (pg != NULL && daradarad > 1.0) { /* cap gradient */
1019	–	d = 1.0/arad/sqrt(d);
1020	–	for (i = 0; i < 3; i++)
1021	–	pg[i] *= d;
1022	–	}
1023	–	}
1024	–	if ((arad /= sqrt(wt)) > maxarad)
1025	–	arad = maxarad;
1026	–	return(arad);
1027	–	}
1028	–
1029	–
1030	–	void
1031	–	comperrs( /* compute initial error estimates */
1032	–	AMBSAMP da, / assumes standard ordering */
1033	–	AMBHEMI *hp
1034	–	)
1035	–	{
1036	–	double b, b2;
1037	–	int i, j;
1038	–	AMBSAMP *dp;
1039	–	/* sum differences from neighbors */
1040	–	dp = da;
1041	–	for (i = 0; i < hp->nt; i++)
1042	–	for (j = 0; j < hp->np; j++) {
1043	–	#ifdef DEBUG
1044	–	if (dp->t != i \|\| dp->p != j)
1045	–	error(CONSISTENCY,
1046	–	"division order in comperrs");
1047	–	#endif
1048	–	b = bright(dp[0].v);
1049	–	if (i > 0) { /* from above */
1050	–	b2 = bright(dp[-hp->np].v) - b;
1051	–	b2 = b2 0.25;
1052	–	dp[0].k += b2;
1053	–	dp[-hp->np].k += b2;
1054	–	}
1055	–	if (j > 0) { /* from behind */
1056	–	b2 = bright(dp[-1].v) - b;
1057	–	b2 = b2 0.25;
1058	–	dp[0].k += b2;
1059	–	dp[-1].k += b2;
1060	–	} else { /* around */
1061	–	b2 = bright(dp[hp->np-1].v) - b;
1062	–	b2 = b2 0.25;
1063	–	dp[0].k += b2;
1064	–	dp[hp->np-1].k += b2;
1065	–	}
1066	–	dp++;
1067	–	}
1068	–	/* divide by number of neighbors */
1069	–	dp = da;
1070	–	for (j = 0; j < hp->np; j++) /* top row */
1071	–	(dp++)->k *= 1.0/3.0;
1072	–	if (hp->nt < 2)
1073	–	return;
1074	–	for (i = 1; i < hp->nt-1; i++) /* central region */
1075	–	for (j = 0; j < hp->np; j++)
1076	–	(dp++)->k *= 0.25;
1077	–	for (j = 0; j < hp->np; j++) /* bottom row */
1078	–	(dp++)->k *= 1.0/3.0;
1079	–	}
1080	–
1081	–
1082	–	void
1083	–	posgradient( /* compute position gradient */
1084	–	FVECT gv,
1085	–	AMBSAMP da, / assumes standard ordering */
1086	–	AMBHEMI *hp
1087	–	)
1088	–	{
1089	–	int i, j;
1090	–	double nextsine, lastsine, b, d;
1091	–	double mag0, mag1;
1092	–	double phi, cosp, sinp, xd, yd;
1093	–	AMBSAMP *dp;
1094	–
1095	–	xd = yd = 0.0;
1096	–	for (j = 0; j < hp->np; j++) {
1097	–	dp = da + j;
1098	–	mag0 = mag1 = 0.0;
1099	–	lastsine = 0.0;
1100	–	for (i = 0; i < hp->nt; i++) {
1101	–	#ifdef DEBUG
1102	–	if (dp->t != i \|\| dp->p != j)
1103	–	error(CONSISTENCY,
1104	–	"division order in posgradient");
1105	–	#endif
1106	–	b = bright(dp->v);
1107	–	if (i > 0) {
1108	–	d = dp[-hp->np].r;
1109	–	if (dp[0].r > d) d = dp[0].r;
1110	–	/* sin(t)cos(t)^2 /
1111	–	d = lastsine (1.0 - (double)i/hp->nt);
1112	–	mag0 += d*(b - bright(dp[-hp->np].v));
1113	–	}
1114	–	nextsine = sqrt((double)(i+1)/hp->nt);
1115	–	if (j > 0) {
1116	–	d = dp[-1].r;
1117	–	if (dp[0].r > d) d = dp[0].r;
1118	–	mag1 += d * (nextsine - lastsine) *
1119	–	(b - bright(dp[-1].v));
1120	–	} else {
1121	–	d = dp[hp->np-1].r;
1122	–	if (dp[0].r > d) d = dp[0].r;
1123	–	mag1 += d * (nextsine - lastsine) *
1124	–	(b - bright(dp[hp->np-1].v));
1125	–	}
1126	–	dp += hp->np;
1127	–	lastsine = nextsine;
1128	–	}
1129	–	mag0 = 2.0PI / hp->np;
1130	–	phi = 2.0PI (double)j/hp->np;
1131	–	cosp = tcos(phi); sinp = tsin(phi);
1132	–	xd += mag0cosp - mag1sinp;
1133	–	yd += mag0sinp + mag1cosp;
1134	–	}
1135	–	for (i = 0; i < 3; i++)
1136	–	gv[i] = (xdhp->ux[i] + ydhp->uy[i])(hp->nthp->np)/PI;
1137	–	}
1138	–
1139	–
1140	–	void
1141	–	dirgradient( /* compute direction gradient */
1142	–	FVECT gv,
1143	–	AMBSAMP da, / assumes standard ordering */
1144	–	AMBHEMI *hp
1145	–	)
1146	–	{
1147	–	int i, j;
1148	–	double mag;
1149	–	double phi, xd, yd;
1150	–	AMBSAMP *dp;
1151	–
1152	–	xd = yd = 0.0;
1153	–	for (j = 0; j < hp->np; j++) {
1154	–	dp = da + j;
1155	–	mag = 0.0;
1156	–	for (i = 0; i < hp->nt; i++) {
1157	–	#ifdef DEBUG
1158	–	if (dp->t != i \|\| dp->p != j)
1159	–	error(CONSISTENCY,
1160	–	"division order in dirgradient");
1161	–	#endif
1162	–	/* tan(t) */
1163	–	mag += bright(dp->v)/sqrt(hp->nt/(i+.5) - 1.0);
1164	–	dp += hp->np;
1165	–	}
1166	–	phi = 2.0PI (j+.5)/hp->np + PI/2.0;
1167	–	xd += mag * tcos(phi);
1168	–	yd += mag * tsin(phi);
1169	–	}
1170	–	for (i = 0; i < 3; i++)
1171	–	gv[i] = xdhp->ux[i] + ydhp->uy[i];
1172	–	}
1173	–
1174	–	#endif /* ! NEWAMB */

Diff Legend

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

Comparing ray/src/rt/ambcomp.c (file contents): Revision 2.72 by greg, Wed Mar 16 15:43:04 2016 UTC vs. Revision 2.100 by greg, Mon Apr 28 19:30:01 2025 UTC

Diff Legend

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.72 by greg, Wed Mar 16 15:43:04 2016 UTC vs.
Revision 2.100 by greg, Mon Apr 28 19:30:01 2025 UTC