Adjust things to conform to changes in other libraries

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

diff --git a/source/root.h b/source/root.h
index b0751b688985265d76566894c5dab694863ef5c5..b2e2409e71177734ee7996fd369c5a66c5b474ba 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -2,8 +2,10 @@
 #define MSP_GLTK_ROOT_H_
 
 #include <sigc++/trackable.h>
+#include <msp/gl/blend.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,15 +20,17 @@ 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;
 
 private:
-       const Resources &resources;
+       Resources &resources;
        Input::Keyboard *keyboard;
        InputMethod *input_method;
        Input::Mouse *mouse;
@@ -36,18 +40,20 @@ private:
        int pointer_x;
        int pointer_y;
        Time::TimeStamp tooltip_timeout;
+       Time::TimeStamp last_tick;
        Widget *tooltip_target;
        Msp::GL::Camera camera;
        Msp::GL::Program *shprog;
+       Msp::GL::Blend blend;
 
 public:
        /** Creates a Root widget for a window.  The geometry is set to match the
        window's size, and input devices are created automatically. */
-       Root(const Resources &, Graphics::Window &);
+       Root(Resources &, Graphics::Window &);
 
        /** Creates a Root widget with custom input devices.  If window is not null,
        it is used to set the widget's initial geometry. */
-       Root(const Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
+       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
 private:
        void init(Graphics::Window *);
 public:
@@ -55,12 +61,13 @@ public:
 
        virtual const char *get_class() const { return "root"; }
 
-       const Resources &get_resources() const { return resources; }
+       Resources &get_resources() const { return resources; }
        virtual unsigned get_width() const { return geom.w; }
        virtual unsigned get_height() const { return geom.h; }
 
        void tick();
-       void render() const;
+       virtual void setup_frame(GL::Renderer &);
+       virtual void render(GL::Renderer &, GL::Tag = GL::Tag()) const;
 
 private:
        bool button_press_event(unsigned);
@@ -74,7 +81,7 @@ private:
        void get_touch(unsigned, int &, int &);
        void update_camera();
 
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_child_added(Widget &);
 };