Split mesh generation from Track3D to TrackType3D

[r2c2.git] / source / libmarklin / catalogue.h

diff --git a/source/libmarklin/catalogue.h b/source/libmarklin/catalogue.h
index 4ce6fb1b712de8daa3d32f988d5ec5d43f0b6623..5d88c28dcd0dac2543421bad27e6ced57da3e0ba 100644 (file)
--- a/source/libmarklin/catalogue.h
+++ b/source/libmarklin/catalogue.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -10,6 +10,7 @@ Distributed under the GPL
 
 #include <map>
 #include <msp/datafile/loader.h>
+#include "profile.h"
 
 namespace Marklin {
 
@@ -24,17 +25,30 @@ public:
        public:
                Loader(Catalogue &);
        private:
+               void ballast_profile();
+               void gauge(float);
                void locomotive(unsigned);
+               void rail_profile();
+               void scale(float, float);
                void track(unsigned);
        };
 
 private:
+       float scale;
+       float gauge;
+       Profile rail_profile;
+       Profile ballast_profile;
        std::map<unsigned, TrackType *> tracks;
        std::map<unsigned, LocoType *> locos;
 
 public:
+       Catalogue();
        ~Catalogue();
 
+       float get_scale() const { return scale; }
+       float get_gauge() const { return gauge; }
+       const Profile &get_rail_profile() const { return rail_profile; }
+       const Profile &get_ballast_profile() const { return ballast_profile; }
        TrackType &get_track(unsigned) const;
        const std::map<unsigned, TrackType *> &get_tracks() const { return tracks; }
        LocoType &get_locomotive(unsigned) const;