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

Comparing ray/src/rt/normal.c (file contents):
Revision 2.71 by greg, Tue May 26 13:21:07 2015 UTC vs.
Revision 2.73 by greg, Wed Oct 28 15:45:58 2015 UTC

# Line 112 | Line 112 | dirnorm(               /* compute source contribution */
112                  scalecolor(ctmp, dtmp);
113                  addcolor(cval, ctmp);
114          }
115 <        
115 >
116          if (ldot < -FTINY && ltdiff > FTINY) {
117                  /*
118                   *  Compute diffuse transmission.
# Line 122 | Line 122 | dirnorm(               /* compute source contribution */
122                  scalecolor(ctmp, dtmp);
123                  addcolor(cval, ctmp);
124          }
125 <        
125 >
126 >        if (ambRayInPmap(np->rp))
127 >                return;         /* specular already in photon map */
128 >
129          if (ldot > FTINY && (np->specfl&(SP_REFL|SP_PURE)) == SP_REFL) {
130                  /*
131                   *  Compute specular reflection coefficient using
# Line 187 | Line 190 | m_normal(                      /* color a ray that hit something normal *
190          int  i;
191  
192          /* PMAP: skip transmitted shadow ray if accounted for in photon map */
193 <        if (shadowRayInPmap(r))
193 >        if (shadowRayInPmap(r) || ambRayInPmap(r))
194                  return(1);
195                                                  /* easy shadow test */
196          if (r->crtype & SHADOW && m->otype != MAT_TRANS)

Diff Legend

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