X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=5fd0f4468797793301db6fb919377f1fd92d0b08;hb=897f9bae5f647bae43e9786796eb9ea18325ec17;hp=c60ae8e8688b5c318262d71e40a48d48aebacfb4;hpb=45ec6f645ff2c303700711e96421c75acf33db1a;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index c60ae8e..5fd0f44 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -48,7 +48,8 @@ Designer::Designer(int argc, char **argv): mode(SELECT), manipulator(*this, selection), measure(*this), - camera_ctl(window, camera) + camera_ctl(window, camera), + track_wrap(*this, selection) { window.set_title("Railway Designer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); @@ -87,6 +88,7 @@ Designer::Designer(int argc, char **argv): pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0); if(base_object) pipeline->add_renderable_for_pass(*base_object, 0); + 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"); @@ -444,7 +446,6 @@ void Designer::render() } GL::Bind bind_depth(GL::DepthTest::lequal()); - manipulator.render(); if(mode==MEASURE) measure.render(); }