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

Comparing ray/src/rt/pmapmat.h (file contents):
Revision 2.1 by greg, Tue Feb 24 19:39:27 2015 UTC vs.
Revision 2.4 by greg, Thu May 21 15:28:24 2015 UTC

# Line 4 | Line 4
4    
5     Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
6     (c) Fraunhofer Institute for Solar Energy Systems,
7 <       Lucerne University of Applied Sciences & Arts
7 >   (c) Lucerne University of Applied Sciences and Arts,
8 >   supported by the Swiss National Science Foundation (SNSF, #147053)
9     ==================================================================
10    
11     $Id$
# Line 33 | Line 34
34                             accounted for by caustic photons in the global,
35                             contrib, or dedicated caustic photon map.
36     */
37 <   #define ambRayInPmap(r)    ((r) -> crtype & AMBIENT && photonMapping)
38 <  
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
44     #define shadowRayInPmap(r) ((r) -> crtype & SHADOW && \
45 <                               ((photonMapping && ambounce < 0) || \
40 <                                (causticPhotonMapping || \
41 <                                 contribPhotonMapping)))
45 >                                (ambounce < 0 || causticPhotonMapping))
46    
47     /* Check if scattered ray spawns a caustic photon */
48     #define PMAP_CAUSTICRAY(r) ((r) -> rtype & SPECULAR)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines