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.5 by greg, Tue May 26 13:21:07 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 17 | 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      
23      ambRayInPmap():      Check for DIFFUSE -> (DIFFUSE|SPECULAR) -> *
24                           subpaths.  These occur during the backward pass
25                           when an ambient ray spawns an indirect diffuse or
26                           specular ray.  These subpaths are already
27                           accounted for in the global photon map.
28      
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 33 | Line 28
28                             accounted for by caustic photons in the global,
29                             contrib, or dedicated caustic photon map.
30     */
36   #define ambRayInPmap(r)    ((r) -> crtype & AMBIENT && photonMapping)
37  
31     #define shadowRayInPmap(r) ((r) -> crtype & SHADOW && \
32 <                               ((photonMapping && ambounce < 0) || \
40 <                                (causticPhotonMapping || \
41 <                                 contribPhotonMapping)))
32 >                                (ambounce < 0 || causticPhotonMapping))
33    
34     /* Check if scattered ray spawns a caustic photon */
35     #define PMAP_CAUSTICRAY(r) ((r) -> rtype & SPECULAR)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines