X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=6734edc4bd20458be56563bdddfd57a2589ab203;hb=8e9d872c2ba8dc633d29a673ba93adf38d262a5c;hp=2680d9022e9edcfe128cffec1ba246397902cd72;hpb=635d00bc1a9ba43ef1224681a14d0710a098cf87;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 2680d902..6734edc4 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -1,17 +1,11 @@
-/* $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"
@@ -28,12 +22,14 @@ Renderer::Renderer(const Camera *c):
 	mtx_changed(false),
 	camera(c),
 	state_stack(1),
-	state(&state_stack.back()),
 	vertex_array(0),
 	vertex_array_changed(false),
-	element_buffer(0),
-	winding_test(0)
+	element_buffer(0)
 {
+	state_stack.reserve(16);
+	shdata_stack.reserve(32);
+	state = &state_stack.back();
+
 	MatrixStack::modelview().push();
 	if(camera)
 	{
@@ -56,6 +52,7 @@ Renderer::~Renderer()
 	Material::unbind();
 	Program::unbind();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+	WindingTest::unbind();
 }
 
 void Renderer::set_texture(const Texture *t)
@@ -75,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)
@@ -105,7 +103,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 +116,58 @@ 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()
 {
 	apply_state();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-	WindingTest::unbind();
+}
+
+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);
 	else
 		Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 
-	if(winding_test)
-		winding_test->bind();
-	else
-		WindingTest::unbind();
-
 	batch.draw();
 }
 
@@ -180,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();
@@ -198,7 +221,9 @@ Renderer::State::State():
 	texture(0),
 	texturing(0),
 	material(0),
-	shprog(0)
+	shprog(0),
+	shdata_count(0),
+	winding_test(0)
 { }