X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=fde251cfccd4c8f7afc7da6050b458a25439d159;hb=3c04e77e639e7b7fff995ceb9cc8c00da622d26e;hp=a64c8eb931c9a2d37cf970533bd0627f0a8e65f2;hpb=277e8e7e4230aa8867f507ace62476afe575cff1;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index a64c8eb..fde251c 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -14,8 +14,6 @@ Distributed under the GPL
 #include <msp/gl/matrix.h>
 #include <msp/gl/misc.h>
 #include <msp/gl/projection.h>
-#include <msp/gl/rendermode.h>
-#include <msp/gl/select.h>
 #include <msp/gl/tests.h>
 #include <msp/gl/texture2d.h>
 #include <msp/input/keys.h>
@@ -120,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));
 
@@ -151,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();
 
@@ -538,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)