221 |
|
for (i = 0; i < 8; i++) { |
222 |
|
for (j = 0; j < 3; j++) { |
223 |
|
ck0[j] = c0[j]; |
224 |
< |
if (1<<j & i) { |
224 |
> |
if (1<<j & i) |
225 |
|
ck0[j] += s; |
226 |
< |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
227 |
< |
break; |
228 |
< |
} else |
229 |
< |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
230 |
< |
break; |
226 |
> |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
227 |
> |
break; |
228 |
> |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
229 |
> |
break; |
230 |
|
} |
231 |
|
if (j == 3) |
232 |
|
wsum += sumambient(acol, r, at->kid+i, ck0, s); |
266 |
|
extern int ambcmp(); |
267 |
|
extern double sin(), cos(), sqrt(); |
268 |
|
double phi, xd, yd, zd; |
269 |
+ |
double b, b2; |
270 |
|
register AMBSAMP *div; |
271 |
|
AMBSAMP dnew; |
272 |
|
RAY ar; |
321 |
|
div[ne].n = 0; |
322 |
|
div[ne].t = i; div[ne].p = j; |
323 |
|
/* sum errors */ |
324 |
< |
xd = bright(ar.rcol); |
324 |
> |
b = bright(ar.rcol); |
325 |
|
if (i > 0) { /* from above */ |
326 |
< |
yd = bright(div[ne-np].v) - xd; |
327 |
< |
yd *= yd * 0.25; |
328 |
< |
div[ne].k += yd; |
326 |
> |
b2 = bright(div[ne-np].v) - b; |
327 |
> |
b2 *= b2 * 0.25; |
328 |
> |
div[ne].k += b2; |
329 |
|
div[ne].n++; |
330 |
< |
div[ne-np].k += yd; |
330 |
> |
div[ne-np].k += b2; |
331 |
|
div[ne-np].n++; |
332 |
|
} |
333 |
|
if (j > 0) { /* from behind */ |
334 |
< |
yd = bright(div[ne-1].v) - xd; |
335 |
< |
yd *= yd * 0.25; |
336 |
< |
div[ne].k += yd; |
334 |
> |
b2 = bright(div[ne-1].v) - b; |
335 |
> |
b2 *= b2 * 0.25; |
336 |
> |
div[ne].k += b2; |
337 |
|
div[ne].n++; |
338 |
< |
div[ne-1].k += yd; |
338 |
> |
div[ne-1].k += b2; |
339 |
|
div[ne-1].n++; |
340 |
|
} |
341 |
|
if (j == np-1) { /* around */ |
342 |
< |
yd = bright(div[ne-(np-1)].v) - xd; |
343 |
< |
yd *= yd * 0.25; |
344 |
< |
div[ne].k += yd; |
342 |
> |
b2 = bright(div[ne-(np-1)].v) - b; |
343 |
> |
b2 *= b2 * 0.25; |
344 |
> |
div[ne].k += b2; |
345 |
|
div[ne].n++; |
346 |
< |
div[ne-(np-1)].k += yd; |
346 |
> |
div[ne-(np-1)].k += b2; |
347 |
|
div[ne-(np-1)].n++; |
348 |
|
} |
349 |
|
ne++; |
380 |
|
addcolor(dnew.v, ar.rcol); |
381 |
|
dnew.n = div[0].n + 1; |
382 |
|
dnew.t = div[0].t; dnew.p = div[0].p; |
383 |
< |
yd = bright(dnew.v)/dnew.n - bright(ar.rcol); |
384 |
< |
yd = yd*yd + div[0].k*(div[0].n*div[0].n); |
385 |
< |
dnew.k = yd/(dnew.n*dnew.n); |
383 |
> |
b2 = bright(dnew.v)/dnew.n - bright(ar.rcol); |
384 |
> |
b2 = b2*b2 + div[0].k*(div[0].n*div[0].n); |
385 |
> |
dnew.k = b2/(dnew.n*dnew.n); |
386 |
|
/* reinsert */ |
387 |
|
for (k = 0; k < ne-1 && dnew.k < div[k+1].k; k++) |
388 |
|
bcopy(&div[k+1], &div[k], sizeof(AMBSAMP)); |