Don't bother with creating intermediate steps for state updates

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

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index b7cec4439cd8ce42163eaf255d9b799136cf7f3a..5843c17998363f391025ecda5ba744726dd9fcaf 100644 (file)
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -15,27 +15,20 @@ namespace R2C2 {
 
 Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
        Object3D(l, v),
-       GL::ObjectInstance(*l.get_catalogue().get_vehicle(v.get_type()).get_body_object()),
+       GL::ObjectInstance(*l.get_catalogue().get_3d(v.get_type()).get_body_object()),
        vehicle(v),
-       type(layout.get_catalogue().get_vehicle(vehicle.get_type()))
+       type(layout.get_catalogue().get_3d(vehicle.get_type()))
 {
-       unsigned n_axles = vehicle.get_type().get_fixed_axles().size();
+       unsigned n_axles = vehicle.get_type().get_axles().size();
        for(unsigned i=0; i<n_axles; ++i)
-               if(type.get_fixed_axle_object(i))
+               if(type.get_axle_object(i))
                        children.push_back(new Axle3D(*this, i));
 
        unsigned n_bogies = vehicle.get_type().get_bogies().size();
        for(unsigned i=0; i<n_bogies; ++i)
                if(type.get_bogie_object(i))
-               {
                        children.push_back(new Bogie3D(*this, i));
 
-                       n_axles = vehicle.get_type().get_bogie(i).axles.size();
-                       for(unsigned j=0; j<n_axles; ++j)
-                               if(type.get_bogie_axle_object(i, j))
-                                       children.push_back(new Axle3D(*this, i, j));
-               }
-
        unsigned n_rods = vehicle.get_type().get_rods().size();
        for(unsigned i=0; i<n_rods; ++i)
                if(type.get_rod_object(i))
@@ -64,7 +57,7 @@ Vector Vehicle3D::get_node() const
 
 bool Vehicle3D::is_visible() const
 {
-       return vehicle.get_track();
+       return vehicle.is_placed();
 }
 
 void Vehicle3D::moved()
@@ -77,7 +70,7 @@ void Vehicle3D::moved()
 
 void Vehicle3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
 {
-       if(!vehicle.get_track())
+       if(!is_visible())
                return;
 
        ObjectInstance::render(renderer, tag);