ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/ambcomp.c

Comparing ray/src/rt/ambcomp.c (file contents):
Revision 2.80 by greg, Wed Apr 11 17:05:59 2018 UTC vs.
Revision 2.84 by greg, Tue Feb 26 00:37:54 2019 UTC

#	Line 27 | Line 27 | extern void            SDsquare2disk(double ds[2], double seedx,
27
28		typedef struct {
29		COLOR   v;              /* hemisphere sample value */
30	<	float   d;              /* reciprocal distance (1/rt) */
30	>	float   d;              /* reciprocal distance */
31		FVECT   p;              /* intersection point */
32		} AMBSAMP;              /* sample value */
33
#	Line 131 | Line 131 | resample:
131		dimlist[ndims++] = AI(hp,i,j) + 90171;
132		rayvalue(&ar);                  /* evaluate ray */
133		ndims--;
134	<	if (ar.rt <= FTINY)
134	>	zd = raydistance(&ar);
135	>	if (zd <= FTINY)
136		return(0);              /* should never happen */
137		multcolor(ar.rcol, ar.rcoef);   /* apply coefficient */
138	<	if (ar.rt*ap->d < 1.0)          /* new/closer distance? */
139	<	ap->d = 1.0/ar.rt;
138	>	if (zd*ap->d < 1.0)             /* new/closer distance? */
139	>	ap->d = 1.0/zd;
140		if (!n) {                       /* record first vertex & value */
141	<	if (ar.rt > 10.0*thescene.cusize + 1000.)
142	<	ar.rt = 10.0*thescene.cusize + 1000.;
143	<	VSUM(ap->p, ar.rorg, ar.rdir, ar.rt);
141	>	if (zd > 10.0*thescene.cusize + 1000.)
142	>	zd = 10.0*thescene.cusize + 1000.;
143	>	VSUM(ap->p, ar.rorg, ar.rdir, zd);
144		copycolor(ap->v, ar.rcol);
145		} else {                        /* else update recorded value */
146		hp->acol[RED] -= colval(ap->v,RED);
#	Line 156 | Line 157 | resample:
157		}
158
159
160	<	/* Estimate errors based on ambient division differences */
160	>	/* Estimate variance based on ambient division differences */
161		static float *
162		getambdiffs(AMBHEMI *hp)
163		{
#	Line 164 | Line 165 | getambdiffs(AMBHEMI *hp)
165		float   *earr = (float *)calloc(hp->ns*hp->ns, sizeof(float));
166		float   *ep;
167		AMBSAMP *ap;
168	<	double  b, d2;
168	>	double  b, b1, d2;
169		int     i, j;
170
171		if (earr == NULL)               /* out of memory? */
172		return(NULL);
173	<	/* compute squared neighbor diffs */
173	>	/* sum squared neighbor diffs */
174		for (ap = hp->sa, ep = earr, i = 0; i < hp->ns; i++)
175		for (j = 0; j < hp->ns; j++, ap++, ep++) {
176		b = bright(ap[0].v);
177		if (i) {                /* from above */
178	<	d2 = normf*(b - bright(ap[-hp->ns].v));
179	<	d2 *= d2;
178	>	b1 = bright(ap[-hp->ns].v);
179	>	d2 = b - b1;
180	>	d2 *= d2*normf/(b + b1);
181		ep[0] += d2;
182		ep[-hp->ns] += d2;
183		}
184		if (!j) continue;
185		/* from behind */
186	<	d2 = normf*(b - bright(ap[-1].v));
187	<	d2 *= d2;
186	>	b1 = bright(ap[-1].v);
187	>	d2 = b - b1;
188	>	d2 *= d2*normf/(b + b1);
189		ep[0] += d2;
190		ep[-1] += d2;
191		if (!i) continue;
192		/* diagonal */
193	<	d2 = normf*(b - bright(ap[-hp->ns-1].v));
194	<	d2 *= d2;
193	>	b1 = bright(ap[-hp->ns-1].v);
194	>	d2 = b - b1;
195	>	d2 *= d2*normf/(b + b1);
196		ep[0] += d2;
197		ep[-hp->ns-1] += d2;
198		}
#	Line 215 | Line 219 | ambsupersamp(AMBHEMI *hp, int cnt)
219		{
220		float   *earr = getambdiffs(hp);
221		double  e2rem = 0;
218	–	AMBSAMP *ap;
222		float   *ep;
223		int     i, j, n, nss;
224
#	Line 225 | Line 228 | ambsupersamp(AMBHEMI *hp, int cnt)
228		for (ep = earr + hp->ns*hp->ns; ep > earr; )
229		e2rem += *--ep;
230		ep = earr;                      /* perform super-sampling */
231	<	for (ap = hp->sa, i = 0; i < hp->ns; i++)
232	<	for (j = 0; j < hp->ns; j++, ap++) {
231	>	for (i = 0; i < hp->ns; i++)
232	>	for (j = 0; j < hp->ns; j++) {
233		if (e2rem <= FTINY)
234		goto done;      /* nothing left to do */
235		nss = *ep/e2rem*cnt + frandom();
#	Line 290 | Line 293 | samp_hemi(                             /* sample indirect hemisphere */
293		hp->sampOK *= -1;       /* soft failure */
294		return(hp);
295		}
296	+	if (hp->sampOK < 64)
297	+	return(hp);             /* insufficient for super-sampling */
298		n = ambssamp*wt + 0.5;
299		if (n > 8) {                    /* perform super-sampling? */
300		ambsupersamp(hp, n);
#	Line 861 | Line 866 | divsample(                             /* sample a division */
866		ndims--;
867		multcolor(ar.rcol, ar.rcoef);   /* apply coefficient */
868		addcolor(dp->v, ar.rcol);
869	<	/* use rt to improve gradient calc */
870	<	if (ar.rt > FTINY && ar.rt < FHUGE)
871	<	dp->r += 1.0/ar.rt;
869	>	/* use rxt to improve gradient calc */
870	>	if (ar.rxt > FTINY && ar.rxt < FHUGE)
871	>	dp->r += 1.0/ar.rxt;
872		/* (re)initialize error */
873		if (dp->n++) {
874		b2 = bright(dp->v)/dp->n - bright(ar.rcol);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)