X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fview.cpp;h=074967cfe1e3b14cafb925e0902e9e9cf11500b0;hp=115a4b0cd77eefc93c5a6db580e943eeaf6a81c9;hb=4598d28936d3a4772927d1e3a1534f872731b358;hpb=540f976c5f0fcee4fbf0edfdace246f4a3588f65 diff --git a/source/view.cpp b/source/view.cpp index 115a4b0c..074967cf 100644 --- a/source/view.cpp +++ b/source/view.cpp @@ -1,27 +1,22 @@ #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) -{ - window.signal_resize.connect(sigc::mem_fun(this, &View::window_resized)); -} +{ } void View::set_camera(Camera *c) { camera = c; + if(camera) + camera->set_aspect_ratio(get_aspect_ratio()); } void View::set_content(Renderable *r) @@ -32,7 +27,7 @@ void View::set_content(Renderable *r) void View::synchronize_camera_aspect(Camera &c) { synced_cameras.push_back(&c); - c.set_aspect(static_cast(window.get_width())/window.get_height()); + c.set_aspect_ratio(get_aspect_ratio()); } void View::render() @@ -45,17 +40,6 @@ void View::render() content->render(renderer); content->finish_frame(); } - context.swap_buffers(); -} - -void View::window_resized(unsigned w, unsigned h) -{ - target.viewport(0, 0, w, h); - float aspect = static_cast(w)/h; - if(camera) - camera->set_aspect(aspect); - for(list::iterator i=synced_cameras.begin(); i!=synced_cameras.end(); ++i) - (*i)->set_aspect(aspect); } } // namespace GL