X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Faxle.cpp;h=e52303a62e3deafe71a2fa42cc74f963ae9353f2;hb=4049f5bdacfdb61247f3c74fc5f748990be7bd4d;hp=2da94b992764b4caf47e6595270cd2d07effb398;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/3d/axle.cpp b/source/3d/axle.cpp
index 2da94b9..e52303a 100644
--- a/source/3d/axle.cpp
+++ b/source/3d/axle.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gl/matrix.h>
 #include <msp/gl/renderer.h>
 #include "axle.h"
@@ -16,10 +9,10 @@ using namespace Msp;
 namespace R2C2 {
 
 Axle3D::Axle3D(const Vehicle3D &v, unsigned a):
-	GL::ObjectInstance(*v.get_type().get_axle_object(a)),
+	GL::ObjectInstance(*v.get_type().get_fixed_axle_object(a)),
 	vehicle(v.get_vehicle()),
 	bogie(0),
-	axle(vehicle.get_axle(a))
+	axle(vehicle.get_fixed_axle(a))
 { }
 
 Axle3D::Axle3D(const Vehicle3D &v, unsigned b, unsigned a):
@@ -41,9 +34,8 @@ void Axle3D::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());
+	matrix.rotate(vehicle.get_rotation(), 0, 0, 1);
 
 	if(bogie)
 	{