Make TrackWrap take a Layout3D since it doesn't really need Designer

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index fde251cfccd4c8f7afc7da6050b458a25439d159..bfb3d5629b60f2525e12f4c89a0df9b9e47b7b31 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -57,8 +57,7 @@ Designer::Designer(int argc, char **argv):
        mode(SELECT),
        manipulator(*this, root, selection),
        measure(*this),
-       camera_ctl(*this, root, camera),
-       track_wrap(*this, selection)
+       camera_ctl(*this, root, camera)
 {
        window.set_title("Railway Designer");
        window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
@@ -98,7 +97,6 @@ Designer::Designer(int argc, char **argv):
        pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0);
        if(base_object)
                pipeline->add_renderable(*base_object);
-       pipeline->add_renderable_for_pass(track_wrap, "unlit");
        pipeline->add_renderable_for_pass(layout_3d->get_path_scene(), "unlit");
        pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit");
 
@@ -152,6 +150,8 @@ Designer::Designer(int argc, char **argv):
        statusbar->add(*lbl_status);
        lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16));
 
+       track_wrap = new TrackWrap(*layout_3d, selection);
+       pipeline->add_renderable_for_pass(*track_wrap, "unlit");
        overlay = new Overlay3D(ui_res.get_default_font());
        pipeline->add_renderable_for_pass(*overlay, "overlay");