X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=549bc156ba6dce2de6babcb6db4889441ce4b221;hb=bb7e754473aea2083c406b94060b9982c66f7473;hp=210791feeaf6c77fd0bab3ed96172ef3ce741963;hpb=f23c8d8cbc4e72b45e3a719b2cf974ce35d054e9;p=r2c2.git

diff --git a/source/3d/track.cpp b/source/3d/track.cpp
index 210791f..549bc15 100644
--- a/source/3d/track.cpp
+++ b/source/3d/track.cpp
@@ -14,14 +14,11 @@ 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),
+	Object3D(l, t),
+	GL::ObjectInstance(l.get_catalogue().get_3d(t.get_type()).get_object()),
 	track(t),
-	type(layout.get_catalogue().get_track(track.get_type())),
-	path(new Path3D(*this))
+	type(layout.get_catalogue().get_3d(track.get_type()))
 {
-	layout.add_track(*this);
 	layout.get_scene().add(*this);
 
 	const vector<TrackType::Endpoint> &type_eps = track.get_type().get_endpoints();
@@ -39,9 +36,6 @@ Track3D::Track3D(Layout3D &l, Track &t):
 
 Track3D::~Track3D()
 {
-	delete path;
-
-	layout.remove_track(*this);
 	layout.get_scene().remove(*this);
 
 	for(vector<Endpoint3D *>::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)