| 226 |
|
static int |
| 227 |
|
direct_specular_OK(COLOR cval, FVECT ldir, double omega, BSDFDAT *ndp) |
| 228 |
|
{ |
| 229 |
< |
int nsamp; |
| 230 |
< |
double wtot = 0; |
| 231 |
< |
FVECT vsrc, vsmp, vjit; |
| 229 |
> |
int nsamp = 1; |
| 230 |
> |
int scnt = 0; |
| 231 |
> |
FVECT vsrc, vjit; |
| 232 |
|
double tomega, tomega2; |
| 233 |
|
double sf, tsr, sd[2]; |
| 234 |
|
COLOR csmp, cdiff; |
| 271 |
|
diffY = 0; |
| 272 |
|
setcolor(cdiff, 0, 0, 0); |
| 273 |
|
} |
| 274 |
– |
/* need projected solid angle */ |
| 275 |
– |
omega *= fabs(vsrc[2]); |
| 274 |
|
/* check indirect over-counting */ |
| 275 |
|
if ((vsrc[2] > 0) ^ (ndp->vray[2] > 0) && bright(ndp->cthru) > FTINY) { |
| 276 |
|
double dx = vsrc[0] + ndp->vray[0]; |
| 279 |
|
((ndp->sd->tf != NULL) ? ndp->sd->tf : ndp->sd->tb) : |
| 280 |
|
((ndp->sd->tb != NULL) ? ndp->sd->tb : ndp->sd->tf) ; |
| 281 |
|
|
| 282 |
< |
if (dx*dx + dy*dy <= (2.5*4./PI)*(omega + dfp->minProjSA + |
| 283 |
< |
2.*sqrt(omega*dfp->minProjSA))) { |
| 282 |
> |
tomega = omega*fabs(vsrc[2]); |
| 283 |
> |
if (dx*dx + dy*dy <= (2.5*4./PI)*(tomega + dfp->minProjSA + |
| 284 |
> |
2.*sqrt(tomega*dfp->minProjSA))) { |
| 285 |
|
if (bright(ndp->cthru_surr) <= FTINY) |
| 286 |
|
return(0); |
| 287 |
|
copycolor(cval, ndp->cthru_surr); |
| 291 |
|
ec = SDsizeBSDF(&tomega, ndp->vray, vsrc, SDqueryMin, ndp->sd); |
| 292 |
|
if (ec) |
| 293 |
|
goto baderror; |
| 294 |
< |
/* assign number of samples */ |
| 295 |
< |
sf = specjitter * ndp->pr->rweight; |
| 296 |
< |
if (tomega <= 0) |
| 297 |
< |
nsamp = 1; |
| 298 |
< |
else if (25.*tomega <= omega) |
| 299 |
< |
nsamp = 100.*sf + .5; |
| 301 |
< |
else |
| 302 |
< |
nsamp = 4.*sf*omega/tomega + .5; |
| 303 |
< |
nsamp += !nsamp; |
| 304 |
< |
sf = sqrt(omega); /* sample our source area */ |
| 305 |
< |
tsr = sqrt(tomega); |
| 294 |
> |
/* check if sampling BSDF */ |
| 295 |
> |
if ((tsr = sqrt(tomega)) > 0) { |
| 296 |
> |
nsamp = 4.*specjitter*ndp->pr->rweight + .5; |
| 297 |
> |
nsamp += !nsamp; |
| 298 |
> |
} |
| 299 |
> |
/* jitter to fuzz BSDF cells */ |
| 300 |
|
for (i = nsamp; i--; ) { |
| 307 |
– |
VCOPY(vsmp, vsrc); /* jitter query directions */ |
| 308 |
– |
if (nsamp > 1) { |
| 309 |
– |
multisamp(sd, 2, (i + frandom())/(double)nsamp); |
| 310 |
– |
vsmp[0] += (sd[0] - .5)*sf; |
| 311 |
– |
vsmp[1] += (sd[1] - .5)*sf; |
| 312 |
– |
normalize(vsmp); |
| 313 |
– |
} |
| 301 |
|
bsdf_jitter(vjit, ndp, tsr); |
| 302 |
|
/* compute BSDF */ |
| 303 |
< |
ec = SDevalBSDF(&sv, vjit, vsmp, ndp->sd); |
| 303 |
> |
ec = SDevalBSDF(&sv, vjit, vsrc, ndp->sd); |
| 304 |
|
if (ec) |
| 305 |
|
goto baderror; |
| 306 |
|
if (sv.cieY - diffY <= FTINY) |
| 307 |
|
continue; /* no specular part */ |
| 308 |
|
/* check for variable resolution */ |
| 309 |
< |
ec = SDsizeBSDF(&tomega2, vjit, vsmp, SDqueryMin, ndp->sd); |
| 309 |
> |
ec = SDsizeBSDF(&tomega2, vjit, vsrc, SDqueryMin, ndp->sd); |
| 310 |
|
if (ec) |
| 311 |
|
goto baderror; |
| 312 |
|
if (tomega2 < .12*tomega) |
| 313 |
|
continue; /* not safe to include */ |
| 314 |
|
cvt_sdcolor(csmp, &sv); |
| 328 |
– |
#if 0 |
| 329 |
– |
if (sf < 2.5*tsr) { /* weight by BSDF for small sources */ |
| 330 |
– |
scalecolor(csmp, sv.cieY); |
| 331 |
– |
wtot += sv.cieY; |
| 332 |
– |
} else |
| 333 |
– |
#endif |
| 334 |
– |
wtot += 1.; |
| 315 |
|
addcolor(cval, csmp); |
| 316 |
+ |
++scnt; |
| 317 |
|
} |
| 318 |
< |
if (wtot <= FTINY) /* no valid specular samples? */ |
| 318 |
> |
if (!scnt) /* no valid specular samples? */ |
| 319 |
|
return(0); |
| 320 |
|
|
| 321 |
< |
sf = 1./wtot; /* weighted average BSDF */ |
| 321 |
> |
sf = 1./scnt; /* weighted average BSDF */ |
| 322 |
|
scalecolor(cval, sf); |
| 323 |
|
/* subtract diffuse contribution */ |
| 324 |
|
for (i = 3*(diffY > FTINY); i--; ) |
| 364 |
|
* Compute diffuse transmission |
| 365 |
|
*/ |
| 366 |
|
copycolor(ctmp, np->tdiff); |
| 367 |
< |
dtmp = -ldot * omega * (1.0/PI); |
| 367 |
> |
dtmp = -ldot * omega * (1./PI); |
| 368 |
|
scalecolor(ctmp, dtmp); |
| 369 |
|
addcolor(cval, ctmp); |
| 370 |
|
} |
| 452 |
|
* Compute diffuse transmission |
| 453 |
|
*/ |
| 454 |
|
copycolor(ctmp, np->tdiff); |
| 455 |
< |
dtmp = -ldot * omega * (1.0/PI); |
| 455 |
> |
dtmp = -ldot * omega * (1./PI); |
| 456 |
|
scalecolor(ctmp, dtmp); |
| 457 |
|
addcolor(cval, ctmp); |
| 458 |
|
} |
