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

Comparing ray/src/rt/pmaptype.h (file contents):
Revision 2.4 by greg, Tue Sep 1 16:27:53 2015 UTC vs.
Revision 2.5 by rschregle, Tue May 17 17:39:47 2016 UTC

# Line 1 | Line 1
1   /* RCSid $Id$ */
2 +
3   /*
4     ==================================================================
5     Photon map types and corresponding file format strings
# Line 9 | Line 10
10     supported by the Swiss National Science Foundation (SNSF, #147053)
11     ==================================================================
12    
13 +   $Id$
14   */
15  
16  
# Line 17 | Line 19
19    
20     /* Photon map types */
21     typedef enum {
22 <      PMAP_TYPE_NONE = -1, PMAP_TYPE_GLOBAL, PMAP_TYPE_PRECOMP,
23 <      PMAP_TYPE_CAUSTIC, PMAP_TYPE_VOLUME, PMAP_TYPE_DIRECT,
24 <      PMAP_TYPE_CONTRIB, NUM_PMAP_TYPES
22 >      PMAP_TYPE_NONE = -1, PMAP_TYPE_GLOBAL,    PMAP_TYPE_PRECOMP,
23 >      PMAP_TYPE_CAUSTIC,   PMAP_TYPE_VOLUME,    PMAP_TYPE_DIRECT,
24 >      PMAP_TYPE_CONTRIB,   NUM_PMAP_TYPES
25     } PhotonMapType;
26  
27     /* Check for valid photon map type */
28 <   #define validPmapType(t) ((t) >= 0 && (t) < NUM_PMAP_TYPES)
28 >   #define validPmapType(t)   ((t) >= 0 && (t) < NUM_PMAP_TYPES)
29    
30     /* Glob string for extracting photon map format from file header */
31     #define PMAP_FORMAT_GLOB   "Radiance_*_Photon_Map"

Diff Legend

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