X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fbogie.cpp;h=24fa85d3e799b1c888894ffe882a49137c378510;hb=54cb832334a83fc266b59e2c9b60ee936db7118f;hp=a36fc9b773c8fb9374b164ffc148c5beb3875ab2;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/bogie.cpp b/source/3d/bogie.cpp
index a36fc9b..24fa85d 100644
--- a/source/3d/bogie.cpp
+++ b/source/3d/bogie.cpp
@@ -1,5 +1,3 @@
-#include <msp/gl/matrix.h>
-#include <msp/gl/renderer.h>
 #include "bogie.h"
 #include "vehicle.h"
 #include "vehicletype.h"
@@ -9,34 +7,19 @@ using namespace Msp;
 namespace R2C2 {
 
 Bogie3D::Bogie3D(const Vehicle3D &v, unsigned b):
-	GL::ObjectInstance(*v.get_type().get_bogie_object(b)),
-	vehicle(v.get_vehicle()),
-	bogie(vehicle.get_bogie(b))
+	VehiclePart3D(v, *v.get_type().get_bogie_object(b)),
+	bogie(vehicle.get_vehicle().get_bogie(b))
 { }
 
-void Bogie3D::render(Msp::GL::Renderer &renderer, const GL::Tag &tag) const
+void Bogie3D::update_matrix()
 {
-	if(!vehicle.get_track())
-		return;
-
-	ObjectInstance::render(renderer, tag);
-}
-
-void Bogie3D::setup_render(Msp::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 = vehicle.Object3D::get_matrix();
 
 	matrix.translate(bogie.type->position, 0, 0);
-	float dir = bogie.direction;
+	Angle dir = bogie.direction;
 	if(bogie.type->rotate_object)
-		dir += M_PI;
+		dir += Angle::half_turn();
 	matrix.rotate(dir, 0, 0, 1);
-
-	renderer.matrix_stack() *= matrix;
 }
 
 } // namespace R2C2