X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicle.cpp;h=e4bab870f856434b1e7e79f9b6c54543986921ee;hb=64d23de66c33d0f77454c3db2e40cccc18f7851b;hp=78899fd371d07a25f3f8046c7411974daedcf179;hpb=949b13aae247fa53579ec1cda9142ccc8755acde;p=r2c2.git

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index 78899fd..e4bab87 100644
--- 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>
@@ -21,14 +14,14 @@ using namespace Msp;
 namespace R2C2 {
 
 Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
+	Object3D(l, v),
 	GL::ObjectInstance(*l.get_catalogue().get_vehicle(v.get_type()).get_body_object()),
-	layout(l),
 	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);
@@ -62,26 +55,33 @@ Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
 			layout.get_scene().add(*r);
 		}
 
-	layout.add_vehicle(*this);
 	layout.get_scene().add(*this);
 }
 
 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;
+	}
 }
 
-Point Vehicle3D::get_node() const
+Vector Vehicle3D::get_node() const
 {
-	Point p = vehicle.get_position();
-	return Point(p.x, p.y, p.z+0.01+vehicle.get_type().get_height());
+	Vector p = vehicle.get_position();
+	return Vector(p.x, p.y, p.z+0.01+vehicle.get_type().get_height());
 }
 
 bool Vehicle3D::is_visible() const
@@ -99,11 +99,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;
-	const Point &pos = vehicle.get_position();
-	matrix.translate(pos.x, pos.y, pos.z);
-	matrix.rotate(vehicle.get_direction(), 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