X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=6734edc4bd20458be56563bdddfd57a2589ab203;hb=7398ee7ebbd8b7e56c721a85cbe721b79758d09a;hp=72043cd153f1d669b7f69011f97981d1a4793aea;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 72043cd1..6734edc4 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -1,10 +1,11 @@
-#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"
@@ -21,11 +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)
 {
+	state_stack.reserve(16);
+	shdata_stack.reserve(32);
+	state = &state_stack.back();
+
 	MatrixStack::modelview().push();
 	if(camera)
 	{
@@ -68,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)
@@ -111,12 +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()
@@ -125,10 +133,26 @@ 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();
 
@@ -170,8 +194,12 @@ 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();
@@ -194,6 +222,7 @@ Renderer::State::State():
 	texturing(0),
 	material(0),
 	shprog(0),
+	shdata_count(0),
 	winding_test(0)
 { }