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.8 by rschregle, Mon Aug 14 21:12:10 2017 UTC vs.
Revision 2.10 by greg, Tue Sep 17 16:36:04 2024 UTC

# Line 28 | Line 28
28     #include "pmapparm.h"
29     #include "pmapdata.h"
30  
31 + #ifdef __cplusplus
32 + extern "C" {
33 + #endif
34  
35     #ifndef min
36        #define min(a, b)          ((a) < (b) ? (a) : (b))
# Line 48 | Line 51
51     #define causticPhotonMapping  (causticPmap != NULL)
52     #define directPhotonMapping   (directPmap != NULL)
53     #define volumePhotonMapping   (volumePmap != NULL)
54 <   #define contribPhotonMapping  (contribPmap && contribPmap -> srcContrib)
55 <  
56 <  
54 >   /* #define contribPhotonMapping  (contribPmap && contribPmap -> srcContrib)
55 >    */
56 >   #define contribPhotonMapping  (contribPmap)
57 >      
58  
59     extern void (*pmapLookup [])(PhotonMap*, RAY*, COLOR);
60     /* Photon map lookup functions per type */
# Line 86 | Line 90
90  
91     void colorNorm (COLOR);
92     /* Normalise colour channels to average of 1 */
93 +
94 + #ifdef __cplusplus
95 + }
96 + #endif
97  
98   #endif

Diff Legend

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