| 51 |
|
#define MAX_SORT_INTVL (SORT_INTVL<<6) |
| 52 |
|
#endif |
| 53 |
|
|
| 54 |
+ |
|
| 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 */ |
| 109 |
|
/* set min & max radii */ |
| 110 |
|
if (ar <= 0) { |
| 111 |
|
minarad = 0; |
| 112 |
< |
maxarad = thescene.cusize / 2.0; |
| 112 |
> |
maxarad = thescene.cusize*0.5; |
| 113 |
|
} else { |
| 114 |
|
minarad = thescene.cusize / ar; |
| 115 |
< |
maxarad = 64 * minarad; /* heuristic */ |
| 116 |
< |
if (maxarad > thescene.cusize / 2.0) |
| 117 |
< |
maxarad = thescene.cusize / 2.0; |
| 115 |
> |
maxarad = 64.0 * minarad; /* heuristic */ |
| 116 |
> |
if (maxarad > thescene.cusize*0.5) |
| 117 |
> |
maxarad = thescene.cusize*0.5; |
| 118 |
|
} |
| 119 |
|
if (minarad <= FTINY) |
| 120 |
< |
minarad = 10*FTINY; |
| 120 |
> |
minarad = 10.0*FTINY; |
| 121 |
|
if (maxarad <= minarad) |
| 122 |
< |
maxarad = 64 * minarad; |
| 122 |
> |
maxarad = 64.0 * minarad; |
| 123 |
|
} |
| 124 |
|
|
| 125 |
|
|
| 128 |
|
double newa |
| 129 |
|
) |
| 130 |
|
{ |
| 131 |
< |
double ambdiff; |
| 132 |
< |
|
| 133 |
< |
if (newa < 0.0) |
| 134 |
< |
newa = 0.0; |
| 135 |
< |
ambdiff = fabs(newa - ambacc); |
| 136 |
< |
if (ambdiff >= .01 && (ambacc = newa) > FTINY && nambvals > 0) |
| 137 |
< |
sortambvals(1); /* rebuild tree */ |
| 131 |
> |
static double olda; /* remember previous setting here */ |
| 132 |
> |
|
| 133 |
> |
newa *= (newa > 0); |
| 134 |
> |
if (fabs(newa - olda) >= .05*(newa + olda)) { |
| 135 |
> |
ambacc = newa; |
| 136 |
> |
if (nambvals > 0) |
| 137 |
> |
sortambvals(1); /* rebuild tree */ |
| 138 |
> |
} |
| 139 |
|
} |
| 140 |
|
|
| 141 |
|
|
| 267 |
|
|
| 268 |
|
#define tfunc(lwr, x, upr) (((x)-(lwr))/((upr)-(lwr))) |
| 269 |
|
|
| 270 |
+ |
static int plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang); |
| 271 |
|
static double sumambient(COLOR acol, RAY *r, FVECT rn, int al, |
| 272 |
|
AMBTREE *at, FVECT c0, double s); |
| 273 |
|
static int makeambient(COLOR acol, RAY *r, FVECT rn, int al); |
| 299 |
|
if (ambacc <= FTINY) { /* no ambient storage */ |
| 300 |
|
copycolor(acol, aval); |
| 301 |
|
rdepth++; |
| 302 |
< |
ok = doambient(acol, r, r->rweight, NULL, NULL, NULL, NULL); |
| 302 |
> |
ok = doambient(acol, r, r->rweight, |
| 303 |
> |
NULL, NULL, NULL, NULL, NULL); |
| 304 |
|
rdepth--; |
| 305 |
|
if (!ok) |
| 306 |
|
goto dumbamb; |
| 324 |
|
ok = makeambient(acol, r, nrm, rdepth-1); |
| 325 |
|
rdepth--; |
| 326 |
|
if (ok) { |
| 327 |
< |
multcolor(aval, acol); /* got new value */ |
| 327 |
> |
multcolor(aval, acol); /* computed new value */ |
| 328 |
|
return; |
| 329 |
|
} |
| 330 |
|
dumbamb: /* return global value */ |
| 346 |
|
} |
| 347 |
|
|
| 348 |
|
|
| 349 |
< |
double |
| 349 |
> |
/* Plug a potential leak where ambient cache value is occluded */ |
| 350 |
> |
static int |
| 351 |
> |
plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang) |
| 352 |
> |
{ |
| 353 |
> |
const double cost70sq = 0.1169778; /* cos(70deg)^2 */ |
| 354 |
> |
RAY rtst; |
| 355 |
> |
FVECT vdif; |
| 356 |
> |
double normdot, ndotd, nadotd; |
| 357 |
> |
double a, b, c, t[2]; |
| 358 |
> |
|
| 359 |
> |
ang += 2.*PI*(ang < 0); /* check direction flags */ |
| 360 |
> |
if ( !(ap->corral>>(int)(ang*(16./PI)) & 1) ) |
| 361 |
> |
return(0); |
| 362 |
> |
/* |
| 363 |
> |
* Generate test ray, targeting 20 degrees above sample point plane |
| 364 |
> |
* along surface normal from cache position. This should be high |
| 365 |
> |
* enough to miss local geometry we don't really care about. |
| 366 |
> |
*/ |
| 367 |
> |
VSUB(vdif, ap->pos, r->rop); |
| 368 |
> |
normdot = DOT(anorm, r->ron); |
| 369 |
> |
ndotd = DOT(vdif, r->ron); |
| 370 |
> |
nadotd = DOT(vdif, anorm); |
| 371 |
> |
a = normdot*normdot - cost70sq; |
| 372 |
> |
b = 2.0*(normdot*ndotd - nadotd*cost70sq); |
| 373 |
> |
c = ndotd*ndotd - DOT(vdif,vdif)*cost70sq; |
| 374 |
> |
if (quadratic(t, a, b, c) != 2) |
| 375 |
> |
return(1); /* should rarely happen */ |
| 376 |
> |
if (t[1] <= FTINY) |
| 377 |
> |
return(0); /* should fail behind test */ |
| 378 |
> |
rayorigin(&rtst, SHADOW, r, NULL); |
| 379 |
> |
VSUM(rtst.rdir, vdif, anorm, t[1]); /* further dist. > plane */ |
| 380 |
> |
rtst.rmax = normalize(rtst.rdir); /* short ray test */ |
| 381 |
> |
while (localhit(&rtst, &thescene)) { /* check for occluder */ |
| 382 |
> |
if (rtst.ro->omod != OVOID && |
| 383 |
> |
(rtst.clipset == NULL || |
| 384 |
> |
!inset(rtst.clipset, rtst.ro->omod))) |
| 385 |
> |
return(1); /* plug light leak */ |
| 386 |
> |
VCOPY(rtst.rorg, rtst.rop); /* skip invisible surface */ |
| 387 |
> |
rtst.rmax -= rtst.rot; |
| 388 |
> |
rayclear(&rtst); |
| 389 |
> |
} |
| 390 |
> |
return(0); /* seems we're OK */ |
| 391 |
> |
} |
| 392 |
> |
|
| 393 |
> |
|
| 394 |
> |
static double |
| 395 |
|
sumambient( /* get interpolated ambient value */ |
| 396 |
|
COLOR acol, |
| 397 |
|
RAY *r, |
| 401 |
|
FVECT c0, |
| 402 |
|
double s |
| 403 |
|
) |
| 404 |
< |
{ /* initial limit is ambacc radians */ |
| 405 |
< |
const double maxangle = (ambacc-PI/2.)*pow(r->rweight,0.13) + PI/2.; |
| 404 |
> |
{ /* initial limit is 10 degrees plus ambacc radians */ |
| 405 |
> |
const double minangle = 10.0 * PI/180.; |
| 406 |
> |
double maxangle = minangle + ambacc; |
| 407 |
|
double wsum = 0.0; |
| 408 |
|
FVECT ck0; |
| 409 |
|
int i, j; |
| 410 |
|
AMBVAL *av; |
| 411 |
+ |
|
| 412 |
+ |
if (at->kid != NULL) { /* sum children first */ |
| 413 |
+ |
s *= 0.5; |
| 414 |
+ |
for (i = 0; i < 8; i++) { |
| 415 |
+ |
for (j = 0; j < 3; j++) { |
| 416 |
+ |
ck0[j] = c0[j]; |
| 417 |
+ |
if (1<<j & i) |
| 418 |
+ |
ck0[j] += s; |
| 419 |
+ |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
| 420 |
+ |
break; |
| 421 |
+ |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
| 422 |
+ |
break; |
| 423 |
+ |
} |
| 424 |
+ |
if (j == 3) |
| 425 |
+ |
wsum += sumambient(acol, r, rn, al, |
| 426 |
+ |
at->kid+i, ck0, s); |
| 427 |
+ |
} |
| 428 |
+ |
/* good enough? */ |
| 429 |
+ |
if (wsum >= 0.05 && s > minarad*10.0) |
| 430 |
+ |
return(wsum); |
| 431 |
+ |
} |
| 432 |
+ |
/* adjust maximum angle */ |
| 433 |
+ |
if (at->alist != NULL && (at->alist->lvl <= al) & (r->rweight < 0.6)) |
| 434 |
+ |
maxangle = (maxangle - PI/2.)*pow(r->rweight,0.13) + PI/2.; |
| 435 |
|
/* sum this node */ |
| 436 |
|
for (av = at->alist; av != NULL; av = av->next) { |
| 437 |
< |
double d, delta_r2, delta_t2; |
| 437 |
> |
double u, v, d, delta_r2, delta_t2; |
| 438 |
|
COLOR ct; |
| 439 |
|
FVECT uvw[3]; |
| 440 |
|
/* record access */ |
| 458 |
|
if (delta_r2 >= maxangle*maxangle) |
| 459 |
|
continue; |
| 460 |
|
/* |
| 461 |
+ |
* Modified ray behind test |
| 462 |
+ |
*/ |
| 463 |
+ |
VSUB(ck0, r->rop, av->pos); |
| 464 |
+ |
d = DOT(ck0, uvw[2]); |
| 465 |
+ |
if (d < -minarad*ambacc-.001) |
| 466 |
+ |
continue; |
| 467 |
+ |
d /= av->rad[0]; |
| 468 |
+ |
delta_t2 = d*d; |
| 469 |
+ |
if (delta_t2 >= ambacc*ambacc) |
| 470 |
+ |
continue; |
| 471 |
+ |
/* |
| 472 |
|
* Elliptical radii test based on Hessian |
| 473 |
|
*/ |
| 474 |
|
decodedir(uvw[0], av->udir); |
| 475 |
|
VCROSS(uvw[1], uvw[2], uvw[0]); |
| 476 |
< |
VSUB(ck0, av->pos, r->rop); |
| 392 |
< |
d = DOT(ck0, uvw[0]) / av->rad[0]; |
| 393 |
< |
delta_t2 = d*d; |
| 394 |
< |
d = DOT(ck0, uvw[1]) / av->rad[1]; |
| 476 |
> |
d = (u = DOT(ck0, uvw[0])) / av->rad[0]; |
| 477 |
|
delta_t2 += d*d; |
| 478 |
+ |
d = (v = DOT(ck0, uvw[1])) / av->rad[1]; |
| 479 |
+ |
delta_t2 += d*d; |
| 480 |
|
if (delta_t2 >= ambacc*ambacc) |
| 481 |
|
continue; |
| 482 |
|
/* |
| 483 |
< |
* Intersection behind test |
| 483 |
> |
* Test for potential light leak |
| 484 |
|
*/ |
| 485 |
< |
d = 0.0; |
| 402 |
< |
for (j = 0; j < 3; j++) |
| 403 |
< |
d += (r->rop[j] - av->pos[j])*(uvw[2][j] + r->ron[j]); |
| 404 |
< |
if (d*0.5 < -minarad*ambacc-.001) |
| 485 |
> |
if (av->corral && plugaleak(r, av, uvw[2], atan2a(v,u))) |
| 486 |
|
continue; |
| 487 |
|
/* |
| 488 |
|
* Extrapolate value and compute final weight (hat function) |
| 494 |
|
addcolor(acol, ct); |
| 495 |
|
wsum += d; |
| 496 |
|
} |
| 416 |
– |
if (at->kid == NULL) |
| 417 |
– |
return(wsum); |
| 418 |
– |
/* sum children */ |
| 419 |
– |
s *= 0.5; |
| 420 |
– |
for (i = 0; i < 8; i++) { |
| 421 |
– |
for (j = 0; j < 3; j++) { |
| 422 |
– |
ck0[j] = c0[j]; |
| 423 |
– |
if (1<<j & i) |
| 424 |
– |
ck0[j] += s; |
| 425 |
– |
if (r->rop[j] < ck0[j] - OCTSCALE*s) |
| 426 |
– |
break; |
| 427 |
– |
if (r->rop[j] > ck0[j] + (1.0+OCTSCALE)*s) |
| 428 |
– |
break; |
| 429 |
– |
} |
| 430 |
– |
if (j == 3) |
| 431 |
– |
wsum += sumambient(acol, r, rn, al, |
| 432 |
– |
at->kid+i, ck0, s); |
| 433 |
– |
} |
| 497 |
|
return(wsum); |
| 498 |
|
} |
| 499 |
|
|
| 500 |
|
|
| 501 |
< |
int |
| 501 |
> |
static int |
| 502 |
|
makeambient( /* make a new ambient value for storage */ |
| 503 |
|
COLOR acol, |
| 504 |
|
RAY *r, |
| 517 |
|
amb.weight = 1.25*r->rweight; |
| 518 |
|
setcolor(acol, AVGREFL, AVGREFL, AVGREFL); |
| 519 |
|
/* compute ambient */ |
| 520 |
< |
if (!doambient(acol, r, amb.weight, uvw, amb.rad, amb.gpos, amb.gdir)) { |
| 521 |
< |
setcolor(acol, 0.0, 0.0, 0.0); |
| 459 |
< |
return(0); |
| 460 |
< |
} |
| 520 |
> |
i = doambient(acol, r, amb.weight, |
| 521 |
> |
uvw, amb.rad, amb.gpos, amb.gdir, &amb.corral); |
| 522 |
|
scalecolor(acol, 1./AVGREFL); /* undo assumed reflectance */ |
| 523 |
+ |
if (i <= 0 || amb.rad[0] <= FTINY) /* no Hessian or zero radius */ |
| 524 |
+ |
return(i); |
| 525 |
|
/* store value */ |
| 526 |
|
VCOPY(amb.pos, r->rop); |
| 527 |
|
amb.ndir = encodedir(r->ron); |
| 538 |
|
} |
| 539 |
|
|
| 540 |
|
|
| 541 |
< |
void |
| 541 |
> |
static void |
| 542 |
|
extambient( /* extrapolate value at pv, nv */ |
| 543 |
|
COLOR cr, |
| 544 |
|
AMBVAL *ap, |
