Immediate update camera aspect in View::set_camera

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index a0dc41516c0f90ba36ffa84070a8a7276809224a..c744ac5a825009f588c305657f7938daf97b7178 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -25,14 +25,16 @@ Renderer::Renderer(const Camera *c):
        changed(0),
        matrices_loaded(false),
        shdata_applied(0),
-       camera(0),
        state_stack(1)
 {
        state_stack.reserve(16);
        shdata_stack.reserve(32);
        state = &state_stack.back();
 
-       begin(c);
+       if(c)
+               set_camera(*c);
+       else
+               standard_shdata.uniform("projection_matrix", Matrix());
 }
 
 Renderer::~Renderer()
@@ -42,24 +44,17 @@ Renderer::~Renderer()
 
 void Renderer::begin(const Camera *c)
 {
-       if(state_stack.size()>1)
-               throw invalid_operation("Renderer::begin");
-
-       reset_state();
-       excluded.clear();
-       camera = c;
+       end();
+       if(c)
+               set_camera(*c);
+}
 
-       if(camera)
-       {
-               state->modelview_matrix = camera->get_view_matrix();
-               standard_shdata.uniform("projection_matrix", camera->get_projection_matrix());
-       }
-       else
-       {
-               state->modelview_matrix = MatrixStack::modelview().top();
-               standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
-       }
-       changed |= MATRIX|STANDARD_SHDATA;
+void Renderer::set_camera(const Camera &c)
+{
+       state->camera = &c;
+       standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+       changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
+       set_matrix(state->camera->get_view_matrix());
 }
 
 void Renderer::set_matrix(const Matrix &matrix)
@@ -161,6 +156,7 @@ void Renderer::pop_state()
        if(state_stack.size()==1)
                throw stack_underflow("Renderer::pop_state");
 
+       const Camera *old_camera = state->camera;
        const Lighting *old_lighting = state->lighting;
        const Clipping *old_clipping = state->clipping;
        state_stack.pop_back();
@@ -172,7 +168,19 @@ void Renderer::pop_state()
        }
        shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
        changed |= MATRIX;
-       if(state->lighting!=old_lighting)
+       bool camera_changed = (state->camera!=old_camera);
+       if(camera_changed)
+       {
+               if(state->camera)
+                       standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+               else
+                       standard_shdata.uniform("projection_matrix", Matrix());
+               changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
+       }
+       /* This actually should compare the relevant matrices rather than check for
+       camera, but in practice lighting and clipping is set right after the camera
+       and a boolean check is much faster than matrix comparison. */
+       if(state->lighting!=old_lighting || camera_changed)
        {
                if(state->lighting)
                {
@@ -181,7 +189,7 @@ void Renderer::pop_state()
                }
                changed |= LEGACY_LIGHTING;
        }
-       if(state->clipping!=old_clipping)
+       if(state->clipping!=old_clipping || camera_changed)
        {
                if(state->clipping)
                {
@@ -192,19 +200,14 @@ void Renderer::pop_state()
        }
 }
 
-void Renderer::escape()
-{
-       apply_state();
-       Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-       matrices_loaded = false;
-}
-
 void Renderer::end()
 {
        if(state_stack.size()>1)
                throw invalid_operation("Renderer::end");
 
-       reset_state();
+       *state = State();
+       shdata_stack.clear();
+       excluded.clear();
 
        Mesh::unbind();
        Texturing::unbind();
@@ -215,6 +218,13 @@ void Renderer::end()
        Program::unbind();
        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
        WindingTest::unbind();
+
+       if(matrices_loaded)
+       {
+               MatrixStack::projection().pop();
+               MatrixStack::modelview().pop();
+               matrices_loaded = false;
+       }
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -375,14 +385,16 @@ void Renderer::apply_state()
                if(!matrices_loaded)
                {
                        MatrixStack::modelview().push();
-                       if(camera)
-                       {
-                               MatrixStack::projection().push();
-                               camera->apply();
-                       }
+                       MatrixStack::projection().push();
                        matrices_loaded = true;
                }
 
+               if(changed&LEGACY_PROJECTION)
+               {
+                       MatrixStack::projection() = state->camera->get_projection_matrix();
+                       changed &= ~LEGACY_PROJECTION;
+               }
+
                if(changed&LEGACY_MATRIX)
                {
                        MatrixStack::modelview() = state->modelview_matrix;
@@ -391,22 +403,9 @@ void Renderer::apply_state()
        }
 }
 
-void Renderer::reset_state()
-{
-       if(!matrices_loaded)
-               return;
-
-       if(camera)
-               MatrixStack::projection().pop();
-       MatrixStack::modelview().pop();
-       matrices_loaded = false;
-       changed |= MATRIX;
-
-       *state = State();
-}
-
 
 Renderer::State::State():
+       camera(0),
        texture(0),
        texturing(0),
        lowest_effect_texunit(TexUnit::get_n_units()),