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.7 by rschregle, Wed Jul 29 18:54:20 2015 UTC vs.
Revision 2.10 by greg, Wed Sep 2 18:59:01 2015 UTC

# Line 1 | Line 1
1 + /* RCSid $Id$ */
2   /*
3     ==================================================================
4     Photon map support routines for scattering by materials.
# Line 8 | Line 9
9     supported by the Swiss National Science Foundation (SNSF, #147053)
10     ==================================================================
11    
11 –   $Id$
12   */
13  
14  
# Line 17 | Line 17
17  
18     #include "pmap.h"
19  
20 <   /*
20 >  /*
21 >    ambRayInPmap():      Check for DIFFUSE -> (DIFFUSE|SPECULAR) -> *    
22 >                            subpaths.  These occur during the backward pass      
23 >                            when an ambient ray spawns an indirect diffuse or    
24 >                            specular ray.  These subpaths are already    
25 >                            accounted for in the global photon map.
26 >   */
27 >   #define ambRayInPmap(r)    ((r) -> crtype & AMBIENT && photonMapping && \
28 >                                 (ambounce < 0 || (r) -> rlvl > 1 || \
29 >                                 causticPhotonMapping || contribPhotonMapping))
30 >
31 >  /*
32        Check for paths already accounted for in photon map to avoid
33        double-counting during backward raytracing.
34      
# Line 28 | Line 39
39                             accounted for by caustic photons in the global,
40                             contrib, or dedicated caustic photon map.
41     */
31 – /*
32 –   #define ambRayInPmap(r)    ((r) -> crtype & AMBIENT && \
33 –                               ((photonMapping && \
34 –                                 (ambounce < 0 || (r) -> rlvl > 1)) || \
35 –                                 causticPhotonMapping || contribPhotonMapping))
36 – */
37 –   #define ambRayInPmap(r)    0
42     #define shadowRayInPmap(r) ((r) -> crtype & SHADOW && \
43                                  (ambounce < 0 || ((r) -> crtype & AMBIENT ? \
44                                          photonMapping : causticPhotonMapping)))

Diff Legend

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