X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=52e23cae677ee6f03df4ee48a8f25d35400954d9;hb=56c41b294aa47a38ac3e1be70d4868f260cb4274;hp=aeb2b9bb692d7ee78ad0414b36825a2873c5983a;hpb=3bdb7fd6873ca45ce7e7754040b69b0d941eef31;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index aeb2b9b..52e23ca 100644
--- a/source/root.h
+++ b/source/root.h
@@ -2,6 +2,7 @@
 #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>
@@ -10,6 +11,7 @@
 #include <msp/input/mouse.h>
 #include <msp/input/touchscreen.h>
 #include <msp/time/timestamp.h>
+#include "mspgltk_api.h"
 #include "panel.h"
 
 namespace Msp {
@@ -23,13 +25,13 @@ 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 GL::Renderable, public sigc::trackable
+class MSPGLTK_API 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;
@@ -39,18 +41,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:
@@ -58,13 +62,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();
-	virtual void render(const GL::Tag & = GL::Tag()) const;
-	virtual void render(GL::Renderer &, const GL::Tag & = GL::Tag()) const;
+	virtual void setup_frame(GL::Renderer &);
+	virtual void render(GL::Renderer &, GL::Tag = GL::Tag()) const;
 
 private:
 	bool button_press_event(unsigned);
@@ -78,7 +82,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 &);
 };