Route rendering calls through Renderer and add an exclusion system

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 71a7dedff1ea09e094fd2b2c9b31ae3246dfadb9..6734edc4bd20458be56563bdddfd57a2589ab203 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -1,21 +1,16 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
 #include "batch.h"
 #include "buffer.h"
 #include "camera.h"
+#include "error.h"
 #include "material.h"
 #include "program.h"
 #include "programdata.h"
+#include "renderable.h"
 #include "renderer.h"
 #include "texture.h"
 #include "texturing.h"
 #include "vertexarray.h"
+#include "windingtest.h"
 
 using namespace std;
 
@@ -23,23 +18,27 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
+       mtx_stack(*this),
        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)
        {
                MatrixStack::projection().push();
                camera->apply();
-               mtx_stack = camera->get_matrix();
+               mtx_stack.load(camera->get_matrix());
        }
        else
-               mtx_stack = MatrixStack::modelview().top();
+               mtx_stack.load(MatrixStack::modelview().top());
 }
 
 Renderer::~Renderer()
@@ -53,12 +52,7 @@ Renderer::~Renderer()
        Material::unbind();
        Program::unbind();
        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-}
-
-MatrixStack &Renderer::matrix_stack()
-{
-       mtx_changed = true;
-       return mtx_stack;
+       WindingTest::unbind();
 }
 
 void Renderer::set_texture(const Texture *t)
@@ -78,21 +72,22 @@ void Renderer::set_material(const Material *m)
        state->material = m;
 }
 
-void Renderer::set_shader(const Program *p, const ProgramData *d)
+void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 {
        state->shprog = p;
-       if(d)
-               state->shdata.assign(1, d);
-       else
-               state->shdata.clear();
+       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)
+void Renderer::add_shader_data(const ProgramData &d)
 {
-       if(!state->shprog)
-               throw InvalidState("No shader program");
-
-       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)
@@ -106,6 +101,11 @@ void Renderer::set_element_buffer(const Buffer *b)
        element_buffer = b;
 }
 
+void Renderer::set_winding_test(const WindingTest *w)
+{
+       state->winding_test = w;
+}
+
 void Renderer::push_state()
 {
        state_stack.push_back(state_stack.back());
@@ -116,11 +116,15 @@ void Renderer::push_state()
 void Renderer::pop_state()
 {
        if(state_stack.size()==1)
-               throw InvalidState("Can't pop the last state");
+               throw stack_underflow("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;
 }
 
 void Renderer::escape()
@@ -129,16 +133,35 @@ 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)
-               throw InvalidState("Can't draw without a vertex array");
+               throw invalid_operation("Renderer::draw");
 
        apply_state();
 
        // Until VertexArray acquires VAO support and becomes Bindable
        if(vertex_array_changed)
+       {
                vertex_array->apply();
+               vertex_array_changed = false;
+       }
 
        if(element_buffer)
                element_buffer->bind_to(ELEMENT_ARRAY_BUFFER);
@@ -171,12 +194,21 @@ void Renderer::apply_state()
        if(state->shprog)
        {
                state->shprog->bind();
-               for(vector<const ProgramData *>::const_iterator i=state->shdata.begin(); i!=state->shdata.end(); ++i)
-                       (*i)->apply();
+               if(shdata_changed)
+               {
+                       for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
+                               (*i)->apply();
+                       shdata_changed = false;
+               }
        }
        else
                Program::unbind();
 
+       if(state->winding_test)
+               state->winding_test->bind();
+       else
+               WindingTest::unbind();
+
        if(mtx_changed)
        {
                MatrixStack::modelview() = mtx_stack.top();
@@ -189,8 +221,20 @@ Renderer::State::State():
        texture(0),
        texturing(0),
        material(0),
-       shprog(0)
+       shprog(0),
+       shdata_count(0),
+       winding_test(0)
+{ }
+
+
+Renderer::MtxStack::MtxStack(Renderer &r):
+       renderer(r)
 { }
 
+void Renderer::MtxStack::update()
+{
+       renderer.mtx_changed = true;
+}
+
 } // namespace GL
 } // namespace Msp