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.8 by rschregle, Thu Feb 18 17:08:50 2021 UTC

# Line 2 | Line 2
2  
3   /*
4     ======================================================================
5 <   Photon map file I/O
5 >   Photon map portable file I/O
6  
7     Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
8     (c) Fraunhofer Institute for Solar Energy Systems,
9 +       supported by the German Research Foundation
10 +       (DFG LU-204/10-2, "Fassadenintegrierte Regelsysteme FARESYS")
11     (c) Lucerne University of Applied Sciences and Arts,
12 <       supported by the Swiss National Science Foundation (SNSF, #147053)
12 >       supported by the Swiss National Science Foundation
13 >       (SNSF #147053, "Daylight Redirecting Components")  
14     ======================================================================
15    
16     $Id$
# Line 21 | Line 24
24  
25  
26     /* File format version with feature suffix */
27 <   #define PMAP_FILEVER_MAJ   "3.0"
27 >   #define PMAP_FILEVER_MAJ   "3.1"
28    
29   #ifdef PMAP_OOC
30     #define PMAP_FILEVER_TYP   "o"
# Line 36 | Line 39
39   #endif
40  
41   #ifdef PMAP_PRIMARYPOS
42 <   #define PMAP_FILEVER_PRI   "p"
42 >   #define PMAP_FILEVER_PRIPOS   "P"
43   #else
44 <   #define PMAP_FILEVER_PRI   ""
44 >   #define PMAP_FILEVER_PRIPOS   ""
45 > #endif
46 >
47 > #ifdef PMAP_PRIMARYDIR
48 >   #define PMAP_FILEVER_PRIDIR   "D"
49 > #else  
50 >   #define PMAP_FILEVER_PRIDIR   ""
51   #endif  
52    
53     #define PMAP_FILEVER       (PMAP_FILEVER_MAJ PMAP_FILEVER_TYP \
54 <                               PMAP_FILEVER_FLX PMAP_FILEVER_PRI)
54 >                               PMAP_FILEVER_FLX PMAP_FILEVER_PRIPOS \
55 >                               PMAP_FILEVER_PRIDIR)
56    
57 +   /* Maximum portable size of a long int in photon map file */
58 +   #define PMAP_LONGSIZE      8                              
59    
60 +  
61     void savePhotonMap (const PhotonMap *pmap, const char *fname,
62                         int argc, char **argv);
63     /* Save portable photon map of specified type to filename,
# Line 55 | Line 68
68      * map type as identified from file header. */
69  
70   #endif
71 +

Diff Legend

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