--- ray/src/rt/pmapio.h	2015/08/18 18:45:55	2.4
+++ ray/src/rt/pmapio.h	2024/09/17 16:36:05	2.9
@@ -1,15 +1,19 @@
-/* RCSid $Id: pmapio.h,v 2.4 2015/08/18 18:45:55 greg Exp $ */
+/* RCSid $Id: pmapio.h,v 2.9 2024/09/17 16:36:05 greg Exp $ */
+
 /* 
-   ==================================================================
-   Photon map file I/O
+   ======================================================================
+   Photon map portable file I/O
 
    Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
    (c) Fraunhofer Institute for Solar Energy Systems,
+       supported by the German Research Foundation 
+       (DFG LU-204/10-2, "Fassadenintegrierte Regelsysteme FARESYS") 
    (c) Lucerne University of Applied Sciences and Arts,
-   supported by the Swiss National Science Foundation (SNSF, #147053)
-   ==================================================================
+       supported by the Swiss National Science Foundation 
+       (SNSF #147053, "Daylight Redirecting Components")   
+   ======================================================================
    
-   $Id: pmapio.h,v 2.4 2015/08/18 18:45:55 greg Exp $
+   $Id: pmapio.h,v 2.9 2024/09/17 16:36:05 greg Exp $
 */
 
 
@@ -17,9 +21,46 @@
    #define PMAPIO_H
    
    #include "pmapdata.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+   /* File format version with feature suffix */
+   #define PMAP_FILEVER_MAJ   "3.1"
    
-   #define PMAP_FILEVER 160u              /* File format version */
+#ifdef PMAP_OOC
+   #define PMAP_FILEVER_TYP   "o"
+#else
+   #define PMAP_FILEVER_TYP   "k"
+#endif
+
+#ifdef PMAP_FLOAT_FLUX
+   #define PMAP_FILEVER_FLX   "f"
+#else
+   #define PMAP_FILEVER_FLX   ""
+#endif
+
+#ifdef PMAP_PRIMARYPOS
+   #define PMAP_FILEVER_PRIPOS   "P"
+#else
+   #define PMAP_FILEVER_PRIPOS   ""
+#endif
+
+#ifdef PMAP_PRIMARYDIR
+   #define PMAP_FILEVER_PRIDIR   "D"
+#else   
+   #define PMAP_FILEVER_PRIDIR   ""
+#endif   
    
+   #define PMAP_FILEVER       (PMAP_FILEVER_MAJ PMAP_FILEVER_TYP \
+                               PMAP_FILEVER_FLX PMAP_FILEVER_PRIPOS \
+                               PMAP_FILEVER_PRIDIR)
+   
+   /* Maximum portable size of a long int in photon map file */
+   #define PMAP_LONGSIZE      8                               
+   
+   
    void savePhotonMap (const PhotonMap *pmap, const char *fname,
                        int argc, char **argv);
    /* Save portable photon map of specified type to filename,
@@ -28,5 +69,9 @@
    PhotonMapType loadPhotonMap (PhotonMap *pmap, const char* fname);
    /* Load portable photon map from specified filename, and return photon
     * map type as identified from file header. */
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif