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.18 by greg, Mon Jun 6 19:14:28 2005 UTC vs.
Revision 2.19 by greg, Mon Aug 22 16:07:26 2005 UTC

#	Line 161 | Line 161 | doambient(                             /* compute ambient component */
161		AMBSAMP  dnew;
162		register AMBSAMP  *dp;
163		double  arad;
164	<	int  ndivs;
164	>	int  divcnt;
165		register int  i, j;
166		/* initialize hemisphere */
167		inithemi(&hemi, acol, r, wt);
168	<	ndivs = hemi.nt * hemi.np;
168	>	divcnt = hemi.nt * hemi.np;
169		/* initialize */
170		if (pg != NULL)
171		pg[0] = pg[1] = pg[2] = 0.0;
172		if (dg != NULL)
173		dg[0] = dg[1] = dg[2] = 0.0;
174		setcolor(acol, 0.0, 0.0, 0.0);
175	<	if (ndivs == 0)
175	>	if (divcnt == 0)
176		return(0.0);
177		/* allocate super-samples */
178		if (hemi.ns > 0 || pg != NULL || dg != NULL) {
179	<	div = (AMBSAMP *)malloc(ndivs*sizeof(AMBSAMP));
179	>	div = (AMBSAMP *)malloc(divcnt*sizeof(AMBSAMP));
180		if (div == NULL)
181		error(SYSTEM, "out of memory in doambient");
182		} else
#	Line 185 | Line 185 | doambient(                             /* compute ambient component */
185		arad = 0.0;
186		if ((dp = div) == NULL)
187		dp = &dnew;
188	+	divcnt = 0;
189		for (i = 0; i < hemi.nt; i++)
190		for (j = 0; j < hemi.np; j++) {
191		dp->t = i; dp->p = j;
#	Line 192 | Line 193 | doambient(                             /* compute ambient component */
193		dp->r = 0.0;
194		dp->n = 0;
195		if (divsample(dp, &hemi, r) < 0) {
196	<	if (div == NULL) continue;
197	<	dp++;
197	<	hemi.ns = 0;    /* incomplete sampling */
198	<	pg = dg = NULL;
196	>	if (div != NULL)
197	>	dp++;
198		continue;
199		}
200		arad += dp->r;
201	+	divcnt++;
202		if (div != NULL)
203		dp++;
204		else
205		addcolor(acol, dp->v);
206		}
207	<	if (hemi.ns > 0 && arad > FTINY && ndivs/arad < minarad)
207	>	if (!divcnt)
208	>	return(0.0);            /* no samples taken */
209	>	if (divcnt < hemi.nt*hemi.np) {
210	>	pg = dg = NULL;         /* incomplete sampling */
211	>	hemi.ns = 0;
212	>	} else if (arad > FTINY && divcnt/arad < minarad) {
213		hemi.ns = 0;            /* close enough */
214	<	else if (hemi.ns > 0) {         /* else perform super-sampling */
214	>	} else if (hemi.ns > 0) {       /* else perform super-sampling? */
215		comperrs(div, &hemi);                   /* compute errors */
216	<	qsort(div, ndivs, sizeof(AMBSAMP), ambcmp);     /* sort divs */
216	>	qsort(div, divcnt, sizeof(AMBSAMP), ambcmp);    /* sort divs */
217		/* super-sample */
218		for (i = hemi.ns; i > 0; i--) {
219		dnew = *div;
#	Line 217 | Line 222 | doambient(                             /* compute ambient component */
222		continue;
223		}
224		dp = div;               /* reinsert */
225	<	j = ndivs < i ? ndivs : i;
225	>	j = divcnt < i ? divcnt : i;
226		while (--j > 0 && dnew.k < dp[1].k) {
227		*dp = *(dp+1);
228		dp++;
#	Line 225 | Line 230 | doambient(                             /* compute ambient component */
230		*dp = dnew;
231		}
232		if (pg != NULL || dg != NULL)   /* restore order */
233	<	qsort(div, ndivs, sizeof(AMBSAMP), ambnorm);
233	>	qsort(div, divcnt, sizeof(AMBSAMP), ambnorm);
234		}
235		/* compute returned values */
236		if (div != NULL) {
237	<	arad = 0.0;
238	<	for (i = ndivs, dp = div; i-- > 0; dp++) {
237	>	arad = 0.0;             /* note: divcnt may be < nt*np */
238	>	for (i = hemi.nt*hemi.np, dp = div; i-- > 0; dp++) {
239		arad += dp->r;
240		if (dp->n > 1) {
241		b = 1.0/dp->n;
#	Line 259 | Line 264 | doambient(                             /* compute ambient component */
264		if (arad <= FTINY)
265		arad = maxarad;
266		else
267	<	arad = (ndivs+hemi.ns)/arad;
267	>	arad = (divcnt+hemi.ns)/arad;
268		if (pg != NULL) {               /* reduce radius if gradient large */
269		d = DOT(pg,pg);
270		if (d*arad*arad > 1.0)

Diff Legend

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