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.10 by greg, Wed Sep 2 18:59:01 2015 UTC vs.
Revision 2.11 by rschregle, Wed Oct 28 12:32:53 2015 UTC

# Line 26 | Line 26
26     */
27     #define ambRayInPmap(r)    ((r) -> crtype & AMBIENT && photonMapping && \
28                                   (ambounce < 0 || (r) -> rlvl > 1 || \
29 <                                 causticPhotonMapping || contribPhotonMapping))
29 >                                  causticPhotonMapping || \
30 >                                  contribPhotonMapping))
31  
32    /*
33        Check for paths already accounted for in photon map to avoid
# Line 40 | Line 41
41                             contrib, or dedicated caustic photon map.
42     */
43     #define shadowRayInPmap(r) ((r) -> crtype & SHADOW && \
44 <                                (ambounce < 0 || ((r) -> crtype & AMBIENT ? \
45 <                                        photonMapping : causticPhotonMapping)))
46 <  
44 >                                 (ambounce < 0 || \
45 >                                    ((r) -> crtype & AMBIENT \
46 >                                       ? photonMapping \
47 >                                       : causticPhotonMapping || \
48 >                                         contribPhotonMapping)))
49 >
50     /* Check if scattered ray spawns a caustic photon */
51     #define PMAP_CAUSTICRAY(r) ((r) -> rtype & SPECULAR)
52  

Diff Legend

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