X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=c558757f885654e0646f6392d9866b4bf52b205e;hb=6db6b7e49848e6bbc14f3ec8113ee5a941e4af07;hp=54d12051c9945066badc10231685e43398aad0f1;hpb=6d2e5c8e7ef79706adfce1b69695e3c8071c6ddb;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 54d12051..c558757f 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -22,16 +22,33 @@ namespace GL {
 
 Renderer::Renderer(const Camera *c):
 	mtx_stack(*this),
-	changed(MATRIX),
+	changed(0),
 	matrices_loaded(false),
-	camera(c),
-	state_stack(1),
-	element_buffer(0)
+	shdata_applied(0),
+	camera(0),
+	state_stack(1)
 {
 	state_stack.reserve(16);
 	shdata_stack.reserve(32);
 	state = &state_stack.back();
 
+	begin(c);
+}
+
+Renderer::~Renderer()
+{
+	end();
+}
+
+void Renderer::begin(const Camera *c)
+{
+	if(state_stack.size()>1)
+		throw invalid_operation("Renderer::begin");
+
+	reset_state();
+	excluded.clear();
+	camera = c;
+
 	if(camera)
 	{
 		mtx_stack.load(camera->get_matrix());
@@ -39,14 +56,19 @@ Renderer::Renderer(const Camera *c):
 	}
 	else
 	{
-		standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
 		mtx_stack.load(MatrixStack::modelview().top());
+		standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
 	}
 }
 
-Renderer::~Renderer()
+void Renderer::set_matrix(const Matrix &matrix)
 {
-	end();
+	mtx_stack.load(matrix);
+}
+
+void Renderer::transform(const Matrix &matrix)
+{
+	mtx_stack *= matrix;
 }
 
 void Renderer::set_texture(const Texture *t)
@@ -85,10 +107,6 @@ void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 	state->shprog = p;
 	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)
@@ -103,11 +121,6 @@ void Renderer::set_mesh(const Mesh *m)
 	state->mesh = m;
 }
 
-void Renderer::set_element_buffer(const Buffer *b)
-{
-	element_buffer = b;
-}
-
 void Renderer::set_winding_test(const WindingTest *w)
 {
 	state->winding_test = w;
@@ -130,12 +143,23 @@ void Renderer::pop_state()
 	if(state_stack.size()==1)
 		throw stack_underflow("Renderer::pop_state");
 
+	const Lighting *old_lighting = state->lighting;
 	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());
+		changed |= SHADER_DATA;
+	}
+	shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
 	mtx_stack.pop();
-	changed |= MATRIX|SHADER_DATA;
+	changed |= MATRIX;
+	if(state->lighting!=old_lighting)
+	{
+		if(state->lighting)
+			state->lighting->update_shader_data(standard_shdata, state->lighting_matrix);
+		changed |= LIGHTING;
+	}
 }
 
 void Renderer::escape()
@@ -150,13 +174,7 @@ void Renderer::end()
 	if(state_stack.size()>1)
 		throw invalid_operation("Renderer::end");
 
-	if(matrices_loaded)
-	{
-		if(camera)
-			MatrixStack::projection().pop();
-		MatrixStack::modelview().pop();
-		matrices_loaded = false;
-	}
+	reset_state();
 
 	Mesh::unbind();
 	Texturing::unbind();
@@ -166,8 +184,6 @@ void Renderer::end()
 	Program::unbind();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 	WindingTest::unbind();
-
-	*state = State();
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -191,10 +207,10 @@ void Renderer::draw(const Batch &batch)
 	apply_state();
 
 	bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
-	if(legacy_bindings)
+	if(state->mesh && legacy_bindings)
 	{
-		if(element_buffer)
-			element_buffer->bind_to(ELEMENT_ARRAY_BUFFER);
+		if(const Buffer *ibuf = state->mesh->get_index_buffer())
+			ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
 		else
 			Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 	}
@@ -233,7 +249,7 @@ void Renderer::apply_state()
 			{
 				MatrixStack::modelview() = state->lighting_matrix;
 				state->lighting->bind();
-				changed = (changed&~LIGHTING)|MATRIX;
+				changed = (changed&~LIGHTING)|LEGACY_MATRIX;
 			}
 			else
 				Lighting::unbind();
@@ -242,28 +258,35 @@ void Renderer::apply_state()
 
 	if(state->shprog)
 	{
+		bool shprog_changed = (state->shprog!=Program::current());
 		state->shprog->bind();
 
 		if(!legacy_bindings)
 		{
-			const Matrix &m = mtx_stack.top();
-			standard_shdata.uniform("eye_obj_matrix", mtx_stack.top());
-			LinAl::SquareMatrix<float, 3> nm;
-			for(unsigned i=0; i<3; ++i)
-				for(unsigned j=0; j<3; ++j)
-					nm(i, j) = m(i, j);
-			nm = transpose(invert(nm));
-			standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0));
+			if(changed&MODERN_MATRIX)
+			{
+				const Matrix &m = mtx_stack.top();
+				standard_shdata.uniform("eye_obj_matrix", mtx_stack.top());
+				LinAl::SquareMatrix<float, 3> nm = m.block<3, 3>(0, 0);
+				nm = transpose(invert(nm));
+				standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0));
+				changed &= ~MODERN_MATRIX;
+			}
+
 			if(state->material)
 				state->material->get_shader_data().apply();
 			standard_shdata.apply();
 		}
 
-		if(changed&SHADER_DATA)
+		if((changed&SHADER_DATA) || shprog_changed)
 		{
-			for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
+			vector<const ProgramData *>::const_iterator i = shdata_stack.begin();
+			if(!shprog_changed)
+				i += shdata_applied;
+			for(; i!=shdata_stack.end(); ++i)
 				(*i)->apply();
 			changed &= ~SHADER_DATA;
+			shdata_applied = shdata_stack.size();
 		}
 	}
 	else
@@ -305,14 +328,28 @@ void Renderer::apply_state()
 			matrices_loaded = true;
 		}
 
-		if(changed&MATRIX)
+		if(changed&LEGACY_MATRIX)
 		{
 			MatrixStack::modelview() = mtx_stack.top();
-			changed &= ~MATRIX;
+			changed &= ~LEGACY_MATRIX;
 		}
 	}
 }
 
+void Renderer::reset_state()
+{
+	if(!matrices_loaded)
+		return;
+
+	if(camera)
+		MatrixStack::projection().pop();
+	MatrixStack::modelview().pop();
+	matrices_loaded = false;
+	changed |= MATRIX;
+
+	*state = State();
+}
+
 
 Renderer::State::State():
 	texture(0),