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

Comparing ray/src/rt/pmap.h (file contents):
Revision 2.3 by rschregle, Fri May 8 13:20:22 2015 UTC vs.
Revision 2.6 by greg, Tue Sep 1 16:27:52 2015 UTC

# Line 1 | Line 1
1 + /* RCSid $Id$ */
2   /*
3     ==================================================================
4     Photon map main header
# Line 8 | Line 9
9     supported by the Swiss National Science Foundation (SNSF, #147053)
10     ==================================================================
11    
11 –   $Id$
12   */
13  
14  
# Line 34 | Line 34
34  
35     /* Macros to test for enabled photon maps */
36     #define photonMapping         (globalPmap || preCompPmap || \
37 <                                  causticPmap ||contribPmap)
38 <   #define causticPhotonMapping  (causticPmap)
39 <   #define directPhotonMapping   (directPmap)
40 <   #define volumePhotonMapping   (volumePmap)
37 >                                  causticPmap || contribPmap)
38 >   #define causticPhotonMapping  (causticPmap != NULL)
39 >   #define directPhotonMapping   (directPmap != NULL)
40 >   #define volumePhotonMapping   (volumePmap != NULL)
41     #define contribPhotonMapping  (contribPmap && contribPmap -> srcContrib)
42    
43    

Diff Legend

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