Use event-based matrix updates for objects

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

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index 106be97d3c5be4c5ed49997362d314a4f2a412db..e33f643c8ddc69d710a63ef3019d988a593bab0e 100644 (file)
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -14,6 +14,7 @@ using namespace Msp;
 namespace R2C2 {
 
 Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
+       Object3D(v),
        GL::ObjectInstance(*l.get_catalogue().get_vehicle(v.get_type()).get_body_object()),
        layout(l),
        vehicle(v),
@@ -101,13 +102,9 @@ 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;
-       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;
+       if(vehicle.get_type().get_rotate_object())
+               renderer.matrix_stack() *= GL::Matrix::rotation(Angle::half_turn(), 0, 0, 1);
 }
 
 } // namespace R2C2