Don't save an allocated but pending block

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

diff --git a/source/3d/rod.cpp b/source/3d/rod.cpp
index 10b5f46ecc6ee0ee304d2c318ad30220263d787f..0e41f02614d6b2ef1b3790724fb54fe18f0f980e 100644 (file)
--- a/source/3d/rod.cpp
+++ b/source/3d/rod.cpp
@@ -1,5 +1,3 @@
-#include <msp/gl/matrix.h>
-#include <msp/gl/renderer.h>
 #include "rod.h"
 #include "vehicle.h"
 #include "vehicletype.h"
@@ -9,32 +7,18 @@ using namespace Msp;
 namespace R2C2 {
 
 Rod3D::Rod3D(const Vehicle3D &v, unsigned r):
-       GL::ObjectInstance(*v.get_type().get_rod_object(r)),
-       vehicle(v.get_vehicle()),
-       rod(vehicle.get_rod(r))
+       VehiclePart3D(v, *v.get_type().get_rod_object(r)),
+       rod(vehicle.get_vehicle().get_rod(r))
 { }
 
-void Rod3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
+void Rod3D::update_matrix()
 {
-       if(!vehicle.get_track())
-               return;
+       matrix = vehicle.Object3D::get_matrix();
 
-       ObjectInstance::render(renderer, tag);
-}
-
-void Rod3D::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_rotation(), 0, 0, 1);
-
-       matrix.translate(rod.position.x, rod.position.y, rod.position.z);
+       matrix.translate(rod.position);
        if(rod.type->mirror_object)
                matrix.scale(1, -1, 1);
        matrix.rotate(rod.angle, 0, -1, 0);
-
-       renderer.matrix_stack() *= matrix;
 }
 
 } // namespace R2C2