X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fview.h;h=b34ae5c75abf070ecd1f9100548744d773b9b7d2;hb=3e555c51a85b97090ae8c9b16ee425ee5ffe6ef8;hp=bd39e8ff7f11c6835b07a62a233b858b60472735;hpb=7791ca3eac17e355d1de508b1730dc854ed7712d;p=libs%2Fgl.git

diff --git a/source/view.h b/source/view.h
index bd39e8ff..b34ae5c7 100644
--- a/source/view.h
+++ b/source/view.h
@@ -2,49 +2,37 @@
 #define MSP_GL_VIEW_H_
 
 #include <list>
-#include <sigc++/trackable.h>
-#include <msp/graphics/glcontext.h>
-#include <msp/graphics/window.h>
+#include "framebuffer.h"
 
 namespace Msp {
 namespace GL {
 
 class Camera;
-class Framebuffer;
 class Renderable;
+class Renderer;
 
 /**
 Manages the presentation of rendering results on the screen.
 */
 class View: public sigc::trackable
 {
-private:
-	Graphics::Window &window;
-	Graphics::GLContext &context;
+protected:
 	Framebuffer &target;
 	Camera *camera;
-	const Renderable *content;
-	std::list<Camera *> synced_cameras;
+	Renderable *content;
 
-public:
-	View(Graphics::Window &, Graphics::GLContext &);
+	View(Framebuffer &);
 
-	Graphics::Window &get_window() { return window; }
-	Graphics::GLContext &get_context() { return context; }
-	unsigned get_width() const { return window.get_width(); }
-	unsigned get_height() const { return window.get_height(); }
-	float get_aspect() const { return static_cast<float>(get_width())/get_height(); }
+public:
+	virtual unsigned get_width() const { return target.get_width(); }
+	virtual unsigned get_height() const { return target.get_height(); }
+	float get_aspect_ratio() const { return static_cast<float>(get_width())/get_height(); }
 
 	void set_camera(Camera *);
-	void set_content(const Renderable *);
-
-	// Deprecated
-	void synchronize_camera_aspect(Camera &);
-
-	void render();
+	void set_content(Renderable *);
 
-private:
-	void window_resized(unsigned, unsigned);
+	virtual void render();
+	virtual void render(Renderer &);
 };
 
 } // namespace GL