Use generic ObjectTypes in Catalogue

[r2c2.git] / source / 3d / vehicletype.cpp

diff --git a/source/3d/vehicletype.cpp b/source/3d/vehicletype.cpp
index 0c6465898987396d00fe5f0dd664da091b507b23..c6636099b0e8e9595f78405f5b800fe4b3641b7e 100644 (file)
--- a/source/3d/vehicletype.cpp
+++ b/source/3d/vehicletype.cpp
@@ -25,25 +25,19 @@ T get(const map<string, string> &params, const string &key, T def = T())
 namespace R2C2 {
 
 VehicleType3D::VehicleType3D(Catalogue3D &c, const VehicleType &t):
-       catalogue(c),
+       ObjectType3D(c),
        type(t),
-       body_object(0),
-       axle_objects(1)
+       body_object(0)
 {
        body_object = get_object(type.get_object());
 
-       const vector<VehicleType::Axle> &axles = type.get_fixed_axles();
+       const vector<VehicleType::Axle> &axles = type.get_axles();
        for(vector<VehicleType::Axle>::const_iterator i=axles.begin(); i!=axles.end(); ++i)
-               axle_objects[0].push_back(get_object(i->object));
+               axle_objects.push_back(get_object(i->object));
 
        const vector<VehicleType::Bogie> &bogies = type.get_bogies();
        for(vector<VehicleType::Bogie>::const_iterator i=bogies.begin(); i!=bogies.end(); ++i)
-       {
                bogie_objects.push_back(get_object(i->object));
-               axle_objects.push_back(vector<GL::Object *>());
-               for(vector<VehicleType::Axle>::const_iterator j=i->axles.begin(); j!=i->axles.end(); ++j)
-                       axle_objects.back().push_back(get_object(j->object));
-       }
 
        const vector<VehicleType::Rod> &rods = type.get_rods();
        for(vector<VehicleType::Rod>::const_iterator i=rods.begin(); i!=rods.end(); ++i)
@@ -56,11 +50,11 @@ VehicleType3D::~VehicleType3D()
                delete i->second;
 }
 
-const GL::Object *VehicleType3D::get_fixed_axle_object(unsigned i) const
+const GL::Object *VehicleType3D::get_axle_object(unsigned i) const
 {
-       if(i>=axle_objects[0].size())
+       if(i>=axle_objects.size())
                throw out_of_range("VehicleType3D::get_fixed_axle_object");
-       return axle_objects[0][i];
+       return axle_objects[i];
 }
 
 const GL::Object *VehicleType3D::get_bogie_object(unsigned i) const
@@ -70,15 +64,6 @@ const GL::Object *VehicleType3D::get_bogie_object(unsigned i) const
        return bogie_objects[i];
 }
 
-const GL::Object *VehicleType3D::get_bogie_axle_object(unsigned i, unsigned j) const
-{
-       if(i>=bogie_objects.size())
-               throw out_of_range("VehicleType3D::get_bogie_axle_object");
-       if(j>=axle_objects[i+1].size())
-               throw out_of_range("VehicleType3D::get_bogie_axle_object");
-       return axle_objects[i+1][j];
-}
-
 const GL::Object *VehicleType3D::get_rod_object(unsigned i) const
 {
        if(i>=rod_objects.size())