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.82 by greg, Thu Apr 12 20:07:09 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 292 | 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 863 | 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)