Remove separate element_buffer from Renderer, get it from mesh instead

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 2f253e2ab8c4f96471d3bf8e1491e450910f4bef..bc49b0f802941f3ae2a7509ae86351dc51a67ca8 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -22,17 +22,33 @@ namespace GL {
 
 Renderer::Renderer(const Camera *c):
        mtx_stack(*this),
-       changed(MATRIX),
+       changed(0),
        matrices_loaded(false),
        shdata_applied(0),
-       camera(c),
-       state_stack(1),
-       element_buffer(0)
+       camera(0),
+       state_stack(1)
 {
        state_stack.reserve(16);
        shdata_stack.reserve(32);
        state = &state_stack.back();
 
+       begin(c);
+}
+
+Renderer::~Renderer()
+{
+       end();
+}
+
+void Renderer::begin(const Camera *c)
+{
+       if(state_stack.size()>1)
+               throw invalid_operation("Renderer::begin");
+
+       reset_state();
+       excluded.clear();
+       camera = c;
+
        if(camera)
        {
                mtx_stack.load(camera->get_matrix());
@@ -40,16 +56,11 @@ Renderer::Renderer(const Camera *c):
        }
        else
        {
-               standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
                mtx_stack.load(MatrixStack::modelview().top());
+               standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
        }
 }
 
-Renderer::~Renderer()
-{
-       end();
-}
-
 void Renderer::set_texture(const Texture *t)
 {
        state->texture = t;
@@ -100,11 +111,6 @@ void Renderer::set_mesh(const Mesh *m)
        state->mesh = m;
 }
 
-void Renderer::set_element_buffer(const Buffer *b)
-{
-       element_buffer = b;
-}
-
 void Renderer::set_winding_test(const WindingTest *w)
 {
        state->winding_test = w;
@@ -158,13 +164,7 @@ void Renderer::end()
        if(state_stack.size()>1)
                throw invalid_operation("Renderer::end");
 
-       if(matrices_loaded)
-       {
-               if(camera)
-                       MatrixStack::projection().pop();
-               MatrixStack::modelview().pop();
-               matrices_loaded = false;
-       }
+       reset_state();
 
        Mesh::unbind();
        Texturing::unbind();
@@ -174,8 +174,6 @@ void Renderer::end()
        Program::unbind();
        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
        WindingTest::unbind();
-
-       *state = State();
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -199,10 +197,10 @@ void Renderer::draw(const Batch &batch)
        apply_state();
 
        bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
-       if(legacy_bindings)
+       if(state->mesh && legacy_bindings)
        {
-               if(element_buffer)
-                       element_buffer->bind_to(ELEMENT_ARRAY_BUFFER);
+               if(const Buffer *ibuf = state->mesh->get_index_buffer())
+                       ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
                else
                        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
        }
@@ -331,6 +329,20 @@ 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():
        texture(0),