Convert svn:ignore to .gitignore

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 71a7dedff1ea09e094fd2b2c9b31ae3246dfadb9..46df5bf52777564ea62b9d995693c57f7e0d5fa9 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -16,6 +16,7 @@ Distributed under the LGPL
 #include "texture.h"
 #include "texturing.h"
 #include "vertexarray.h"
+#include "windingtest.h"
 
 using namespace std;
 
@@ -23,6 +24,7 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
+       mtx_stack(*this),
        mtx_changed(false),
        camera(c),
        state_stack(1),
@@ -36,10 +38,10 @@ Renderer::Renderer(const Camera *c):
        {
                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 +55,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)
@@ -106,6 +103,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());
@@ -121,6 +123,7 @@ void Renderer::pop_state()
        state_stack.pop_back();
        state = &state_stack.back();
        mtx_stack.pop();
+       mtx_changed = true;
 }
 
 void Renderer::escape()
@@ -138,7 +141,10 @@ void Renderer::draw(const Batch &batch)
 
        // 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);
@@ -177,6 +183,11 @@ void Renderer::apply_state()
        else
                Program::unbind();
 
+       if(state->winding_test)
+               state->winding_test->bind();
+       else
+               WindingTest::unbind();
+
        if(mtx_changed)
        {
                MatrixStack::modelview() = mtx_stack.top();
@@ -189,8 +200,19 @@ Renderer::State::State():
        texture(0),
        texturing(0),
        material(0),
-       shprog(0)
+       shprog(0),
+       winding_test(0)
 { }
 
+
+Renderer::MtxStack::MtxStack(Renderer &r):
+       renderer(r)
+{ }
+
+void Renderer::MtxStack::update()
+{
+       renderer.mtx_changed = true;
+}
+
 } // namespace GL
 } // namespace Msp