Derive ProgramCompiler::DeclarationCombiner from BlockModifier

[libs/gl.git] / source / view.cpp

diff --git a/source/view.cpp b/source/view.cpp
index 759e90be1f6c0bc0d48a37c8d5d7819313f7654b..b4dcca99cc4a4f6b6bb6839df1ee39bf8f99fc23 100644 (file)
--- a/source/view.cpp
+++ b/source/view.cpp
@@ -13,14 +13,18 @@ View::View(Graphics::Window &w, Graphics::GLContext &c):
        window(w),
        context(c),
        target(Framebuffer::system()),
+       camera(0),
        content(0)
 {
        window.signal_resize.connect(sigc::mem_fun(this, &View::window_resized));
+       window_resized(window.get_width(), window.get_height());
 }
 
 void View::set_camera(Camera *c)
 {
        camera = c;
+       if(camera)
+               camera->set_aspect(static_cast<float>(window.get_width())/window.get_height());
 }
 
 void View::set_content(Renderable *r)
@@ -40,7 +44,7 @@ void View::render()
        if(content)
        {
                Renderer renderer(camera);
-               content->setup_frame();
+               content->setup_frame(renderer);
                content->render(renderer);
                content->finish_frame();
        }