X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Ftrack.cpp;h=549bc156ba6dce2de6babcb6db4889441ce4b221;hb=2bdb31aa8da02b8762e32cd117f270ac804c88d8;hp=0fa6344ce7709b9faab370566d05cb0e119517d5;hpb=4049f5bdacfdb61247f3c74fc5f748990be7bd4d;p=r2c2.git diff --git a/source/3d/track.cpp b/source/3d/track.cpp index 0fa6344..549bc15 100644 --- a/source/3d/track.cpp +++ b/source/3d/track.cpp @@ -15,10 +15,9 @@ namespace R2C2 { Track3D::Track3D(Layout3D &l, Track &t): Object3D(l, t), - GL::ObjectInstance(l.get_catalogue().get_track(t.get_type()).get_object()), + 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.get_scene().add(*this); @@ -37,8 +36,6 @@ Track3D::Track3D(Layout3D &l, Track &t): Track3D::~Track3D() { - delete path; - layout.get_scene().remove(*this); for(vector::iterator i=endpoints.begin(); i!=endpoints.end(); ++i)