Use event-based matrix updates for objects

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

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 92c15744e42f23fba386287146fa9a81336206e5..210791feeaf6c77fd0bab3ed96172ef3ce741963 100644 (file)
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -14,6 +14,7 @@ using namespace Msp;
 namespace R2C2 {
 
 Track3D::Track3D(Layout3D &l, Track &t):
+       Object3D(t),
        GL::ObjectInstance(l.get_catalogue().get_track(t.get_type()).get_object()),
        layout(l),
        track(t),
@@ -53,22 +54,12 @@ Vector Track3D::get_node() const
        const Vector &minp = bbox.get_minimum_point();
        const Vector &maxp = bbox.get_maximum_point();
 
-       return track.get_position()+rotated_vector((minp+maxp)/2.0f, track.get_rotation())+Vector(0, 0, 0.02);
-}
-
-GL::Matrix Track3D::create_matrix() const
-{
-       GL::Matrix matrix;
-       matrix.translate(track.get_position());
-       matrix.rotate(track.get_rotation(), 0, 0, 1);
-       matrix.rotate(track.get_tilt(), 0, -1, 0);
-
-       return matrix;
+       return matrix*((minp+maxp)/2.0f+Vector(0, 0, 0.02));
 }
 
 void Track3D::setup_render(Msp::GL::Renderer &renderer, const GL::Tag &) const
 {
-       renderer.matrix_stack() *= create_matrix();
+       renderer.matrix_stack() *= matrix;
 }
 
 void Track3D::link_changed(unsigned i, Track *trk)