110 |
|
/* set min & max radii */ |
111 |
|
if (ar <= 0) { |
112 |
|
minarad = 0; |
113 |
< |
maxarad = thescene.cusize / 2.0; |
113 |
> |
maxarad = thescene.cusize*0.5; |
114 |
|
} else { |
115 |
|
minarad = thescene.cusize / ar; |
116 |
< |
maxarad = 64 * minarad; /* heuristic */ |
117 |
< |
if (maxarad > thescene.cusize / 2.0) |
118 |
< |
maxarad = thescene.cusize / 2.0; |
116 |
> |
maxarad = 64.0 * minarad; /* heuristic */ |
117 |
> |
if (maxarad > thescene.cusize*0.5) |
118 |
> |
maxarad = thescene.cusize*0.5; |
119 |
|
} |
120 |
|
if (minarad <= FTINY) |
121 |
< |
minarad = 10*FTINY; |
121 |
> |
minarad = 10.0*FTINY; |
122 |
|
if (maxarad <= minarad) |
123 |
< |
maxarad = 64 * minarad; |
123 |
> |
maxarad = 64.0 * minarad; |
124 |
|
} |
125 |
|
|
126 |
|
|
129 |
|
double newa |
130 |
|
) |
131 |
|
{ |
132 |
< |
double ambdiff; |
133 |
< |
|
134 |
< |
if (newa < 0.0) |
135 |
< |
newa = 0.0; |
136 |
< |
ambdiff = fabs(newa - ambacc); |
137 |
< |
if (ambdiff >= .01 && (ambacc = newa) > FTINY) { |
138 |
< |
qambacc = sqrt(sqrt(ambacc)); |
132 |
> |
double olda = qambacc*qambacc*qambacc*qambacc; |
133 |
> |
|
134 |
> |
newa *= (newa > 0); |
135 |
> |
if (fabs(newa - olda) >= .05*(newa + olda)) { |
136 |
> |
qambacc = sqrt(sqrt(ambacc = newa)); |
137 |
|
if (nambvals > 0) |
138 |
|
sortambvals(1); /* rebuild tree */ |
139 |
|
} |
150 |
|
ambdone(); |
151 |
|
/* init ambient limits */ |
152 |
|
setambres(ambres); |
153 |
< |
qambacc = sqrt(sqrt(ambacc *= (ambacc > FTINY))); |
153 |
> |
setambacc(ambacc); |
154 |
|
if (ambfile == NULL || !ambfile[0]) |
155 |
|
return; |
156 |
|
if (ambacc <= FTINY) { |
363 |
|
FVECT ck0; |
364 |
|
int i, j; |
365 |
|
AMBVAL *av; |
366 |
+ |
|
367 |
+ |
if (at->kid != NULL) { /* sum children first */ |
368 |
+ |
s *= 0.5; |
369 |
+ |
for (i = 0; i < 8; i++) { |
370 |
+ |
for (j = 0; j < 3; j++) { |
371 |
+ |
ck0[j] = c0[j]; |
372 |
+ |
if (1<<j & i) |
373 |
+ |
ck0[j] += s; |
374 |
+ |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
375 |
+ |
break; |
376 |
+ |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
377 |
+ |
break; |
378 |
+ |
} |
379 |
+ |
if (j == 3) |
380 |
+ |
wsum += sumambient(acol, r, rn, al, |
381 |
+ |
at->kid+i, ck0, s); |
382 |
+ |
} |
383 |
+ |
/* good enough? */ |
384 |
+ |
if (wsum > 0.04 && s > (minarad*0.8+maxarad*0.2)) |
385 |
+ |
return(wsum); |
386 |
+ |
} |
387 |
|
/* sum this node */ |
388 |
|
for (av = at->alist; av != NULL; av = av->next) { |
389 |
|
double d, delta_r2, delta_t2; |
410 |
|
if (delta_r2 >= maxangle*maxangle) |
411 |
|
continue; |
412 |
|
/* |
413 |
+ |
* Modified ray behind test |
414 |
+ |
*/ |
415 |
+ |
VSUB(ck0, av->pos, r->rop); |
416 |
+ |
d = DOT(ck0, uvw[2]); |
417 |
+ |
if (d < -minarad*qambacc-.001) |
418 |
+ |
continue; |
419 |
+ |
d /= av->rad[0]; |
420 |
+ |
delta_t2 = d*d; |
421 |
+ |
if (delta_t2 >= qambacc*qambacc) |
422 |
+ |
continue; |
423 |
+ |
/* |
424 |
|
* Elliptical radii test based on Hessian |
425 |
|
*/ |
426 |
|
decodedir(uvw[0], av->udir); |
427 |
|
VCROSS(uvw[1], uvw[2], uvw[0]); |
398 |
– |
VSUB(ck0, av->pos, r->rop); |
428 |
|
d = DOT(ck0, uvw[0]) / av->rad[0]; |
429 |
< |
delta_t2 = d*d; |
429 |
> |
delta_t2 += d*d; |
430 |
|
d = DOT(ck0, uvw[1]) / av->rad[1]; |
431 |
|
delta_t2 += d*d; |
403 |
– |
d = DOT(ck0, uvw[2]) / av->rad[0]; |
404 |
– |
delta_t2 += d*d; |
432 |
|
if (delta_t2 >= qambacc*qambacc) |
433 |
|
continue; |
434 |
|
/* |
440 |
|
scalecolor(ct, d); |
441 |
|
addcolor(acol, ct); |
442 |
|
wsum += d; |
416 |
– |
} |
417 |
– |
if (at->kid == NULL) |
418 |
– |
return(wsum); |
419 |
– |
/* sum children */ |
420 |
– |
s *= 0.5; |
421 |
– |
for (i = 0; i < 8; i++) { |
422 |
– |
for (j = 0; j < 3; j++) { |
423 |
– |
ck0[j] = c0[j]; |
424 |
– |
if (1<<j & i) |
425 |
– |
ck0[j] += s; |
426 |
– |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
427 |
– |
break; |
428 |
– |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
429 |
– |
break; |
430 |
– |
} |
431 |
– |
if (j == 3) |
432 |
– |
wsum += sumambient(acol, r, rn, al, |
433 |
– |
at->kid+i, ck0, s); |
443 |
|
} |
444 |
|
return(wsum); |
445 |
|
} |