52 |
|
#endif |
53 |
|
|
54 |
|
|
55 |
– |
static double qambacc = 0.; /* ambient accuracy to the 1/4 power */ |
55 |
|
static double avsum = 0.; /* computed ambient value sum (log) */ |
56 |
|
static unsigned int navsum = 0; /* number of values in avsum */ |
57 |
|
static unsigned int nambvals = 0; /* total number of indirect values */ |
128 |
|
double newa |
129 |
|
) |
130 |
|
{ |
131 |
< |
double olda = qambacc*qambacc*qambacc*qambacc; |
131 |
> |
static double olda; /* remember previous setting here */ |
132 |
|
|
133 |
|
newa *= (newa > 0); |
134 |
|
if (fabs(newa - olda) >= .05*(newa + olda)) { |
135 |
< |
qambacc = sqrt(sqrt(ambacc = newa)); |
135 |
> |
ambacc = newa; |
136 |
|
if (nambvals > 0) |
137 |
|
sortambvals(1); /* rebuild tree */ |
138 |
|
} |
356 |
|
) |
357 |
|
{ /* initial limit is 10 degrees plus ambacc radians */ |
358 |
|
const double minangle = 10.0 * PI/180.; |
359 |
< |
const double maxangle = (minangle+ambacc-PI/2.)*pow(r->rweight,0.13) |
361 |
< |
+ PI/2.; |
359 |
> |
double maxangle = minangle + ambacc; |
360 |
|
double wsum = 0.0; |
361 |
|
FVECT ck0; |
362 |
|
int i, j; |
379 |
|
at->kid+i, ck0, s); |
380 |
|
} |
381 |
|
/* good enough? */ |
382 |
< |
if (wsum > 0.04 && s > (minarad*0.8+maxarad*0.2)) |
382 |
> |
if (wsum >= 0.05 && s > minarad*10.0) |
383 |
|
return(wsum); |
384 |
|
} |
385 |
+ |
/* adjust maximum angle */ |
386 |
+ |
if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6)) |
387 |
+ |
maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.; |
388 |
|
/* sum this node */ |
389 |
|
for (av = at->alist; av != NULL; av = av->next) { |
390 |
|
double d, delta_r2, delta_t2; |
413 |
|
/* |
414 |
|
* Modified ray behind test |
415 |
|
*/ |
416 |
< |
VSUB(ck0, av->pos, r->rop); |
416 |
> |
VSUB(ck0, r->rop, av->pos); |
417 |
|
d = DOT(ck0, uvw[2]); |
418 |
< |
if (d < -minarad*qambacc-.001) |
418 |
> |
if (d < -minarad*ambacc-.001) |
419 |
|
continue; |
420 |
|
d /= av->rad[0]; |
421 |
|
delta_t2 = d*d; |
422 |
< |
if (delta_t2 >= qambacc*qambacc) |
422 |
> |
if (delta_t2 >= ambacc*ambacc) |
423 |
|
continue; |
424 |
|
/* |
425 |
|
* Elliptical radii test based on Hessian |
430 |
|
delta_t2 += d*d; |
431 |
|
d = DOT(ck0, uvw[1]) / av->rad[1]; |
432 |
|
delta_t2 += d*d; |
433 |
< |
if (delta_t2 >= qambacc*qambacc) |
433 |
> |
if (delta_t2 >= ambacc*ambacc) |
434 |
|
continue; |
435 |
|
/* |
436 |
|
* Extrapolate value and compute final weight (hat function) |
437 |
|
*/ |
438 |
|
extambient(ct, av, r->rop, rn, uvw); |
439 |
|
d = tfunc(maxangle, sqrt(delta_r2), 0.0) * |
440 |
< |
tfunc(qambacc, sqrt(delta_t2), 0.0); |
440 |
> |
tfunc(ambacc, sqrt(delta_t2), 0.0); |
441 |
|
scalecolor(ct, d); |
442 |
|
addcolor(acol, ct); |
443 |
|
wsum += d; |
540 |
|
at = &atrunk; |
541 |
|
VCOPY(ck0, thescene.cuorg); |
542 |
|
s = thescene.cusize; |
543 |
< |
while (s*(OCTSCALE/2) > av->rad[1]*qambacc) { |
543 |
> |
while (s*(OCTSCALE/2) > av->rad[1]*ambacc) { |
544 |
|
if (at->kid == NULL) |
545 |
|
if ((at->kid = newambtree()) == NULL) |
546 |
|
error(SYSTEM, "out of memory in avinsert"); |