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.2 by greg, Tue Apr 21 19:16:51 2015 UTC vs.
Revision 2.4 by greg, Tue May 26 15:58:34 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  
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