ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/m_bsdf.c
(Generate patch)

Comparing ray/src/rt/m_bsdf.c (file contents):
Revision 2.22 by greg, Sun Sep 2 15:33:15 2012 UTC vs.
Revision 2.25 by greg, Wed Jan 22 16:39:57 2014 UTC

# Line 122 | Line 122 | direct_bsdf_OK(COLOR cval, FVECT ldir, double omega, B
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;
# Line 444 | Line 446 | m_bsdf(OBJREC *m, RAY *r)
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))
# Line 506 | Line 509 | m_bsdf(OBJREC *m, RAY *r)
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 */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines