Create a common base class for Vehicle3D parts

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

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index e4bab870f856434b1e7e79f9b6c54543986921ee..b7cec4439cd8ce42163eaf255d9b799136cf7f3a 100644 (file)
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -22,56 +22,34 @@ Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
        unsigned n_axles = vehicle.get_type().get_fixed_axles().size();
        for(unsigned i=0; i<n_axles; ++i)
                if(type.get_fixed_axle_object(i))
-               {
-                       Axle3D *a = new Axle3D(*this, i);
-                       axles.push_back(a);
-                       layout.get_scene().add(*a);
-               }
+                       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))
                {
-                       Bogie3D *b = new Bogie3D(*this, i);
-                       bogies.push_back(b);
-                       layout.get_scene().add(*b);
+                       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))
-                               {
-                                       Axle3D *a = new Axle3D(*this, i, j);
-                                       axles.push_back(a);
-                                       layout.get_scene().add(*a);
-                               }
+                                       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))
-               {
-                       Rod3D *r = new Rod3D(*this, i);
-                       rods.push_back(r);
-                       layout.get_scene().add(*r);
-               }
+                       children.push_back(new Rod3D(*this, i));
 
        layout.get_scene().add(*this);
+       for(vector<VehiclePart3D *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+               layout.get_scene().add(**i);
 }
 
 Vehicle3D::~Vehicle3D()
 {
        layout.get_scene().remove(*this);
-       for(vector<Axle3D *>::iterator i=axles.begin(); i!=axles.end(); ++i)
-       {
-               layout.get_scene().remove(**i);
-               delete *i;
-       }
-       for(vector<Bogie3D *>::iterator i=bogies.begin(); i!=bogies.end(); ++i)
-       {
-               layout.get_scene().remove(**i);
-               delete *i;
-       }
-       for(vector<Rod3D *>::iterator i=rods.begin(); i!=rods.end(); ++i)
+       for(vector<VehiclePart3D *>::iterator i=children.begin(); i!=children.end(); ++i)
        {
                layout.get_scene().remove(**i);
                delete *i;
@@ -89,6 +67,14 @@ bool Vehicle3D::is_visible() const
        return vehicle.get_track();
 }
 
+void Vehicle3D::moved()
+{
+       Object3D::moved();
+
+       for(vector<VehiclePart3D *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+               (*i)->update_matrix();
+}
+
 void Vehicle3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
 {
        if(!vehicle.get_track())