134 |
|
tdir[0] = -ndp->vray[0] + dir2check[i][0]*srchrad; |
135 |
|
tdir[1] = -ndp->vray[1] + dir2check[i][1]*srchrad; |
136 |
|
tdir[2] = -ndp->vray[2]; |
137 |
< |
if (normalize(tdir) == 0) |
138 |
< |
continue; |
137 |
> |
normalize(tdir); |
138 |
|
ec = SDevalBSDF(&sv, tdir, ndp->vray, ndp->sd); |
139 |
|
if (ec) |
140 |
|
goto baderror; |
187 |
|
{ |
188 |
|
int nsamp, ok = 0; |
189 |
|
FVECT vsrc, vsmp, vjit; |
190 |
< |
double tomega; |
190 |
> |
double tomega, tomega2; |
191 |
|
double sf, tsr, sd[2]; |
192 |
|
COLOR csmp, cdiff; |
193 |
|
double diffY; |
252 |
|
multisamp(sd, 2, (i + frandom())/(double)nsamp); |
253 |
|
vsmp[0] += (sd[0] - .5)*sf; |
254 |
|
vsmp[1] += (sd[1] - .5)*sf; |
255 |
< |
if (normalize(vsmp) == 0) { |
257 |
< |
--nsamp; |
258 |
< |
continue; |
259 |
< |
} |
255 |
> |
normalize(vsmp); |
256 |
|
} |
257 |
|
bsdf_jitter(vjit, ndp, tsr); |
258 |
< |
/* compute BSDF */ |
258 |
> |
/* check for variable resolution */ |
259 |
> |
ec = SDsizeBSDF(&tomega2, vjit, vsmp, SDqueryMin, ndp->sd); |
260 |
> |
if (ec) |
261 |
> |
goto baderror; |
262 |
> |
if (tomega2 < .12*tomega) |
263 |
> |
continue; /* not safe to include */ |
264 |
> |
/* else compute BSDF */ |
265 |
|
ec = SDevalBSDF(&sv, vjit, vsmp, ndp->sd); |
266 |
|
if (ec) |
267 |
|
goto baderror; |
268 |
< |
if (sv.cieY - diffY <= FTINY) { |
267 |
< |
addcolor(cval, cdiff); |
268 |
> |
if (sv.cieY - diffY <= FTINY) |
269 |
|
continue; /* no specular part */ |
269 |
– |
} |
270 |
|
cvt_sdcolor(csmp, &sv); |
271 |
|
addcolor(cval, csmp); /* else average it in */ |
272 |
|
++ok; |
275 |
|
setcolor(cval, .0, .0, .0); |
276 |
|
return(0); /* no valid specular samples */ |
277 |
|
} |
278 |
< |
sf = 1./(double)nsamp; |
278 |
> |
sf = 1./(double)ok; |
279 |
|
scalecolor(cval, sf); |
280 |
|
/* subtract diffuse contribution */ |
281 |
|
for (i = 3*(diffY > FTINY); i--; ) |