X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicle.cpp;h=8027a1999d3827ab14dad36ced4816703f070a34;hb=ce8be590703fdc0709863f0ee9695f40b6adb200;hp=37619ebd339461f104dc0bf54aeb6fcfe71e7a67;hpb=dc3b2bce73df40ea885a1960a825e5cd3a33c045;p=r2c2.git

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index 37619eb..8027a19 100644
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -14,7 +14,7 @@ Distributed under the GPL
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
 	layout(l),
@@ -52,25 +52,59 @@ void Vehicle3D::render(const GL::Tag &tag) const
 		GL::PushMatrix push_mat;
 
 		const Point &pos = vehicle.get_position();
-		GL::translate(pos.x, pos.y, pos.z+0.01);
+		GL::translate(pos.x, pos.y, pos.z);
 		GL::rotate(vehicle.get_direction()*180/M_PI, 0, 0, 1);
 
-		if(type.get_body_object())
-			type.get_body_object()->render(tag);
+		if(const GL::Object *obj = type.get_body_object())
+			obj->render(tag);
+
+		const vector<VehicleType::Axle> &axles = vehicle.get_type().get_axles();
+		for(unsigned i=0; i<axles.size(); ++i)
+			if(const GL::Object *obj = type.get_axle_object(i))
+			{
+				GL::PushMatrix push_mat2;
+				GL::translate(axles[i].position, 0, axles[i].wheel_dia/2);
+				GL::rotate(vehicle.get_axle(i).angle*180/M_PI, 0, 1, 0);
+				obj->render(tag);
+			}
 
 		const vector<VehicleType::Bogie> &bogies = vehicle.get_type().get_bogies();
 		for(unsigned i=0; i<bogies.size(); ++i)
 		{
 			GL::PushMatrix push_mat2;
 			GL::translate(bogies[i].position, 0, 0);
-			float angle = vehicle.get_bogie_direction(i)*180/M_PI;
-			if(bogies[i].rotate_object)
-				angle += 180;
+			float angle = vehicle.get_bogie(i).direction*180/M_PI;
 			GL::rotate(angle, 0, 0, 1);
-			if(type.get_bogie_object(i))
-				type.get_bogie_object(i)->render(tag);
+
+			for(unsigned j=0; j<bogies[i].axles.size(); ++j)
+				if(const GL::Object *obj = type.get_bogie_axle_object(i, j))
+				{
+					GL::PushMatrix push_mat3;
+					GL::translate(bogies[i].axles[j].position, 0, bogies[i].axles[j].wheel_dia/2);
+					GL::rotate(vehicle.get_bogie_axle(i, j).angle*180/M_PI, 0, 1, 0);
+					obj->render(tag);
+				}
+
+			if(bogies[i].rotate_object)
+				GL::rotate(180, 0, 0, 1);
+			if(const GL::Object *obj = type.get_bogie_object(i))
+				obj->render(tag);
 		}
+
+		const vector<VehicleType::Rod> &rods = vehicle.get_type().get_rods();
+		for(unsigned i=0; i<rods.size(); ++i)
+			if(const GL::Object *obj = type.get_rod_object(i))
+			{
+				GL::PushMatrix push_mat2;
+				const Point &rpos = vehicle.get_rod(i).position;
+				float angle = vehicle.get_rod(i).angle;
+				GL::translate(rpos.x, rpos.y, rpos.z);
+				if(rods[i].mirror_object)
+					GL::scale(1, -1, 1);
+				GL::rotate(angle*180/M_PI, 0, -1, 0);
+				obj->render(tag);
+			}
 	}
 }
 
-} // namespace Marklin
+} // namespace R2C2