17 |
|
#include "pmapmat.h" |
18 |
|
|
19 |
|
/* |
20 |
< |
* Arguments to this material include optional diffuse colors. |
20 |
> |
* Arguments to this material include optional diffuse colors. |
21 |
|
* String arguments include the BSDF and function files. |
22 |
|
* For the MAT_BSDF type, a non-zero thickness causes the useful behavior |
23 |
|
* of translating transmitted rays this distance beneath the surface |
87 |
|
RREAL fromloc[3][3]; /* local BSDF coords to world */ |
88 |
|
double thick; /* surface thickness */ |
89 |
|
COLOR cthru; /* "through" component for MAT_ABSDF */ |
90 |
+ |
COLOR cthru_surr; /* surround for "through" component */ |
91 |
|
SDData *sd; /* loaded BSDF data */ |
92 |
|
COLOR rdiff; /* diffuse reflection */ |
93 |
|
COLOR runsamp; /* BSDF hemispherical reflection */ |
130 |
|
{1.8, -1.8}, {-2.4, 0}, {0, 2.4}, |
131 |
|
{0, -2.4}, {2.4, 0}, |
132 |
|
}; |
132 |
– |
const double peak_over = 1.5; |
133 |
|
PEAKSAMP psamp[NDIR2CHECK]; |
134 |
|
SDSpectralDF *dfp; |
135 |
|
FVECT pdir; |
136 |
|
double tomega, srchrad; |
137 |
< |
double tomsum; |
138 |
< |
COLOR vpeak; |
139 |
< |
double vypeak, vysum; |
140 |
< |
int i, ns, ntot; |
137 |
> |
double tomsum, tomsurr; |
138 |
> |
COLOR vpeak, vsurr; |
139 |
> |
double vypeak; |
140 |
> |
int i, ns; |
141 |
|
SDError ec; |
142 |
|
|
143 |
|
if (ndp->pr->rod > 0) |
150 |
|
if (bright(ndp->pr->pcol) <= FTINY) |
151 |
|
return; /* pattern is black, here */ |
152 |
|
srchrad = sqrt(dfp->minProjSA); /* else evaluate peak */ |
153 |
– |
vysum = 0; |
153 |
|
for (i = 0; i < NDIR2CHECK; i++) { |
154 |
|
SDValue sv; |
155 |
|
psamp[i].tdir[0] = -ndp->vray[0] + dir2check[i][0]*srchrad; |
160 |
|
if (ec) |
161 |
|
goto baderror; |
162 |
|
cvt_sdcolor(psamp[i].vcol, &sv); |
163 |
< |
vysum += psamp[i].vy = sv.cieY; |
163 |
> |
psamp[i].vy = sv.cieY; |
164 |
|
} |
166 |
– |
if (vysum <= FTINY) /* zero neighborhood? */ |
167 |
– |
return; |
165 |
|
qsort(psamp, NDIR2CHECK, sizeof(PEAKSAMP), cmp_psamp); |
166 |
+ |
if (psamp[0].vy <= FTINY) |
167 |
+ |
return; /* zero BTDF here */ |
168 |
|
setcolor(vpeak, 0, 0, 0); |
169 |
< |
vypeak = tomsum = 0; /* combine top unique values */ |
170 |
< |
ns = 0; ntot = NDIR2CHECK; |
169 |
> |
setcolor(vsurr, 0, 0, 0); |
170 |
> |
vypeak = tomsum = tomsurr = 0; /* combine top unique values */ |
171 |
> |
ns = 0; |
172 |
|
for (i = 0; i < NDIR2CHECK; i++) { |
173 |
< |
if (i) { |
174 |
< |
if (psamp[i].vy == psamp[i-1].vy) { |
175 |
< |
vysum -= psamp[i].vy; |
176 |
< |
--ntot; |
177 |
< |
continue; /* assume duplicate sample */ |
178 |
< |
} |
179 |
< |
if (vypeak > 8.*psamp[i].vy*ns) |
180 |
< |
continue; /* peak cut-off */ |
181 |
< |
} |
173 |
> |
if (i && psamp[i].vy == psamp[i-1].vy) |
174 |
> |
continue; /* assume duplicate sample */ |
175 |
> |
|
176 |
|
ec = SDsizeBSDF(&tomega, psamp[i].tdir, ndp->vray, |
177 |
|
SDqueryMin, ndp->sd); |
178 |
|
if (ec) |
179 |
|
goto baderror; |
180 |
< |
if (tomega > 1.5*dfp->minProjSA) { |
181 |
< |
if (!i) return; /* not really a peak? */ |
180 |
> |
|
181 |
> |
scalecolor(psamp[i].vcol, tomega); |
182 |
> |
/* not part of peak? */ |
183 |
> |
if (tomega > 1.5*dfp->minProjSA || |
184 |
> |
vypeak > 8.*psamp[i].vy*ns) { |
185 |
> |
if (!i) return; /* abort */ |
186 |
> |
addcolor(vsurr, psamp[i].vcol); |
187 |
> |
tomsurr += tomega; |
188 |
|
continue; |
189 |
|
} |
190 |
– |
scalecolor(psamp[i].vcol, tomega); |
190 |
|
addcolor(vpeak, psamp[i].vcol); |
191 |
|
tomsum += tomega; |
192 |
|
vypeak += psamp[i].vy; |
193 |
|
++ns; |
194 |
|
} |
195 |
< |
if (vypeak*(ntot-ns) < peak_over*(vysum-vypeak)*ns) |
196 |
< |
return; /* peak not peaky enough */ |
197 |
< |
if ((vypeak/ns - ndp->sd->tLamb.cieY*(1./PI))*tomsum <= .001) |
198 |
< |
return; /* < 0.1% transmission */ |
195 |
> |
if (tomsurr <= FTINY) /* no surround implies no peak */ |
196 |
> |
return; |
197 |
> |
if ((vypeak/ns - (ndp->vray[2] > 0 ? ndp->sd->tLambFront.cieY |
198 |
> |
: ndp->sd->tLambBack.cieY)*(1./PI))*tomsum < .0005) |
199 |
> |
return; /* < 0.05% transmission */ |
200 |
|
copycolor(ndp->cthru, vpeak); /* already scaled by omega */ |
201 |
|
multcolor(ndp->cthru, ndp->pr->pcol); /* modify by pattern */ |
202 |
+ |
scalecolor(vsurr, 1./tomsurr); /* surround is avg. BTDF */ |
203 |
+ |
copycolor(ndp->cthru_surr, vsurr); |
204 |
+ |
multcolor(ndp->cthru_surr, ndp->pr->pcol); |
205 |
|
return; |
206 |
|
baderror: |
207 |
|
objerror(ndp->mp, USER, transSDError(ec)); |
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; |
253 |
|
return(0); /* all diffuse */ |
254 |
|
sv = ndp->sd->rLambBack; |
255 |
|
break; |
256 |
< |
default: |
256 |
> |
case 1: |
257 |
|
if ((ndp->sd->tf == NULL) & (ndp->sd->tb == NULL)) |
258 |
|
return(0); /* all diffuse */ |
259 |
< |
sv = ndp->sd->tLamb; |
259 |
> |
sv = ndp->sd->tLambFront; |
260 |
|
break; |
261 |
+ |
case 2: |
262 |
+ |
if ((ndp->sd->tf == NULL) & (ndp->sd->tb == NULL)) |
263 |
+ |
return(0); /* all diffuse */ |
264 |
+ |
sv = ndp->sd->tLambBack; |
265 |
+ |
break; |
266 |
|
} |
267 |
|
if (sv.cieY > FTINY) { |
268 |
|
diffY = sv.cieY *= 1./PI; |
271 |
|
diffY = 0; |
272 |
|
setcolor(cdiff, 0, 0, 0); |
273 |
|
} |
266 |
– |
/* need projected solid angle */ |
267 |
– |
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))) |
284 |
< |
return(0); |
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); |
288 |
> |
return(1); /* return non-zero surround BTDF */ |
289 |
> |
} |
290 |
|
} |
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; |
289 |
< |
else |
290 |
< |
nsamp = 4.*sf*omega/tomega + .5; |
291 |
< |
nsamp += !nsamp; |
292 |
< |
sf = sqrt(omega); /* sample our source area */ |
293 |
< |
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--; ) { |
295 |
– |
VCOPY(vsmp, vsrc); /* jitter query directions */ |
296 |
– |
if (nsamp > 1) { |
297 |
– |
multisamp(sd, 2, (i + frandom())/(double)nsamp); |
298 |
– |
vsmp[0] += (sd[0] - .5)*sf; |
299 |
– |
vsmp[1] += (sd[1] - .5)*sf; |
300 |
– |
normalize(vsmp); |
301 |
– |
} |
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); |
316 |
– |
#if 0 |
317 |
– |
if (sf < 2.5*tsr) { /* weight by BSDF for small sources */ |
318 |
– |
scalecolor(csmp, sv.cieY); |
319 |
– |
wtot += sv.cieY; |
320 |
– |
} else |
321 |
– |
#endif |
322 |
– |
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 |
|
} |
661 |
|
SDfreeCache(nd.sd); |
662 |
|
return(1); |
663 |
|
} |
664 |
< |
/* diffuse reflectance */ |
664 |
> |
/* diffuse components */ |
665 |
|
if (hitfront) { |
666 |
|
cvt_sdcolor(nd.rdiff, &nd.sd->rLambFront); |
667 |
|
if (m->oargs.nfargs >= 3) { |
670 |
|
m->oargs.farg[2]); |
671 |
|
addcolor(nd.rdiff, ctmp); |
672 |
|
} |
673 |
+ |
cvt_sdcolor(nd.tdiff, &nd.sd->tLambFront); |
674 |
|
} else { |
675 |
|
cvt_sdcolor(nd.rdiff, &nd.sd->rLambBack); |
676 |
|
if (m->oargs.nfargs >= 6) { |
679 |
|
m->oargs.farg[5]); |
680 |
|
addcolor(nd.rdiff, ctmp); |
681 |
|
} |
682 |
+ |
cvt_sdcolor(nd.tdiff, &nd.sd->tLambBack); |
683 |
|
} |
684 |
< |
/* diffuse transmittance */ |
690 |
< |
cvt_sdcolor(nd.tdiff, &nd.sd->tLamb); |
691 |
< |
if (m->oargs.nfargs >= 9) { |
684 |
> |
if (m->oargs.nfargs >= 9) { /* add diffuse transmittance? */ |
685 |
|
setcolor(ctmp, m->oargs.farg[6], |
686 |
|
m->oargs.farg[7], |
687 |
|
m->oargs.farg[8]); |
720 |
|
return(1); |
721 |
|
} |
722 |
|
setcolor(nd.cthru, 0, 0, 0); /* consider through component */ |
723 |
+ |
setcolor(nd.cthru_surr, 0, 0, 0); |
724 |
|
if (m->otype == MAT_ABSDF) { |
725 |
|
compute_through(&nd); |
726 |
|
if (r->crtype & SHADOW) { |