Change Root::render to use the passed in Renderer

[libs/gltk.git] / source / root.cpp

diff --git a/source/root.cpp b/source/root.cpp
index b4c16cfe8bf7973ded8a5f2b387b23c189f80bbd..b31b53f2d7e2f767cd48fb253eef5e436afdb863 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -1,6 +1,7 @@
 #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>
@@ -13,7 +14,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 +25,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),
@@ -144,6 +145,19 @@ void Root::render() const
        Widget::render(renderer);
 }
 
+void Root::render(GL::Renderer &renderer, const GL::Tag &tag) const
+{
+       if(tag.id)
+               return;
+
+       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)
 {
        if(visible)