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.72 by greg, Wed Mar 16 15:43:04 2016 UTC vs.
Revision 2.80 by greg, Wed Apr 11 17:05:59 2018 UTC

#	Line 51 | Line 51 | typedef struct {
51
52
53		static int
54	+	ambcollision(                           /* proposed direciton collides? */
55	+	AMBHEMI *hp,
56	+	int     i,
57	+	int     j,
58	+	FVECT   dv
59	+	)
60	+	{
61	+	double  cos_thresh;
62	+	int     ii, jj;
63	+	/* min. spacing = 1/4th division */
64	+	cos_thresh = (PI/4.)/(double)hp->ns;
65	+	cos_thresh = 1. - .5*cos_thresh*cos_thresh;
66	+	/* check existing neighbors */
67	+	for (ii = i-1; ii <= i+1; ii++) {
68	+	if (ii < 0) continue;
69	+	if (ii >= hp->ns) break;
70	+	for (jj = j-1; jj <= j+1; jj++) {
71	+	AMBSAMP *ap;
72	+	FVECT   avec;
73	+	double  dprod;
74	+	if (jj < 0) continue;
75	+	if (jj >= hp->ns) break;
76	+	if ((ii==i) & (jj==j)) continue;
77	+	ap = &ambsam(hp,ii,jj);
78	+	if (ap->d <= .5/FHUGE)
79	+	continue;       /* no one home */
80	+	VSUB(avec, ap->p, hp->rp->rop);
81	+	dprod = DOT(avec, dv);
82	+	if (dprod >= cos_thresh*VLEN(avec))
83	+	return(1);      /* collision */
84	+	}
85	+	}
86	+	return(0);                      /* nothing to worry about */
87	+	}
88	+
89	+
90	+	static int
91		ambsample(                              /* initial ambient division sample */
92		AMBHEMI *hp,
93		int     i,
#	Line 78 | Line 115 | ambsample(                             /* initial ambient division sample */
115		hlist[1] = j;
116		hlist[2] = i;
117		multisamp(spt, 2, urand(ilhash(hlist,3)+n));
118	<	/* avoid coincident samples */
82	<	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	<	}
118	>	resample:
119		SDsquare2disk(spt, (j+spt[1])/hp->ns, (i+spt[0])/hp->ns);
120		zd = sqrt(1. - spt[0]*spt[0] - spt[1]*spt[1]);
121		for (ii = 3; ii--; )
#	Line 93 | Line 123 | ambsample(                             /* initial ambient division sample */
123		spt[1]*hp->uy[ii] +
124		zd*hp->rp->ron[ii];
125		checknorm(ar.rdir);
126	+	/* avoid coincident samples */
127	+	if (!n && ambcollision(hp, i, j, ar.rdir)) {
128	+	spt[0] = frandom(); spt[1] = frandom();
129	+	goto resample;          /* reject this sample */
130	+	}
131		dimlist[ndims++] = AI(hp,i,j) + 90171;
132		rayvalue(&ar);                  /* evaluate ray */
133		ndims--;
#	Line 102 | Line 137 | ambsample(                             /* initial ambient division sample */
137		if (ar.rt*ap->d < 1.0)          /* new/closer distance? */
138		ap->d = 1.0/ar.rt;
139		if (!n) {                       /* record first vertex & value */
140	<	if (ar.rt > 10.0*thescene.cusize)
141	<	ar.rt = 10.0*thescene.cusize;
140	>	if (ar.rt > 10.0*thescene.cusize + 1000.)
141	>	ar.rt = 10.0*thescene.cusize + 1000.;
142		VSUM(ap->p, ar.rorg, ar.rdir, ar.rt);
143		copycolor(ap->v, ar.rcol);
144		} else {                        /* else update recorded value */
#	Line 125 | Line 160 | ambsample(                             /* initial ambient division sample */
160		static float *
161		getambdiffs(AMBHEMI *hp)
162		{
163	+	const double    normf = 1./bright(hp->acoef);
164		float   *earr = (float *)calloc(hp->ns*hp->ns, sizeof(float));
165		float   *ep;
166		AMBSAMP *ap;
#	Line 138 | Line 174 | getambdiffs(AMBHEMI *hp)
174		for (j = 0; j < hp->ns; j++, ap++, ep++) {
175		b = bright(ap[0].v);
176		if (i) {                /* from above */
177	<	d2 = b - bright(ap[-hp->ns].v);
177	>	d2 = normf*(b - bright(ap[-hp->ns].v));
178		d2 *= d2;
179		ep[0] += d2;
180		ep[-hp->ns] += d2;
181		}
182		if (!j) continue;
183		/* from behind */
184	<	d2 = b - bright(ap[-1].v);
184	>	d2 = normf*(b - bright(ap[-1].v));
185		d2 *= d2;
186		ep[0] += d2;
187		ep[-1] += d2;
188		if (!i) continue;
189		/* diagonal */
190	<	d2 = b - bright(ap[-hp->ns-1].v);
190	>	d2 = normf*(b - bright(ap[-hp->ns-1].v));
191		d2 *= d2;
192		ep[0] += d2;
193		ep[-hp->ns-1] += d2;
#	Line 195 | Line 231 | ambsupersamp(AMBHEMI *hp, int cnt)
231		goto done;      /* nothing left to do */
232		nss = *ep/e2rem*cnt + frandom();
233		for (n = 1; n <= nss && ambsample(hp,i,j,n); n++)
234	<	--cnt;
234	>	if (!--cnt) goto done;
235		e2rem -= *ep++;         /* update remainder */
236		}
237		done:
#	Line 213 | Line 249 | samp_hemi(                             /* sample indirect hemisphere */
249		AMBHEMI *hp;
250		double  d;
251		int     n, i, j;
252	+	/* insignificance check */
253	+	if (bright(rcol) <= FTINY)
254	+	return(NULL);
255		/* set number of divisions */
256		if (ambacc <= FTINY &&
257		wt > (d = 0.8*intens(rcol)*r->rweight/(ambdiv*minweight)))
#	Line 635 | Line 674 | ambcorral(AMBHEMI *hp, FVECT uv[2], const double r0, c
674		for (a1 = ang-ang_res; a1 <= ang+ang_res; a1 += ang_step)
675		flgs |= 1L<<(int)(16/PI*(a1 + 2.*PI*(a1 < 0)));
676		}
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 ((r0*r0*u*u + r1*r1*v*v) > 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	–	}
677		return(flgs);
678		}
679

Diff Legend

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