Use generic objects in Layout3D

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

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 210791feeaf6c77fd0bab3ed96172ef3ce741963..0fa6344ce7709b9faab370566d05cb0e119517d5 100644 (file)
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -14,14 +14,12 @@ using namespace Msp;
 namespace R2C2 {
 
 Track3D::Track3D(Layout3D &l, Track &t):
-       Object3D(t),
+       Object3D(l, t),
        GL::ObjectInstance(l.get_catalogue().get_track(t.get_type()).get_object()),
-       layout(l),
        track(t),
        type(layout.get_catalogue().get_track(track.get_type())),
        path(new Path3D(*this))
 {
-       layout.add_track(*this);
        layout.get_scene().add(*this);
 
        const vector<TrackType::Endpoint> &type_eps = track.get_type().get_endpoints();
@@ -41,7 +39,6 @@ Track3D::~Track3D()
 {
        delete path;
 
-       layout.remove_track(*this);
        layout.get_scene().remove(*this);
 
        for(vector<Endpoint3D *>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)