| 106 |
|
{0, -1.6}, |
| 107 |
|
{1.6, 0}, |
| 108 |
|
}; |
| 109 |
< |
const double peak_over = 2.0; |
| 109 |
> |
const double peak_over = 1.5; |
| 110 |
|
SDSpectralDF *dfp; |
| 111 |
|
FVECT pdir; |
| 112 |
|
double tomega, srchrad; |
| 128 |
|
srchrad = sqrt(dfp->minProjSA); /* else search for peak */ |
| 129 |
|
setcolor(vpeak, 0, 0, 0); |
| 130 |
|
setcolor(vsum, 0, 0, 0); |
| 131 |
+ |
pdir[2] = 0.0; |
| 132 |
|
for (i = 0; i < NDIR2CHECK; i++) { |
| 133 |
|
FVECT tdir; |
| 134 |
|
SDValue sv; |
| 142 |
|
goto baderror; |
| 143 |
|
cvt_sdcolor(vcol, &sv); |
| 144 |
|
addcolor(vsum, vcol); |
| 145 |
< |
if (bright(vcol) > bright(vpeak)) { |
| 145 |
> |
if (sv.cieY > bright(vpeak)) { |
| 146 |
|
copycolor(vpeak, vcol); |
| 147 |
|
VCOPY(pdir, tdir); |
| 148 |
|
} |
| 149 |
|
} |
| 150 |
+ |
if (pdir[2] == 0.0) |
| 151 |
+ |
return; /* zero neighborhood */ |
| 152 |
|
ec = SDsizeBSDF(&tomega, pdir, ndp->vray, SDqueryMin, ndp->sd); |
| 153 |
|
if (ec) |
| 154 |
|
goto baderror; |
| 155 |
|
if (tomega > 1.5*dfp->minProjSA) |
| 156 |
|
return; /* not really a peak? */ |
| 157 |
+ |
tomega /= fabs(pdir[2]); /* remove cosine factor */ |
| 158 |
|
if ((bright(vpeak) - ndp->sd->tLamb.cieY*(1./PI))*tomega <= .001) |
| 159 |
|
return; /* < 0.1% transmission */ |
| 160 |
|
for (i = 3; i--; ) /* remove peak from average */ |
| 188 |
|
static int |
| 189 |
|
direct_specular_OK(COLOR cval, FVECT ldir, double omega, BSDFDAT *ndp) |
| 190 |
|
{ |
| 191 |
< |
int nsamp, ok = 0; |
| 191 |
> |
int nsamp; |
| 192 |
> |
double wtot = 0; |
| 193 |
|
FVECT vsrc, vsmp, vjit; |
| 194 |
|
double tomega, tomega2; |
| 195 |
|
double sf, tsr, sd[2]; |
| 274 |
|
if (tomega2 < .12*tomega) |
| 275 |
|
continue; /* not safe to include */ |
| 276 |
|
cvt_sdcolor(csmp, &sv); |
| 277 |
< |
addcolor(cval, csmp); /* else average it in */ |
| 278 |
< |
++ok; |
| 277 |
> |
|
| 278 |
> |
if (sf < 2.5*tsr) { /* weight by Y for small sources */ |
| 279 |
> |
scalecolor(csmp, sv.cieY); |
| 280 |
> |
wtot += sv.cieY; |
| 281 |
> |
} else |
| 282 |
> |
wtot += 1.; |
| 283 |
> |
addcolor(cval, csmp); |
| 284 |
|
} |
| 285 |
< |
if (!ok) /* no valid specular samples? */ |
| 285 |
> |
if (wtot <= FTINY) /* no valid specular samples? */ |
| 286 |
|
return(0); |
| 287 |
|
|
| 288 |
< |
sf = 1./(double)ok; /* compute average BSDF */ |
| 288 |
> |
sf = 1./wtot; /* weighted average BSDF */ |
| 289 |
|
scalecolor(cval, sf); |
| 290 |
|
/* subtract diffuse contribution */ |
| 291 |
|
for (i = 3*(diffY > FTINY); i--; ) |
| 441 |
|
static int |
| 442 |
|
sample_sdcomp(BSDFDAT *ndp, SDComponent *dcp, int xmit) |
| 443 |
|
{ |
| 444 |
< |
int hasthru = (xmit && !(ndp->pr->crtype & (SPECULAR|AMBIENT)) |
| 445 |
< |
&& bright(ndp->cthru) > FTINY); |
| 446 |
< |
int nstarget = 1; |
| 447 |
< |
int nsent = 0; |
| 448 |
< |
int n; |
| 449 |
< |
SDError ec; |
| 450 |
< |
SDValue bsv; |
| 451 |
< |
double xrand; |
| 452 |
< |
FVECT vsmp, vinc; |
| 453 |
< |
RAY sr; |
| 444 |
> |
const int hasthru = (xmit && |
| 445 |
> |
!(ndp->pr->crtype & (SPECULAR|AMBIENT)) && |
| 446 |
> |
bright(ndp->cthru) > FTINY); |
| 447 |
> |
int nstarget = 1; |
| 448 |
> |
int nsent = 0; |
| 449 |
> |
int n; |
| 450 |
> |
SDError ec; |
| 451 |
> |
SDValue bsv; |
| 452 |
> |
double xrand; |
| 453 |
> |
FVECT vsmp, vinc; |
| 454 |
> |
RAY sr; |
| 455 |
|
/* multiple samples? */ |
| 456 |
|
if (specjitter > 1.5) { |
| 457 |
|
nstarget = specjitter*ndp->pr->rweight + .5; |
| 533 |
|
if (dfp == NULL) /* no specular component? */ |
| 534 |
|
return(0); |
| 535 |
|
|
| 525 |
– |
dimlist[ndims++] = (int)(size_t)ndp->mp; |
| 536 |
|
if (hasthru) { /* separate view sample? */ |
| 537 |
|
RAY tr; |
| 538 |
|
if (rayorigin(&tr, TRANS, ndp->pr, ndp->cthru) == 0) { |
| 545 |
|
} else |
| 546 |
|
hasthru = 0; |
| 547 |
|
} |
| 548 |
< |
ndims--; |
| 539 |
< |
if (dfp->maxHemi - b <= FTINY) { /* how specular to sample? */ |
| 548 |
> |
if (dfp->maxHemi - b <= FTINY) { /* have specular to sample? */ |
| 549 |
|
b = 0; |
| 550 |
|
} else { |
| 551 |
|
FVECT vjit; |
| 563 |
|
} |
| 564 |
|
return(ntotal); |
| 565 |
|
} |
| 566 |
< |
ndims += 2; /* else sample specular */ |
| 566 |
> |
dimlist[ndims] = (int)(size_t)ndp->mp; /* else sample specular */ |
| 567 |
> |
ndims += 2; |
| 568 |
|
for (n = dfp->ncomp; n--; ) { /* loop over components */ |
| 569 |
|
dimlist[ndims-1] = n + 9438; |
| 570 |
|
ntotal += sample_sdcomp(ndp, &dfp->comp[n], sflags==SDsampSpT); |
