Inherit Root from GL::Renderable

This allows better integration with GL::Pipeline and the new GL::View
class.

diff --git a/source/root.cpp b/source/root.cpp
index b4c16cfe8bf7973ded8a5f2b387b23c189f80bbd..e867fae63653ebf39f10e4398fa5c5f83d3a301a 100644 (file)
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -135,8 +135,11 @@ void Root::tick()
        }
 }
 
-void Root::render() const
+void Root::render(const GL::Tag &tag) const
 {
+       if(tag.id)
+               return;
+
        GL::Bind bind_blend(GL::Blend::alpha());
 
        GL::Renderer renderer(&camera);
@@ -144,6 +147,15 @@ void Root::render() const
        Widget::render(renderer);
 }
 
+void Root::render(GL::Renderer &renderer, const GL::Tag &tag) const
+{
+       if(tag.id)
+               return;
+
+       renderer.end();
+       render(tag);
+}
+
 bool Root::button_press_event(unsigned btn)
 {
        if(visible)

diff --git a/source/root.h b/source/root.h
index b0751b688985265d76566894c5dab694863ef5c5..aeb2b9bb692d7ee78ad0414b36825a2873c5983a 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -4,6 +4,7 @@
 #include <sigc++/trackable.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/program.h>
+#include <msp/gl/renderable.h>
 #include <msp/graphics/window.h>
 #include <msp/input/keyboard.h>
 #include <msp/input/mouse.h>
@@ -18,9 +19,11 @@ class Label;
 
 /**
 A Root is a special type of Panel that covers the entire viewport and receives
-input from keyboard and mouse.
+input from keyboard and mouse.  It can be used by itself or in a GL::Pipeline.
+Due to its specialized nature it's recommended to not use it with Scenes or
+other containers.
 */
-class Root: public Panel, public sigc::trackable
+class Root: public Panel, public GL::Renderable, public sigc::trackable
 {
 public:
        sigc::signal<std::string, int, int> signal_tooltip;
@@ -60,7 +63,8 @@ public:
        virtual unsigned get_height() const { return geom.h; }
 
        void tick();
-       void render() const;
+       virtual void render(const GL::Tag & = GL::Tag()) const;
+       virtual void render(GL::Renderer &, const GL::Tag & = GL::Tag()) const;
 
 private:
        bool button_press_event(unsigned);