Check for null camera in View::render

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

diff --git a/source/view.cpp b/source/view.cpp
index 7ab41912ef19d1be6251e279725a9fbfa7830bbe..19d583ae19b04d1c2eb0f8348b9469255b15d5cf 100644 (file)
--- a/source/view.cpp
+++ b/source/view.cpp
@@ -9,9 +9,15 @@ namespace GL {
 View::View(Framebuffer &t):
        target(t),
        camera(0),
-       content(0)
+       content(0),
+       internal_renderer(0)
 { }
 
+View::~View()
+{
+       delete internal_renderer;
+}
+
 void View::set_camera(Camera *c)
 {
        camera = c;
@@ -24,19 +30,22 @@ void View::set_content(Renderable *r)
        content = r;
 }
 
-void View::synchronize_camera_aspect(Camera &c)
+void View::render()
 {
-       synced_cameras.push_back(&c);
-       c.set_aspect_ratio(get_aspect_ratio());
+       if(!internal_renderer)
+               internal_renderer = new Renderer;
+       render(*internal_renderer);
 }
 
-void View::render()
+void View::render(Renderer &renderer)
 {
        Bind bind_fbo(target);
        target.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
        if(content)
        {
-               Renderer renderer(camera);
+               Renderer::Push push(renderer);
+               if(camera)
+                       renderer.set_camera(*camera);
                content->setup_frame(renderer);
                content->render(renderer);
                content->finish_frame();