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

Comparing ray/src/rt/pmapio.h (file contents):
Revision 2.6 by rschregle, Tue May 17 17:39:47 2016 UTC vs.
Revision 2.7 by rschregle, Fri Dec 7 20:07:41 2018 UTC

# Line 21 | Line 21
21  
22  
23     /* File format version with feature suffix */
24 <   #define PMAP_FILEVER_MAJ   "3.0"
24 >   #define PMAP_FILEVER_MAJ   "3.1"
25    
26   #ifdef PMAP_OOC
27     #define PMAP_FILEVER_TYP   "o"
# Line 36 | Line 36
36   #endif
37  
38   #ifdef PMAP_PRIMARYPOS
39 <   #define PMAP_FILEVER_PRI   "p"
39 >   #define PMAP_FILEVER_PRIPOS   "P"
40   #else
41 <   #define PMAP_FILEVER_PRI   ""
41 >   #define PMAP_FILEVER_PRIPOS   ""
42 > #endif
43 >
44 > #ifdef PMAP_PRIMARYDIR
45 >   #define PMAP_FILEVER_PRIDIR   "D"
46 > #else  
47 >   #define PMAP_FILEVER_PRIDIR   ""
48   #endif  
49    
50     #define PMAP_FILEVER       (PMAP_FILEVER_MAJ PMAP_FILEVER_TYP \
51 <                               PMAP_FILEVER_FLX PMAP_FILEVER_PRI)
51 >                               PMAP_FILEVER_FLX PMAP_FILEVER_PRIPOS \
52 >                               PMAP_FILEVER_PRIDIR)
53    
54    
55     void savePhotonMap (const PhotonMap *pmap, const char *fname,
# Line 55 | Line 62
62      * map type as identified from file header. */
63  
64   #endif
65 +

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)