Lots of comment updates

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 2680d9022e9edcfe128cffec1ba246397902cd72..ee845e08b12d18d66c864cf936b3b48a8eae935f 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -1,14 +1,7 @@
-/* $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"
@@ -31,8 +24,7 @@ Renderer::Renderer(const Camera *c):
        state(&state_stack.back()),
        vertex_array(0),
        vertex_array_changed(false),
-       element_buffer(0),
-       winding_test(0)
+       element_buffer(0)
 {
        MatrixStack::modelview().push();
        if(camera)
@@ -56,6 +48,7 @@ Renderer::~Renderer()
        Material::unbind();
        Program::unbind();
        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+       WindingTest::unbind();
 }
 
 void Renderer::set_texture(const Texture *t)
@@ -82,14 +75,16 @@ void Renderer::set_shader(const Program *p, const ProgramData *d)
                state->shdata.assign(1, d);
        else
                state->shdata.clear();
+       shdata_changed = true;
 }
 
 void Renderer::add_shader_data(const ProgramData *d)
 {
        if(!state->shprog)
-               throw InvalidState("No shader program");
+               throw invalid_operation("Renderer::add_shader_data");
 
        state->shdata.push_back(d);
+       shdata_changed = true;
 }
 
 void Renderer::set_vertex_array(const VertexArray *a)
@@ -105,7 +100,7 @@ void Renderer::set_element_buffer(const Buffer *b)
 
 void Renderer::set_winding_test(const WindingTest *w)
 {
-       winding_test = w;
+       state->winding_test = w;
 }
 
 void Renderer::push_state()
@@ -118,42 +113,40 @@ 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();
        mtx_stack.pop();
        mtx_changed = true;
+       shdata_changed = true;
 }
 
 void Renderer::escape()
 {
        apply_state();
        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-       WindingTest::unbind();
 }
 
 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);
        else
                Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 
-       if(winding_test)
-               winding_test->bind();
-       else
-               WindingTest::unbind();
-
        batch.draw();
 }
 
@@ -180,12 +173,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=state->shdata.begin(); i!=state->shdata.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();
@@ -198,7 +200,8 @@ Renderer::State::State():
        texture(0),
        texturing(0),
        material(0),
-       shprog(0)
+       shprog(0),
+       winding_test(0)
 { }