Convert Measure to a Renderable

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

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index ba7e669134766ace8b7bc93ce5c2331e9684fad0..5811b84d195a7afc82853e22bea6ee0570319d64 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -138,6 +138,7 @@ Designer::Designer(int argc, char **argv):
        pipeline->add_renderable_for_pass(*track_wrap, "unlit");
        overlay = new Overlay3D(ui_res.get_default_font());
        pipeline->add_renderable_for_pass(*overlay, "overlay");
+       pipeline->add_renderable_for_pass(measure, "unlit");
 
        camera_ctl = new CameraController(*main_view, keyboard, mouse);
        cat_view->get_camera().set_look_direction(GL::Vector3(0, 0.13053, -0.99144));
@@ -508,11 +509,6 @@ void Designer::render()
 
        View3D *view = (mode==CATALOGUE ? cat_view : main_view);
        view->render();
-       if(mode==MEASURE)
-       {
-               GL::Bind bind_depth(GL::DepthTest::lequal());
-               measure.render();
-       }
 
        root.render();
        // XXX Should fix GLtk so this would not be needed