X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Faxle.cpp;h=c8a6dd573091d743c126449ec2d2db43e95920db;hb=34f8bf04e4bdffefeceea59b186386b51c542b9d;hp=5123106e5c805f8736292d7996ec47d7f97080c6;hpb=4b7008978ce5b67e7e1db14b4a359e4ab1881bbd;p=r2c2.git diff --git a/source/3d/axle.cpp b/source/3d/axle.cpp index 5123106..c8a6dd5 100644 --- a/source/3d/axle.cpp +++ b/source/3d/axle.cpp @@ -16,10 +16,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,7 +41,7 @@ void Axle3D::setup_render(GL::Renderer &renderer, const GL::Tag &) const { GL::Matrix matrix; - const Point &pos = vehicle.get_position(); + const Vector &pos = vehicle.get_position(); matrix.translate(pos.x, pos.y, pos.z); matrix.rotate(vehicle.get_direction(), 0, 0, 1);