Fix shadowing warnings from older gcc versions

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 45cf241e8ec3798ab0a0368c389b8794fa11f5d3..76ac5846f2aad1e9417780e39d87f3c816a81088 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -24,14 +24,16 @@ namespace GL {
 Renderer::Renderer(const Camera *c):
        changed(0),
        matrices_loaded(false),
-       shdata_applied(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()
@@ -41,12 +43,7 @@ Renderer::~Renderer()
 
 void Renderer::begin(const Camera *c)
 {
-       if(state_stack.size()>1)
-               throw invalid_operation("Renderer::begin");
-
-       reset_state();
-       excluded.clear();
-
+       end();
        if(c)
                set_camera(*c);
 }
@@ -127,9 +124,16 @@ void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 
 void Renderer::add_shader_data(const ProgramData &d)
 {
-       shdata_stack.push_back(&d);
-       state->shdata_count = shdata_stack.size();
-       changed |= SHADER_DATA;
+       if(state->shdata_count<shdata_stack.size() && shdata_stack[state->shdata_count]==&d)
+               ++state->shdata_count;
+       else
+       {
+               if(shdata_stack.size()>state->shdata_count)
+                       shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+               shdata_stack.push_back(&d);
+               state->shdata_count = shdata_stack.size();
+               changed |= SHADER_DATA;
+       }
 }
 
 void Renderer::set_mesh(const Mesh *m)
@@ -163,19 +167,20 @@ void Renderer::pop_state()
        const Clipping *old_clipping = state->clipping;
        state_stack.pop_back();
        state = &state_stack.back();
-       if(shdata_stack.size()>state->shdata_count)
-       {
-               shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
-               changed |= SHADER_DATA;
-       }
-       shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
        changed |= MATRIX;
-       if(state->camera!=old_camera)
+       bool camera_changed = (state->camera!=old_camera);
+       if(camera_changed)
        {
-               standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+               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;
        }
-       if(state->lighting!=old_lighting)
+       /* 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)
                {
@@ -184,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)
                {
@@ -195,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();
@@ -218,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)
@@ -323,28 +330,28 @@ void Renderer::apply_state()
                                changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
                        }
 
-                       if(state->material && (changed&MATERIAL_SHDATA))
+                       if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
                        {
                                state->material->get_shader_data().apply();
                                changed &= ~MATERIAL_SHDATA;
                        }
 
-                       if(changed&STANDARD_SHDATA)
+                       if((changed&STANDARD_SHDATA) || shprog_changed)
                        {
                                standard_shdata.apply();
                                changed &= ~STANDARD_SHDATA;
                        }
                }
 
-               if((changed&SHADER_DATA) || shprog_changed)
+               bool extra_shdata = (shdata_stack.size()>state->shdata_count);
+
+               if((changed&SHADER_DATA) || shprog_changed || extra_shdata)
                {
-                       vector<const ProgramData *>::const_iterator i = shdata_stack.begin();
-                       if(!shprog_changed)
-                               i += shdata_applied;
-                       for(; i!=shdata_stack.end(); ++i)
+                       if(extra_shdata)
+                               shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+                       for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
                                (*i)->apply();
                        changed &= ~SHADER_DATA;
-                       shdata_applied = shdata_stack.size();
                }
        }
        else
@@ -396,20 +403,6 @@ 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),