Delete auxiliary objects together with Vehicle3D

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

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index 42ac924783d156dec0b8eab1a20670ecd2d55450..106be97d3c5be4c5ed49997362d314a4f2a412db 100644 (file)
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <cmath>
 #include <msp/gl/matrix.h>
 #include <msp/gl/renderer.h>
@@ -26,9 +19,9 @@ Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
        vehicle(v),
        type(layout.get_catalogue().get_vehicle(vehicle.get_type()))
 {
-       unsigned n_axles = vehicle.get_type().get_axles().size();
+       unsigned n_axles = vehicle.get_type().get_fixed_axles().size();
        for(unsigned i=0; i<n_axles; ++i)
-               if(type.get_axle_object(i))
+               if(type.get_fixed_axle_object(i))
                {
                        Axle3D *a = new Axle3D(*this, i);
                        axles.push_back(a);
@@ -71,11 +64,20 @@ Vehicle3D::~Vehicle3D()
        layout.remove_vehicle(*this);
        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)
+       {
+               layout.get_scene().remove(**i);
                delete *i;
+       }
 }
 
 Vector Vehicle3D::get_node() const
@@ -100,9 +102,11 @@ void Vehicle3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
 void Vehicle3D::setup_render(GL::Renderer &renderer, const GL::Tag &) const
 {
        GL::Matrix matrix;
-       const Vector &pos = vehicle.get_position();
-       matrix.translate(pos.x, pos.y, pos.z);
-       matrix.rotate(vehicle.get_direction(), 0, 0, 1);
+       matrix.translate(vehicle.get_position());
+       Angle rot = vehicle.get_rotation();
+       if(vehicle.get_type().get_rotate_object())
+               rot += Angle::half_turn();
+       matrix.rotate(rot, 0, 0, 1);
        renderer.matrix_stack() *= matrix;
 }