Renderer no longer needs to track vertex array changes

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index c751b0e3629d77b8bd93fee9aa4049f3a75cc57f..442728135274576129ff0da16c82531ae9837b07 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -5,6 +5,7 @@
 #include "material.h"
 #include "program.h"
 #include "programdata.h"
+#include "renderable.h"
 #include "renderer.h"
 #include "texture.h"
 #include "texturing.h"
@@ -21,11 +22,13 @@ Renderer::Renderer(const Camera *c):
        mtx_changed(false),
        camera(c),
        state_stack(1),
-       state(&state_stack.back()),
        vertex_array(0),
-       vertex_array_changed(false),
        element_buffer(0)
 {
+       state_stack.reserve(16);
+       shdata_stack.reserve(32);
+       state = &state_stack.back();
+
        MatrixStack::modelview().push();
        if(camera)
        {
@@ -73,18 +76,21 @@ void Renderer::set_shader_program(const Program *p, const ProgramData *d)
        state->shprog = p;
        if(p && d)
                add_shader_data(*d);
+
+       /* Even if we have no new shdata, the existing ones need to be re-applied
+       to the new program */
        shdata_changed = true;
 }
 
 void Renderer::add_shader_data(const ProgramData &d)
 {
-       state->shdata.push_back(&d);
+       shdata_stack.push_back(&d);
+       state->shdata_count = shdata_stack.size();
        shdata_changed = true;
 }
 
 void Renderer::set_vertex_array(const VertexArray *a)
 {
-       vertex_array_changed = (a!=vertex_array);
        vertex_array = a;
 }
 
@@ -112,6 +118,8 @@ void Renderer::pop_state()
 
        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());
        mtx_stack.pop();
        mtx_changed = true;
        shdata_changed = true;
@@ -123,6 +131,22 @@ void Renderer::escape()
        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 }
 
+void Renderer::exclude(const Renderable &renderable)
+{
+       excluded.insert(&renderable);
+}
+
+void Renderer::include(const Renderable &renderable)
+{
+       excluded.erase(&renderable);
+}
+
+void Renderer::render(const Renderable &renderable, const Tag &tag)
+{
+       if(!excluded.count(&renderable))
+               renderable.render(*this, tag);
+}
+
 void Renderer::draw(const Batch &batch)
 {
        if(!vertex_array)
@@ -130,12 +154,7 @@ void Renderer::draw(const Batch &batch)
 
        apply_state();
 
-       // Until VertexArray acquires VAO support and becomes Bindable
-       if(vertex_array_changed)
-       {
-               vertex_array->apply();
-               vertex_array_changed = false;
-       }
+       vertex_array->apply();
 
        if(element_buffer)
                element_buffer->bind_to(ELEMENT_ARRAY_BUFFER);
@@ -170,7 +189,7 @@ void Renderer::apply_state()
                state->shprog->bind();
                if(shdata_changed)
                {
-                       for(vector<const ProgramData *>::const_iterator i=state->shdata.begin(); i!=state->shdata.end(); ++i)
+                       for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
                                (*i)->apply();
                        shdata_changed = false;
                }
@@ -196,6 +215,7 @@ Renderer::State::State():
        texturing(0),
        material(0),
        shprog(0),
+       shdata_count(0),
        winding_test(0)
 { }