Move gauge to TrackAppearance

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

diff --git a/source/libr2c2/catalogue.cpp b/source/libr2c2/catalogue.cpp
index 221a6f0663667cca1665e4388d867e422c16fb5e..572423a7f4048279d67b3b2027dc6979e384cc73 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"
 
@@ -13,7 +14,6 @@ namespace R2C2 {
 
 Catalogue::Catalogue():
        scale(1),
-       gauge(1.524),
        layout(*this)
 { }
 
@@ -23,11 +23,6 @@ Catalogue::~Catalogue()
                delete i->second;
 }
 
-float Catalogue::get_rail_elevation() const
-{
-       return ballast_profile.get_height()+rail_profile.get_height();
-}
-
 void Catalogue::add(ObjectType &object)
 {
        insert_unique(objects, object.get_article_number(), &object);
@@ -43,37 +38,20 @@ const ObjectType &Catalogue::get(const ArticleNumber &art_nr) const
 Catalogue::Loader::Loader(Catalogue &c):
        DataFile::ObjectLoader<Catalogue>(c)
 {
-       add("ballast_profile", &Loader::ballast_profile);
-       add("gauge", &Loader::gauge);
        add("layout", &Loader::layout);
-       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("track_appearance", &Loader::track_appearance);
        add("vehicle", &Loader::vehicle);
 }
 
-void Catalogue::Loader::ballast_profile()
-{
-       load_sub(obj.ballast_profile);
-}
-
-void Catalogue::Loader::gauge(float g)
-{
-       obj.gauge = g/1000;
-}
-
 void Catalogue::Loader::layout()
 {
        load_sub(obj.layout);
 }
 
-void Catalogue::Loader::rail_profile()
-{
-       load_sub(obj.rail_profile);
-}
-
 void Catalogue::Loader::scale(float n, float d)
 {
        obj.scale = n/d;
@@ -89,16 +67,31 @@ void Catalogue::Loader::signal(ArticleNumber art_nr)
        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.objects.count(art_nr))
                throw key_error(art_nr);
 
-       RefPtr<TrackType> trk = new TrackType(art_nr);
+       RefPtr<TrackType> trk = new TrackType(art_nr, obj.appearance);
        load_sub(*trk);
        obj.add(*trk.release());
 }
 
+void Catalogue::Loader::track_appearance()
+{
+       load_sub(obj.appearance);
+}
+
 void Catalogue::Loader::vehicle(ArticleNumber art_nr)
 {
        if(obj.objects.count(art_nr))