Add editable terrain objects

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

diff --git a/source/libr2c2/catalogue.h b/source/libr2c2/catalogue.h
index 73ad4e8e5694949d2de20fd597df1b7cb7320fb4..5a9156097380cbebbc9bb4aa5113da65c0a96838 100644 (file)
--- a/source/libr2c2/catalogue.h
+++ b/source/libr2c2/catalogue.h
@@ -2,20 +2,19 @@
 #define LIBR2C2_CATALOGUE_H_
 
 #include <map>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
 #include "layout.h"
 #include "profile.h"
 
 namespace R2C2 {
 
-class TrackType;
-class VehicleType;
+class ObjectType;
 
 class Catalogue
 {
 public:
-       class Loader: public Msp::DataFile::BasicLoader<Catalogue>
+       class Loader: public Msp::DataFile::ObjectLoader<Catalogue>
        {
        public:
                Loader(Catalogue &);
@@ -25,27 +24,23 @@ public:
                void layout();
                void rail_profile();
                void scale(float, float);
-               void track(unsigned);
+               void signal(ArticleNumber);
+               void terrain(ArticleNumber);
                void track(ArticleNumber);
-               void vehicle(unsigned);
                void vehicle(ArticleNumber);
        };
 
-       typedef std::map<ArticleNumber, TrackType *> TrackMap;
-       typedef std::map<ArticleNumber, VehicleType *> VehicleMap;
+       typedef std::map<ArticleNumber, ObjectType *> ObjectMap;
 
-       sigc::signal<void, const TrackType &> signal_track_added;
-       sigc::signal<void, const VehicleType &> signal_vehicle_added;
+       sigc::signal<void, const ObjectType &> signal_object_added;
 
 private:
        float scale;
        float gauge;
        Profile rail_profile;
        Profile ballast_profile;
-       Profile path_profile;
        std::string track_technique;
-       TrackMap tracks;
-       VehicleMap vehicles;
+       ObjectMap objects;
        Layout layout;
 
 public:
@@ -57,16 +52,15 @@ public:
        float get_rail_elevation() const;
        const Profile &get_rail_profile() const { return rail_profile; }
        const Profile &get_ballast_profile() const { return ballast_profile; }
-       const Profile &get_path_profile() const { return path_profile; }
        const std::string &get_track_technique() const { return track_technique; }
 
-       void add_track(TrackType &);
-       const TrackType &get_track(const ArticleNumber &) const;
-       const TrackMap &get_tracks() const { return tracks; }
+       void add(ObjectType &);
+       const ObjectType &get(const ArticleNumber &) const;
+       const ObjectMap &get_all() const { return objects; }
 
-       void add_vehicle(VehicleType &);
-       const VehicleType &get_vehicle(const ArticleNumber &) const;
-       const VehicleMap &get_vehicles() const { return vehicles; }
+       template<typename T>
+       const T &get(const ArticleNumber &an) const
+       { return dynamic_cast<const T &>(get(an)); }
 
        Layout &get_layout() { return layout; }
 };