73 |
|
RREAL fromloc[3][3]; /* local BSDF coords to world */ |
74 |
|
double thick; /* surface thickness */ |
75 |
|
SDData *sd; /* loaded BSDF data */ |
76 |
< |
COLOR runsamp; /* BSDF hemispherical reflection */ |
77 |
< |
COLOR rdiff; /* added diffuse reflection */ |
78 |
< |
COLOR tunsamp; /* BSDF hemispherical transmission */ |
79 |
< |
COLOR tdiff; /* added diffuse transmission */ |
76 |
> |
COLOR rdiff; /* diffuse reflection */ |
77 |
> |
COLOR tdiff; /* diffuse transmission */ |
78 |
|
} BSDFDAT; /* BSDF material data */ |
79 |
|
|
80 |
|
#define cvt_sdcolor(cv, svp) ccy2rgb(&(svp)->spec, (svp)->cieY, cv) |
206 |
|
*/ |
207 |
|
if (!direct_bsdf_OK(ctmp, ldir, omega, np)) |
208 |
|
return; |
209 |
< |
if (ldot > 0) { /* pattern only diffuse reflection */ |
212 |
< |
COLOR ctmp1, ctmp2; |
213 |
< |
dtmp = (np->pr->rod > 0) ? np->sd->rLambFront.cieY |
214 |
< |
: np->sd->rLambBack.cieY; |
215 |
< |
/* diffuse fraction */ |
216 |
< |
dtmp /= PI * bright(ctmp); |
217 |
< |
copycolor(ctmp2, np->pr->pcol); |
218 |
< |
scalecolor(ctmp2, dtmp); |
219 |
< |
setcolor(ctmp1, 1.-dtmp, 1.-dtmp, 1.-dtmp); |
220 |
< |
addcolor(ctmp1, ctmp2); |
221 |
< |
multcolor(ctmp, ctmp1); /* apply derated pattern */ |
222 |
< |
dtmp = ldot * omega; |
223 |
< |
} else { /* full pattern on transmission */ |
209 |
> |
if (ldot < 0) { /* pattern for specular transmission */ |
210 |
|
multcolor(ctmp, np->pr->pcol); |
211 |
|
dtmp = -ldot * omega; |
212 |
< |
} |
212 |
> |
} else |
213 |
> |
dtmp = ldot * omega; |
214 |
|
scalecolor(ctmp, dtmp); |
215 |
|
addcolor(cval, ctmp); |
216 |
|
} |
252 |
|
*/ |
253 |
|
if (!direct_bsdf_OK(ctmp, ldir, omega, np)) |
254 |
|
return; |
268 |
– |
/* pattern only diffuse reflection */ |
269 |
– |
dtmp = (np->pr->rod > 0) ? np->sd->rLambFront.cieY |
270 |
– |
: np->sd->rLambBack.cieY; |
271 |
– |
dtmp /= PI * bright(ctmp); /* diffuse fraction */ |
272 |
– |
copycolor(ctmp2, np->pr->pcol); |
273 |
– |
scalecolor(ctmp2, dtmp); |
274 |
– |
setcolor(ctmp1, 1.-dtmp, 1.-dtmp, 1.-dtmp); |
275 |
– |
addcolor(ctmp1, ctmp2); |
276 |
– |
multcolor(ctmp, ctmp1); /* apply derated pattern */ |
255 |
|
dtmp = ldot * omega; |
256 |
|
scalecolor(ctmp, dtmp); |
257 |
|
addcolor(cval, ctmp); |
366 |
|
COLORV *unsc; |
367 |
|
|
368 |
|
if (sflags == SDsampSpT) { |
369 |
< |
unsc = ndp->tunsamp; |
369 |
> |
unsc = ndp->tdiff; |
370 |
|
if (ndp->pr->rod > 0) |
371 |
|
dfp = (ndp->sd->tf != NULL) ? ndp->sd->tf : ndp->sd->tb; |
372 |
|
else |
373 |
|
dfp = (ndp->sd->tb != NULL) ? ndp->sd->tb : ndp->sd->tf; |
396 |
– |
cvt_sdcolor(unsc, &ndp->sd->tLamb); |
374 |
|
} else /* sflags == SDsampSpR */ { |
375 |
< |
unsc = ndp->runsamp; |
376 |
< |
if (ndp->pr->rod > 0) { |
375 |
> |
unsc = ndp->rdiff; |
376 |
> |
if (ndp->pr->rod > 0) |
377 |
|
dfp = ndp->sd->rf; |
378 |
< |
cvt_sdcolor(unsc, &ndp->sd->rLambFront); |
402 |
< |
} else { |
378 |
> |
else |
379 |
|
dfp = ndp->sd->rb; |
404 |
– |
cvt_sdcolor(unsc, &ndp->sd->rLambBack); |
405 |
– |
} |
380 |
|
} |
407 |
– |
multcolor(unsc, ndp->pr->pcol); |
381 |
|
if (dfp == NULL) /* no specular component? */ |
382 |
|
return(0); |
383 |
|
/* below sampling threshold? */ |
448 |
|
raytrans(r); /* hide our proxy */ |
449 |
|
return(1); |
450 |
|
} |
451 |
+ |
nd.mp = m; |
452 |
+ |
nd.pr = r; |
453 |
|
/* get BSDF data */ |
454 |
|
nd.sd = loadBSDF(m->oargs.sarg[1]); |
455 |
|
/* diffuse reflectance */ |
456 |
|
if (hitfront) { |
457 |
< |
if (m->oargs.nfargs < 3) |
458 |
< |
setcolor(nd.rdiff, .0, .0, .0); |
459 |
< |
else |
485 |
< |
setcolor(nd.rdiff, m->oargs.farg[0], |
457 |
> |
cvt_sdcolor(nd.rdiff, &nd.sd->rLambFront); |
458 |
> |
if (m->oargs.nfargs >= 3) { |
459 |
> |
setcolor(ctmp, m->oargs.farg[0], |
460 |
|
m->oargs.farg[1], |
461 |
|
m->oargs.farg[2]); |
462 |
+ |
addcolor(nd.rdiff, ctmp); |
463 |
+ |
} |
464 |
|
} else { |
465 |
< |
if (m->oargs.nfargs < 6) |
466 |
< |
setcolor(nd.rdiff, .0, .0, .0); |
467 |
< |
else |
492 |
< |
setcolor(nd.rdiff, m->oargs.farg[3], |
465 |
> |
cvt_sdcolor(nd.rdiff, &nd.sd->rLambBack); |
466 |
> |
if (m->oargs.nfargs >= 6) { |
467 |
> |
setcolor(ctmp, m->oargs.farg[3], |
468 |
|
m->oargs.farg[4], |
469 |
|
m->oargs.farg[5]); |
470 |
+ |
addcolor(nd.rdiff, ctmp); |
471 |
+ |
} |
472 |
|
} |
473 |
|
/* diffuse transmittance */ |
474 |
< |
if (m->oargs.nfargs < 9) |
475 |
< |
setcolor(nd.tdiff, .0, .0, .0); |
476 |
< |
else |
500 |
< |
setcolor(nd.tdiff, m->oargs.farg[6], |
474 |
> |
cvt_sdcolor(nd.tdiff, &nd.sd->tLamb); |
475 |
> |
if (m->oargs.nfargs >= 9) { |
476 |
> |
setcolor(ctmp, m->oargs.farg[6], |
477 |
|
m->oargs.farg[7], |
478 |
|
m->oargs.farg[8]); |
479 |
< |
nd.mp = m; |
480 |
< |
nd.pr = r; |
479 |
> |
addcolor(nd.tdiff, ctmp); |
480 |
> |
} |
481 |
|
/* get modifiers */ |
482 |
|
raytexture(r, m->omod); |
483 |
|
/* modify diffuse values */ |
528 |
|
/* sample transmission */ |
529 |
|
sample_sdf(&nd, SDsampSpT); |
530 |
|
/* compute indirect diffuse */ |
531 |
< |
copycolor(ctmp, nd.rdiff); |
556 |
< |
addcolor(ctmp, nd.runsamp); |
557 |
< |
if (bright(ctmp) > FTINY) { /* ambient from reflection */ |
531 |
> |
if (bright(nd.rdiff) > FTINY) { /* ambient from reflection */ |
532 |
|
if (!hitfront) |
533 |
|
flipsurface(r); |
534 |
+ |
copycolor(ctmp, nd.rdiff); |
535 |
|
multambient(ctmp, r, nd.pnorm); |
536 |
|
addcolor(r->rcol, ctmp); |
537 |
|
if (!hitfront) |
538 |
|
flipsurface(r); |
539 |
|
} |
540 |
< |
copycolor(ctmp, nd.tdiff); |
566 |
< |
addcolor(ctmp, nd.tunsamp); |
567 |
< |
if (bright(ctmp) > FTINY) { /* ambient from other side */ |
540 |
> |
if (bright(nd.tdiff) > FTINY) { /* ambient from other side */ |
541 |
|
FVECT bnorm; |
542 |
|
if (hitfront) |
543 |
|
flipsurface(r); |
544 |
|
bnorm[0] = -nd.pnorm[0]; |
545 |
|
bnorm[1] = -nd.pnorm[1]; |
546 |
|
bnorm[2] = -nd.pnorm[2]; |
547 |
+ |
copycolor(ctmp, nd.tdiff); |
548 |
|
if (nd.thick != 0) { /* proxy with offset? */ |
549 |
|
VCOPY(vtmp, r->rop); |
550 |
|
VSUM(r->rop, vtmp, r->ron, nd.thick); |