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.17 by greg, Sat Jun 4 06:10:12 2005 UTC vs.
Revision 2.22 by greg, Sun Sep 26 15:51:15 2010 UTC

#	Line 28 | Line 28 | inithemi(                      /* initialize sampling hemisphere */
28		register int  i;
29		/* set number of divisions */
30		if (ambacc <= FTINY &&
31	<	wt > (d = 0.8*bright(ac)*r->rweight/(ambdiv*minweight)))
31	>	wt > (d = 0.8*intens(ac)*r->rweight/(ambdiv*minweight)))
32		wt = d;                 /* avoid ray termination */
33		hp->nt = sqrt(ambdiv * wt / PI) + 0.5;
34		i = ambacc > FTINY ? 3 : 1;     /* minimum number of samples */
#	Line 94 | Line 94 | divsample(                             /* sample a division */
94		ar.rdir[i] =    xd*h->ux[i] +
95		yd*h->uy[i] +
96		zd*h->uz[i];
97	+	checknorm(ar.rdir);
98		dimlist[ndims++] = dp->t*h->np + dp->p + 90171;
99		rayvalue(&ar);
100		ndims--;
#	Line 161 | Line 162 | doambient(                             /* compute ambient component */
162		AMBSAMP  dnew;
163		register AMBSAMP  *dp;
164		double  arad;
165	<	int  ndivs;
165	>	int  divcnt;
166		register int  i, j;
167		/* initialize hemisphere */
168		inithemi(&hemi, acol, r, wt);
169	<	ndivs = hemi.nt * hemi.np;
169	>	divcnt = hemi.nt * hemi.np;
170		/* initialize */
171		if (pg != NULL)
172		pg[0] = pg[1] = pg[2] = 0.0;
173		if (dg != NULL)
174		dg[0] = dg[1] = dg[2] = 0.0;
175		setcolor(acol, 0.0, 0.0, 0.0);
176	<	if (ndivs == 0)
176	>	if (divcnt == 0)
177		return(0.0);
178		/* allocate super-samples */
179		if (hemi.ns > 0 || pg != NULL || dg != NULL) {
180	<	div = (AMBSAMP *)malloc(ndivs*sizeof(AMBSAMP));
180	>	div = (AMBSAMP *)malloc(divcnt*sizeof(AMBSAMP));
181		if (div == NULL)
182		error(SYSTEM, "out of memory in doambient");
183		} else
#	Line 185 | Line 186 | doambient(                             /* compute ambient component */
186		arad = 0.0;
187		if ((dp = div) == NULL)
188		dp = &dnew;
189	+	divcnt = 0;
190		for (i = 0; i < hemi.nt; i++)
191		for (j = 0; j < hemi.np; j++) {
192		dp->t = i; dp->p = j;
#	Line 192 | Line 194 | doambient(                             /* compute ambient component */
194		dp->r = 0.0;
195		dp->n = 0;
196		if (divsample(dp, &hemi, r) < 0) {
197	<	if (div != NULL) dp++;
198	<	hemi.ns = 0;    /* incomplete sampling */
197	<	pg = dg = NULL;
197	>	if (div != NULL)
198	>	dp++;
199		continue;
200		}
201		arad += dp->r;
202	+	divcnt++;
203		if (div != NULL)
204		dp++;
205		else
206		addcolor(acol, dp->v);
207		}
208	<	if (hemi.ns > 0 && arad > FTINY && ndivs/arad < minarad)
208	>	if (!divcnt) {
209	>	if (div != NULL)
210	>	free((void *)div);
211	>	return(0.0);            /* no samples taken */
212	>	}
213	>	if (divcnt < hemi.nt*hemi.np) {
214	>	pg = dg = NULL;         /* incomplete sampling */
215	>	hemi.ns = 0;
216	>	} else if (arad > FTINY && divcnt/arad < minarad) {
217		hemi.ns = 0;            /* close enough */
218	<	else if (hemi.ns > 0) {         /* else perform super-sampling */
218	>	} else if (hemi.ns > 0) {       /* else perform super-sampling? */
219		comperrs(div, &hemi);                   /* compute errors */
220	<	qsort(div, ndivs, sizeof(AMBSAMP), ambcmp);     /* sort divs */
220	>	qsort(div, divcnt, sizeof(AMBSAMP), ambcmp);    /* sort divs */
221		/* super-sample */
222		for (i = hemi.ns; i > 0; i--) {
223		dnew = *div;
#	Line 216 | Line 226 | doambient(                             /* compute ambient component */
226		continue;
227		}
228		dp = div;               /* reinsert */
229	<	j = ndivs < i ? ndivs : i;
229	>	j = divcnt < i ? divcnt : i;
230		while (--j > 0 && dnew.k < dp[1].k) {
231		*dp = *(dp+1);
232		dp++;
#	Line 224 | Line 234 | doambient(                             /* compute ambient component */
234		*dp = dnew;
235		}
236		if (pg != NULL || dg != NULL)   /* restore order */
237	<	qsort(div, ndivs, sizeof(AMBSAMP), ambnorm);
237	>	qsort(div, divcnt, sizeof(AMBSAMP), ambnorm);
238		}
239		/* compute returned values */
240		if (div != NULL) {
241	<	arad = 0.0;
242	<	for (i = ndivs, dp = div; i-- > 0; dp++) {
241	>	arad = 0.0;             /* note: divcnt may be < nt*np */
242	>	for (i = hemi.nt*hemi.np, dp = div; i-- > 0; dp++) {
243		arad += dp->r;
244		if (dp->n > 1) {
245		b = 1.0/dp->n;
#	Line 258 | Line 268 | doambient(                             /* compute ambient component */
268		if (arad <= FTINY)
269		arad = maxarad;
270		else
271	<	arad = (ndivs+hemi.ns)/arad;
271	>	arad = (divcnt+hemi.ns)/arad;
272		if (pg != NULL) {               /* reduce radius if gradient large */
273		d = DOT(pg,pg);
274		if (d*arad*arad > 1.0)

Diff Legend

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