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 1.1 by greg, Fri Jun 7 10:03:52 1991 UTC vs.
Revision 1.5 by greg, Thu Jun 13 09:41:17 1991 UTC

#	Line 17 | Line 17 | static char SCCSid[] = "$SunId$ LBL";
17		typedef struct {
18		short  t, p;            /* theta, phi indices */
19		COLOR  v;               /* value sum */
20	<	float  k;               /* error contribution for this division */
20	>	float  r;               /* 1/distance sum */
21	>	float  k;               /* variance for this division */
22		int  n;                 /* number of subsamples */
23	<	}  AMBSAMP;             /* ambient division sample */
23	>	}  AMBSAMP;             /* ambient sample division */
24
25		typedef struct {
26		FVECT  ux, uy, uz;      /* x, y and z axis directions */
#	Line 53 | Line 54 | AMBSAMP  *d1, *d2;
54		}
55
56
56	–	static double
57		divsample(dp, h, r)                     /* sample a division */
58		register AMBSAMP  *dp;
59		AMBHEMI  *h;
#	Line 64 | Line 64 | RAY  *r;
64		double  xd, yd, zd;
65		double  b2;
66		double  phi;
67	<	register int  k;
67	>	register int  i;
68
69		if (rayorigin(&ar, r, AMBIENT, 0.5) < 0)
70	<	return(0.0);
70	>	return(-1);
71		hlist[0] = r->rno;
72		hlist[1] = dp->t;
73		hlist[2] = dp->p;
#	Line 78 | Line 78 | RAY  *r;
78		xd = cos(phi) * zd;
79		yd = sin(phi) * zd;
80		zd = sqrt(1.0 - zd*zd);
81	<	for (k = 0; k < 3; k++)
82	<	ar.rdir[k] =    xd*h->ux[k] +
83	<	yd*h->uy[k] +
84	<	zd*h->uz[k];
85	<	dimlist[ndims++] = dp->t*h->np + dp->p + 38813;
81	>	for (i = 0; i < 3; i++)
82	>	ar.rdir[i] =    xd*h->ux[i] +
83	>	yd*h->uy[i] +
84	>	zd*h->uz[i];
85	>	dimlist[ndims++] = dp->t*h->np + dp->p + 90171;
86		rayvalue(&ar);
87		ndims--;
88		addcolor(dp->v, ar.rcol);
89	+	if (ar.rt < FHUGE)
90	+	dp->r += 1.0/ar.rt;
91		/* (re)initialize error */
92		if (dp->n++) {
93		b2 = bright(dp->v)/dp->n - bright(ar.rcol);
#	Line 93 | Line 95 | RAY  *r;
95		dp->k = b2/(dp->n*dp->n);
96		} else
97		dp->k = 0.0;
98	<	return(ar.rot);
98	>	return(0);
99		}
100
101
#	Line 134 | Line 136 | FVECT  pg, dg;
136		for (j = 0; j < hemi.np; j++) {
137		dp->t = i; dp->p = j;
138		setcolor(dp->v, 0.0, 0.0, 0.0);
139	+	dp->r = 0.0;
140		dp->n = 0;
141	<	if ((d = divsample(dp, &hemi, r)) == 0.0)
141	>	if (divsample(dp, &hemi, r) < 0)
142		goto oopsy;
140	–	if (d < FHUGE)
141	–	arad += 1.0 / d;
143		if (div != NULL)
144		dp++;
145	<	else
145	>	else {
146		addcolor(acol, dp->v);
147	+	arad += dp->r;
148	+	}
149		}
150		if (ns > 0) {                   /* perform super-sampling */
151	<	comperrs(div, hemi);                    /* compute errors */
151	>	comperrs(div, &hemi);                   /* compute errors */
152		qsort(div, ndivs, sizeof(AMBSAMP), ambcmp);     /* sort divs */
150	–	dp = div + ndivs;                       /* skim excess */
151	–	for (i = ndivs; i > ns; i--) {
152	–	dp--;
153	–	addcolor(acol, dp->v);
154	–	}
153		/* super-sample */
154		for (i = ns; i > 0; i--) {
155		copystruct(&dnew, div);
156	<	if ((d = divsample(&dnew, &hemi)) == 0.0)
156	>	if (divsample(&dnew, &hemi, r) < 0)
157		goto oopsy;
160	–	if (d < FHUGE)
161	–	arad += 1.0 / d;
158		/* reinsert */
159		dp = div;
160		j = ndivs < i ? ndivs : i;
#	Line 167 | Line 163 | FVECT  pg, dg;
163		dp++;
164		}
165		copystruct(dp, &dnew);
170	–	/* extract darkest */
171	–	if (i <= ndivs) {
172	–	dp = div + i-1;
173	–	if (dp->n > 1) {
174	–	b = 1.0/dp->n;
175	–	scalecolor(dp->v, b);
176	–	dp->n = 1;
177	–	}
178	–	addcolor(acol, dp->v);
179	–	}
166		}
167	<	if (pg != NULL || dg != NULL)   /* reorder */
167	>	if (pg != NULL || dg != NULL)   /* restore order */
168		qsort(div, ndivs, sizeof(AMBSAMP), ambnorm);
169		}
170		/* compute returned values */
171	<	if (pg != NULL)
172	<	posgradient(pg, div, &hemi);
173	<	if (dg != NULL)
174	<	dirgradient(dg, div, &hemi);
175	<	if (div != NULL)
171	>	if (div != NULL) {
172	>	for (i = ndivs, dp = div; i-- > 0; dp++) {
173	>	arad += dp->r;
174	>	if (dp->n > 1) {
175	>	b = 1.0/dp->n;
176	>	scalecolor(dp->v, b);
177	>	dp->r *= b;
178	>	dp->n = 1;
179	>	}
180	>	addcolor(acol, dp->v);
181	>	}
182	>	b = bright(acol);
183	>	if (b > FTINY)
184	>	b = ndivs/b;
185	>	else
186	>	b = 0.0;
187	>	if (pg != NULL) {
188	>	posgradient(pg, div, &hemi);
189	>	for (i = 0; i < 3; i++)
190	>	pg[i] *= b;
191	>	}
192	>	if (dg != NULL) {
193	>	dirgradient(dg, div, &hemi);
194	>	for (i = 0; i < 3; i++)
195	>	dg[i] *= b;
196	>	}
197		free((char *)div);
198	+	}
199		b = 1.0/ndivs;
200		scalecolor(acol, b);
201		if (arad <= FTINY)
#	Line 211 | Line 219 | inithemi(hp, r)                        /* initialize sampling hemisphere */
219		register AMBHEMI  *hp;
220		RAY  *r;
221		{
222	<	register int  k;
222	>	register int  i;
223		/* set number of divisions */
224		hp->nt = sqrt(ambdiv * r->rweight * 0.5) + 0.5;
225		hp->np = 2 * hp->nt;
226		/* make axes */
227		VCOPY(hp->uz, r->ron);
228		hp->uy[0] = hp->uy[1] = hp->uy[2] = 0.0;
229	<	for (k = 0; k < 3; k++)
230	<	if (hp->uz[k] < 0.6 && hp->uz[k] > -0.6)
229	>	for (i = 0; i < 3; i++)
230	>	if (hp->uz[i] < 0.6 && hp->uz[i] > -0.6)
231		break;
232	<	if (k >= 3)
232	>	if (i >= 3)
233		error(CONSISTENCY, "bad ray direction in inithemi");
234	<	hp->uy[k] = 1.0;
235	<	fcross(hp->ux, hp->uz, hp->uy);
234	>	hp->uy[i] = 1.0;
235	>	fcross(hp->ux, hp->uy, hp->uz);
236		normalize(hp->ux);
237	<	fcross(hp->uy, hp->ux, hp->uz);
237	>	fcross(hp->uy, hp->uz, hp->ux);
238		}
239
240
241		comperrs(da, hp)                /* compute initial error estimates */
242	<	AMBSAMP  *da;
242	>	AMBSAMP  *da;           /* assumes standard ordering */
243		register AMBHEMI  *hp;
244		{
245		double  b, b2;
#	Line 253 | Line 261 | register AMBHEMI  *hp;
261		b2 *= b2 * 0.25;
262		dp[0].k += b2;
263		dp[-1].k += b2;
264	<	}
265	<	if (j == hp->np-1) {    /* around */
258	<	b2 = bright(dp[-(hp->np-1)].v) - b;
264	>	} else {                /* around */
265	>	b2 = bright(dp[hp->np-1].v) - b;
266		b2 *= b2 * 0.25;
267		dp[0].k += b2;
268	<	dp[-(hp->np-1)].k += b2;
268	>	dp[hp->np-1].k += b2;
269		}
270		dp++;
271		}
#	Line 278 | Line 285 | register AMBHEMI  *hp;
285
286		posgradient(gv, da, hp)                         /* compute position gradient */
287		FVECT  gv;
288	<	AMBSAMP  *da;
288	>	AMBSAMP  *da;                   /* assumes standard ordering */
289		AMBHEMI  *hp;
290		{
291	<	gv[0] = 0.0; gv[1] = 0.0; gv[2] = 0.0;
291	>	register int  i, j;
292	>	double  b, d;
293	>	double  mag0, mag1;
294	>	double  phi, cosp, sinp, xd, yd;
295	>	register AMBSAMP  *dp;
296	>
297	>	xd = yd = 0.0;
298	>	for (j = 0; j < hp->np; j++) {
299	>	dp = da + j;
300	>	mag0 = mag1 = 0.0;
301	>	for (i = 0; i < hp->nt; i++) {
302	>	#ifdef  DEBUG
303	>	if (dp->t != i || dp->p != j)
304	>	error(CONSISTENCY,
305	>	"division order in posgradient");
306	>	#endif
307	>	b = bright(dp->v);
308	>	if (i > 0) {
309	>	d = dp[-hp->np].r;
310	>	if (dp[0].r > d) d = dp[0].r;
311	>	d *= 1.0 - sqrt((double)i/hp->nt);
312	>	mag0 += d*(b - bright(dp[-hp->np].v));
313	>	}
314	>	if (j > 0) {
315	>	d = dp[-1].r;
316	>	if (dp[0].r > d) d = dp[0].r;
317	>	mag1 += d*(b - bright(dp[-1].v));
318	>	} else {
319	>	d = dp[hp->np-1].r;
320	>	if (dp[0].r > d) d = dp[0].r;
321	>	mag1 += d*(b - bright(dp[hp->np-1].v));
322	>	}
323	>	dp += hp->np;
324	>	}
325	>	if (hp->nt > 1) {
326	>	mag0 /= (double)hp->np;
327	>	mag1 /= (double)hp->nt;
328	>	}
329	>	phi = 2.0*PI * (double)j/hp->np;
330	>	cosp = cos(phi); sinp = sin(phi);
331	>	xd += mag0*cosp - mag1*sinp;
332	>	yd += mag0*sinp + mag1*cosp;
333	>	}
334	>	for (i = 0; i < 3; i++)
335	>	gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])/PI;
336		}
337
338
339		dirgradient(gv, da, hp)                         /* compute direction gradient */
340		FVECT  gv;
341	<	AMBSAMP  *da;
341	>	AMBSAMP  *da;                   /* assumes standard ordering */
342		AMBHEMI  *hp;
343		{
344	<	gv[0] = 0.0; gv[1] = 0.0; gv[2] = 0.0;
344	>	register int  i, j;
345	>	double  mag;
346	>	double  phi, xd, yd;
347	>	register AMBSAMP  *dp;
348	>
349	>	xd = yd = 0.0;
350	>	for (j = 0; j < hp->np; j++) {
351	>	dp = da + j;
352	>	mag = 0.0;
353	>	for (i = 0; i < hp->nt; i++) {
354	>	#ifdef  DEBUG
355	>	if (dp->t != i || dp->p != j)
356	>	error(CONSISTENCY,
357	>	"division order in dirgradient");
358	>	#endif
359	>	mag += sqrt((i+.5)/hp->nt)*bright(dp->v);
360	>	dp += hp->np;
361	>	}
362	>	phi = 2.0*PI * (j+.5)/hp->np + PI/2.0;
363	>	xd += mag * cos(phi);
364	>	yd += mag * sin(phi);
365	>	}
366	>	for (i = 0; i < 3; i++)
367	>	gv[i] = (xd*hp->ux[i] + yd*hp->uy[i])*PI/(hp->nt*hp->np);
368		}

Diff Legend

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