X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=c8972934cb304d34b22ed3a2f68147c7b7d74c48;hb=0ab875bdc9fbf84ecfce883b188410bb45882447;hp=45cf241e8ec3798ab0a0368c389b8794fa11f5d3;hpb=bfc7f104c642590fd85577a6545c6bc6259ccaa4;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 45cf241e..c8972934 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -31,7 +31,8 @@ Renderer::Renderer(const Camera *c):
 	shdata_stack.reserve(32);
 	state = &state_stack.back();
 
-	begin(c);
+	if(c)
+		set_camera(*c);
 }
 
 Renderer::~Renderer()
@@ -41,12 +42,7 @@ Renderer::~Renderer()
 
 void Renderer::begin(const Camera *c)
 {
-	if(state_stack.size()>1)
-		throw invalid_operation("Renderer::begin");
-
-	reset_state();
-	excluded.clear();
-
+	end();
 	if(c)
 		set_camera(*c);
 }
@@ -170,12 +166,16 @@ void Renderer::pop_state()
 	}
 	shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
 	changed |= MATRIX;
-	if(state->camera!=old_camera)
+	bool camera_changed = (state->camera!=old_camera);
+	if(camera_changed)
 	{
 		standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
 		changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
 	}
-	if(state->lighting!=old_lighting)
+	/* This actually should compare the relevant matrices rather than check for
+	camera, but in practice lighting and clipping is set right after the camera
+	and a boolean check is much faster than matrix comparison. */
+	if(state->lighting!=old_lighting || camera_changed)
 	{
 		if(state->lighting)
 		{
@@ -184,7 +184,7 @@ void Renderer::pop_state()
 		}
 		changed |= LEGACY_LIGHTING;
 	}
-	if(state->clipping!=old_clipping)
+	if(state->clipping!=old_clipping || camera_changed)
 	{
 		if(state->clipping)
 		{
@@ -195,19 +195,14 @@ void Renderer::pop_state()
 	}
 }
 
-void Renderer::escape()
-{
-	apply_state();
-	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-	matrices_loaded = false;
-}
-
 void Renderer::end()
 {
 	if(state_stack.size()>1)
 		throw invalid_operation("Renderer::end");
 
-	reset_state();
+	*state = State();
+	shdata_stack.clear();
+	excluded.clear();
 
 	Mesh::unbind();
 	Texturing::unbind();
@@ -218,6 +213,13 @@ void Renderer::end()
 	Program::unbind();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 	WindingTest::unbind();
+
+	if(matrices_loaded)
+	{
+		MatrixStack::projection().pop();
+		MatrixStack::modelview().pop();
+		matrices_loaded = false;
+	}
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -396,20 +398,6 @@ void Renderer::apply_state()
 	}
 }
 
-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():
 	camera(0),