X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Froot.cpp;h=4a2d611d84c8c9692840fc9564325ff50389f8d1;hb=cc966845eb995805e22d63600d8670328c4feae3;hp=e867fae63653ebf39f10e4398fa5c5f83d3a301a;hpb=3bdb7fd6873ca45ce7e7754040b69b0d941eef31;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index e867fae..4a2d611 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -1,9 +1,9 @@
 #include <msp/gl/blend.h>
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/programbuilder.h>
+#include <msp/gl/tests.h>
 #include <msp/gl/uniform.h>
 #include <msp/input/keys.h>
-#include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "label.h"
 #include "style.h"
@@ -13,7 +13,7 @@
 namespace Msp {
 namespace GLtk {
 
-Root::Root(const Resources &r, Graphics::Window &window):
+Root::Root(Resources &r, Graphics::Window &window):
 	resources(r),
 	keyboard(new Input::Keyboard(window)),
 	input_method(0),
@@ -24,7 +24,7 @@ Root::Root(const Resources &r, Graphics::Window &window):
 	init(&window);
 }
 
-Root::Root(const Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
+Root::Root(Resources &r, Graphics::Window *window, Input::Keyboard *k, Input::Mouse *m, Input::Touchscreen *t):
 	resources(r),
 	keyboard(k),
 	input_method(0),
@@ -135,11 +135,8 @@ void Root::tick()
 	}
 }
 
-void Root::render(const GL::Tag &tag) const
+void Root::render() const
 {
-	if(tag.id)
-		return;
-
 	GL::Bind bind_blend(GL::Blend::alpha());
 
 	GL::Renderer renderer(&camera);
@@ -152,8 +149,12 @@ void Root::render(GL::Renderer &renderer, const GL::Tag &tag) const
 	if(tag.id)
 		return;
 
-	renderer.end();
-	render(tag);
+	GL::Renderer::Push push(renderer);
+	renderer.set_camera(camera);
+	renderer.set_shader_program(shprog);
+	GL::BindRestore bind_blend(GL::Blend::alpha());
+	GL::BindRestore unbind_dtest(static_cast<GL::DepthTest *>(0));
+	Widget::render(renderer);
 }
 
 bool Root::button_press_event(unsigned btn)