X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fview.cpp;h=074967cfe1e3b14cafb925e0902e9e9cf11500b0;hp=47411998f8359b6ca12fe4b93f58f99c032438fb;hb=4598d28936d3a4772927d1e3a1534f872731b358;hpb=9759cae2abf138acc548e3f230967e2c843e967e

diff --git a/source/view.cpp b/source/view.cpp
index 47411998..074967cf 100644
--- a/source/view.cpp
+++ b/source/view.cpp
@@ -1,23 +1,25 @@
 #include "camera.h"
-#include "framebuffer.h"
 #include "renderable.h"
+#include "renderer.h"
 #include "view.h"
 
-using namespace std;
-
 namespace Msp {
 namespace GL {
 
-View::View(Graphics::Window &w, Graphics::GLContext &c):
-	window(w),
-	context(c),
+View::View():
 	target(Framebuffer::system()),
+	camera(0),
 	content(0)
+{ }
+
+void View::set_camera(Camera *c)
 {
-	window.signal_resize.connect(sigc::mem_fun(this, &View::window_resized));
+	camera = c;
+	if(camera)
+		camera->set_aspect_ratio(get_aspect_ratio());
 }
 
-void View::set_content(const Renderable *r)
+void View::set_content(Renderable *r)
 {
 	content = r;
 }
@@ -25,23 +27,19 @@ void View::set_content(const Renderable *r)
 void View::synchronize_camera_aspect(Camera &c)
 {
 	synced_cameras.push_back(&c);
-	c.set_aspect(static_cast<float>(window.get_width())/window.get_height());
+	c.set_aspect_ratio(get_aspect_ratio());
 }
 
 void View::render()
 {
 	target.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	if(content)
-		content->render();
-	context.swap_buffers();
-}
-
-void View::window_resized(unsigned w, unsigned h)
-{
-	target.viewport(0, 0, w, h);
-	float aspect = static_cast<float>(w)/h;
-	for(list<Camera *>::iterator i=synced_cameras.begin(); i!=synced_cameras.end(); ++i)
-		(*i)->set_aspect(aspect);
+	{
+		Renderer renderer(camera);
+		content->setup_frame(renderer);
+		content->render(renderer);
+		content->finish_frame();
+	}
 }
 
 } // namespace GL