X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=fde251cfccd4c8f7afc7da6050b458a25439d159;hb=3c04e77e639e7b7fff995ceb9cc8c00da622d26e;hp=e0da69f4110fc0e71674cc89cb9121a3ebc59fd4;hpb=7f81613ba3efdff6e05246738f739e1f914e1151;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index e0da69f..fde251c 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -118,6 +118,9 @@ Designer::Designer(int argc, char **argv): pass->depth_test = &GL::DepthTest::lequal(); pass->blend = &GL::Blend::alpha(); + pass = &pipeline->add_pass("overlay"); + pass->blend = &GL::Blend::alpha(); + camera.set_up_direction(GL::Vector3(0, 0, 1)); camera.set_look_direction(GL::Vector3(0, 0.5, -0.866)); @@ -149,7 +152,8 @@ Designer::Designer(int argc, char **argv): statusbar->add(*lbl_status); lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16)); - overlay = new Overlay3D(window, camera, ui_res.get_default_font()); + overlay = new Overlay3D(ui_res.get_default_font()); + pipeline->add_renderable_for_pass(*overlay, "overlay"); camera_ctl.view_all(); @@ -536,10 +540,6 @@ void Designer::render() else { pipeline->render_all(); - { - GL::Bind bind_blend(GL::Blend::alpha()); - overlay->render(0); - } GL::Bind bind_depth(GL::DepthTest::lequal()); if(mode==MEASURE)