122 |
|
return(0); |
123 |
|
} |
124 |
|
sf = specjitter * ndp->pr->rweight; |
125 |
< |
if (25.*tomega <= omega) |
125 |
> |
if (tomega <= .0) |
126 |
> |
nsamp = 1; |
127 |
> |
else if (25.*tomega <= omega) |
128 |
|
nsamp = 100.*sf + .5; |
129 |
|
else |
130 |
|
nsamp = 4.*sf*omega/tomega + .5; |
382 |
|
|
383 |
|
if (sflags == SDsampSpT) { |
384 |
|
unsc = ndp->tunsamp; |
385 |
< |
dfp = ndp->sd->tf; |
385 |
> |
if (ndp->pr->rod > 0) |
386 |
> |
dfp = (ndp->sd->tf != NULL) ? ndp->sd->tf : ndp->sd->tb; |
387 |
> |
else |
388 |
> |
dfp = (ndp->sd->tb != NULL) ? ndp->sd->tb : ndp->sd->tf; |
389 |
|
cvt_sdcolor(unsc, &ndp->sd->tLamb); |
390 |
|
} else /* sflags == SDsampSpR */ { |
391 |
|
unsc = ndp->runsamp; |
446 |
|
hitfront = (r->rod > 0); |
447 |
|
/* load cal file */ |
448 |
|
mf = getfunc(m, 5, 0x1d, 1); |
449 |
+ |
setfunc(m, r); |
450 |
|
/* get thickness */ |
451 |
|
nd.thick = evalue(mf->ep[0]); |
452 |
|
if ((-FTINY <= nd.thick) & (nd.thick <= FTINY)) |
476 |
|
} else { |
477 |
|
if (m->oargs.nfargs < 6) { /* check invisible backside */ |
478 |
|
if (!backvis && (nd.sd->rb == NULL) & |
479 |
< |
(nd.sd->tf == NULL)) { |
479 |
> |
(nd.sd->tb == NULL)) { |
480 |
|
SDfreeCache(nd.sd); |
481 |
|
raytrans(r); |
482 |
|
return(1); |
506 |
|
upvec[1] = evalue(mf->ep[2]); |
507 |
|
upvec[2] = evalue(mf->ep[3]); |
508 |
|
/* return to world coords */ |
509 |
< |
if (mf->f != &unitxf) { |
510 |
< |
multv3(upvec, upvec, mf->f->xfm); |
511 |
< |
nd.thick *= mf->f->sca; |
509 |
> |
if (mf->fxp != &unitxf) { |
510 |
> |
multv3(upvec, upvec, mf->fxp->xfm); |
511 |
> |
nd.thick *= mf->fxp->sca; |
512 |
|
} |
513 |
+ |
if (r->rox != NULL) { |
514 |
+ |
multv3(upvec, upvec, r->rox->f.xfm); |
515 |
+ |
nd.thick *= r->rox->f.sca; |
516 |
+ |
} |
517 |
|
raynormal(nd.pnorm, r); |
518 |
|
/* compute local BSDF xform */ |
519 |
|
ec = SDcompXform(nd.toloc, nd.pnorm, upvec); |
577 |
|
flipsurface(r); |
578 |
|
} |
579 |
|
/* add direct component */ |
580 |
< |
if ((bright(nd.tdiff) <= FTINY) & (nd.sd->tf == NULL)) { |
580 |
> |
if ((bright(nd.tdiff) <= FTINY) & (nd.sd->tf == NULL) & |
581 |
> |
(nd.sd->tb == NULL)) { |
582 |
|
direct(r, dir_brdf, &nd); /* reflection only */ |
583 |
|
} else if (nd.thick == 0) { |
584 |
|
direct(r, dir_bsdf, &nd); /* thin surface scattering */ |