Add editable terrain objects

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

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index ab268cd84eeb2bc7a47a72d7665ee034c7537c8c..779e210b1375ad1e4bb09055e7251a33f9194fa2 100644 (file)
--- a/source/libr2c2/catalogue.cpp
+++ b/source/libr2c2/catalogue.cpp
@@ -3,6 +3,7 @@
 #include <msp/datafile/parser.h>
 #include "catalogue.h"
 #include "signaltype.h"
+#include "terraintype.h"
 #include "tracktype.h"
 #include "vehicletype.h"
 
@@ -19,11 +20,7 @@ Catalogue::Catalogue():
 
 Catalogue::~Catalogue()
 {
-       for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               delete i->second;
-       for(SignalMap::iterator i=signals.begin(); i!=signals.end(); ++i)
-               delete i->second;
-       for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+       for(ObjectMap::iterator i=objects.begin(); i!=objects.end(); ++i)
                delete i->second;
 }
 
@@ -32,37 +29,15 @@ float Catalogue::get_rail_elevation() const
        return ballast_profile.get_height()+rail_profile.get_height();
 }
 
-void Catalogue::add_track(TrackType &track)
-{
-       insert_unique(tracks, track.get_article_number(), &track);
-       signal_track_added.emit(track);
-}
-
-const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
+void Catalogue::add(ObjectType &object)
 {
-       return *get_item(tracks, art_nr);
+       insert_unique(objects, object.get_article_number(), &object);
+       signal_object_added.emit(object);
 }
 
-void Catalogue::add_vehicle(VehicleType &veh)
+const ObjectType &Catalogue::get(const ArticleNumber &art_nr) const
 {
-       insert_unique(vehicles, veh.get_article_number(), &veh);
-       signal_vehicle_added.emit(veh);
-}
-
-const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
-{
-       return *get_item(vehicles, art_nr);
-}
-
-void Catalogue::add_signal(SignalType &sig)
-{
-       insert_unique(signals, sig.get_article_number(), &sig);
-       signal_signal_added.emit(sig);
-}
-
-const SignalType &Catalogue::get_signal(const ArticleNumber &art_nr) const
-{
-       return *get_item(signals, art_nr);
+       return *get_item(objects, art_nr);
 }
 
 
@@ -75,6 +50,7 @@ Catalogue::Loader::Loader(Catalogue &c):
        add("rail_profile", &Loader::rail_profile);
        add("scale", &Loader::scale);
        add("signal", &Loader::signal);
+       add("terrain", &Loader::terrain);
        add("track", &Loader::track);
        add("track_technique", &Catalogue::track_technique);
        add("vehicle", &Loader::vehicle);
@@ -107,32 +83,42 @@ void Catalogue::Loader::scale(float n, float d)
 
 void Catalogue::Loader::signal(ArticleNumber art_nr)
 {
-       if(obj.signals.count(art_nr))
+       if(obj.objects.count(art_nr))
                throw key_error(art_nr);
 
        RefPtr<SignalType> sig = new SignalType(art_nr);
        load_sub(*sig);
-       obj.add_signal(*sig.release());
+       obj.add(*sig.release());
+}
+
+void Catalogue::Loader::terrain(ArticleNumber art_nr)
+{
+       if(obj.objects.count(art_nr))
+               throw key_error(art_nr);
+
+       RefPtr<TerrainType> ter = new TerrainType(art_nr);
+       load_sub(*ter);
+       obj.add(*ter.release());
 }
 
 void Catalogue::Loader::track(ArticleNumber art_nr)
 {
-       if(obj.tracks.count(art_nr))
+       if(obj.objects.count(art_nr))
                throw key_error(art_nr);
 
        RefPtr<TrackType> trk = new TrackType(art_nr);
        load_sub(*trk);
-       obj.add_track(*trk.release());
+       obj.add(*trk.release());
 }
 
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
-       if(obj.vehicles.count(art_nr))
+       if(obj.objects.count(art_nr))
                throw key_error(art_nr);
 
        RefPtr<VehicleType> veh = new VehicleType(art_nr);
        load_sub(*veh);
-       obj.add_vehicle(*veh.release());
+       obj.add(*veh.release());
 }
 
 } // namespace R2C2