X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=03042e67c12f80ac95904ca4c66e8f4e80e6baee;hb=2be605933f62521bb22780256386a14b371c8b17;hp=71a7dedff1ea09e094fd2b2c9b31ae3246dfadb9;hpb=25c81b4953dd38993250321b9407ce8b0139cbeb;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 71a7dedf..03042e67 100644
--- 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"
@@ -16,6 +9,7 @@ Distributed under the LGPL
 #include "texture.h"
 #include "texturing.h"
 #include "vertexarray.h"
+#include "windingtest.h"
 
 using namespace std;
 
@@ -23,6 +17,7 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
+	mtx_stack(*this),
 	mtx_changed(false),
 	camera(c),
 	state_stack(1),
@@ -36,10 +31,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 +48,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)
@@ -90,7 +80,7 @@ void Renderer::set_shader(const Program *p, const ProgramData *d)
 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);
 }
@@ -106,6 +96,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 +111,12 @@ 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;
 }
 
 void Renderer::escape()
@@ -132,13 +128,16 @@ void Renderer::escape()
 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);
@@ -177,6 +176,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 +193,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