Add single get_stuff methods with index to VehicleType

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

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index 50dbcb0d693134d969964ba31249bf71e3acc9c7..8027a1999d3827ab14dad36ced4816703f070a34 100644 (file)
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -64,7 +64,7 @@ void Vehicle3D::render(const GL::Tag &tag) const
                        {
                                GL::PushMatrix push_mat2;
                                GL::translate(axles[i].position, 0, axles[i].wheel_dia/2);
-                               GL::rotate(vehicle.get_axle_angle(i)*180/M_PI, 0, 1, 0);
+                               GL::rotate(vehicle.get_axle(i).angle*180/M_PI, 0, 1, 0);
                                obj->render(tag);
                        }
 
@@ -73,7 +73,7 @@ void Vehicle3D::render(const GL::Tag &tag) const
                {
                        GL::PushMatrix push_mat2;
                        GL::translate(bogies[i].position, 0, 0);
-                       float angle = vehicle.get_bogie_direction(i)*180/M_PI;
+                       float angle = vehicle.get_bogie(i).direction*180/M_PI;
                        GL::rotate(angle, 0, 0, 1);
 
                        for(unsigned j=0; j<bogies[i].axles.size(); ++j)
@@ -81,7 +81,7 @@ void Vehicle3D::render(const GL::Tag &tag) const
                                {
                                        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_angle(i, j)*180/M_PI, 0, 1, 0);
+                                       GL::rotate(vehicle.get_bogie_axle(i, j).angle*180/M_PI, 0, 1, 0);
                                        obj->render(tag);
                                }
 
@@ -96,8 +96,8 @@ void Vehicle3D::render(const GL::Tag &tag) const
                        if(const GL::Object *obj = type.get_rod_object(i))
                        {
                                GL::PushMatrix push_mat2;
-                               const Point &rpos = vehicle.get_rod_position(i);
-                               float angle = vehicle.get_rod_angle(i);
+                               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);