ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/pmapmat.h
(Generate patch)

Comparing ray/src/rt/pmapmat.h (file contents):
Revision 2.4 by greg, Thu May 21 15:28:24 2015 UTC vs.
Revision 2.5 by greg, Tue May 26 13:21:07 2015 UTC

# Line 18 | Line 18
18     #include "pmap.h"
19  
20     /*
21 <      Checks for paths already accounted for in photon map to avoid
21 >      Check for paths already accounted for in photon map to avoid
22        double-counting during backward raytracing.
23      
24 –      ambRayInPmap():      Check for DIFFUSE -> (DIFFUSE|SPECULAR) -> *
25 –                           subpaths.  These occur during the backward pass
26 –                           when an ambient ray spawns an indirect diffuse or
27 –                           specular ray.  These subpaths are already
28 –                           accounted for in the global photon map.
29 –      
24        shadowRayInPmap():   Check for DIFFUSE -> SPECULAR -> LIGHT
25                             subpaths. These occur during the backward pass
26                             when a shadow ray is transferred through a
# Line 34 | Line 28
28                             accounted for by caustic photons in the global,
29                             contrib, or dedicated caustic photon map.
30     */
37 –   /*
38 –   #define ambRayInPmap(r)    ((r) -> crtype & AMBIENT && \
39 –                               ((photonMapping && \
40 –                                 (ambounce < 0 || (r) -> rlvl > 1)) || \
41 –                                 causticPhotonMapping || contribPhotonMapping))
42 –   */
43 –   #define ambRayInPmap(r)    0
31     #define shadowRayInPmap(r) ((r) -> crtype & SHADOW && \
32                                  (ambounce < 0 || causticPhotonMapping))
33    

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)