X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=19811146235ec6622c0917a1536190490597bff8;hp=c8972934cb304d34b22ed3a2f68147c7b7d74c48;hb=77ad5a1a89aa43d9a3c8c58abff1ae184510cec6;hpb=6a045019fbd68738b77849629e6dfd3dfd9a4d93

diff --git a/source/renderer.cpp b/source/renderer.cpp
index c8972934..19811146 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -22,9 +22,9 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
+	default_camera(c),
 	changed(0),
 	matrices_loaded(false),
-	shdata_applied(0),
 	state_stack(1)
 {
 	state_stack.reserve(16);
@@ -33,6 +33,8 @@ Renderer::Renderer(const Camera *c):
 
 	if(c)
 		set_camera(*c);
+	else
+		standard_shdata.uniform("projection_matrix", Matrix());
 }
 
 Renderer::~Renderer()
@@ -123,9 +125,16 @@ void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 
 void Renderer::add_shader_data(const ProgramData &d)
 {
-	shdata_stack.push_back(&d);
-	state->shdata_count = shdata_stack.size();
-	changed |= SHADER_DATA;
+	if(state->shdata_count<shdata_stack.size() && shdata_stack[state->shdata_count]==&d)
+		++state->shdata_count;
+	else
+	{
+		if(shdata_stack.size()>state->shdata_count)
+			shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+		shdata_stack.push_back(&d);
+		state->shdata_count = shdata_stack.size();
+		changed |= SHADER_DATA;
+	}
 }
 
 void Renderer::set_mesh(const Mesh *m)
@@ -159,17 +168,14 @@ void Renderer::pop_state()
 	const Clipping *old_clipping = state->clipping;
 	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());
 	changed |= MATRIX;
 	bool camera_changed = (state->camera!=old_camera);
 	if(camera_changed)
 	{
-		standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+		if(state->camera)
+			standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+		else
+			standard_shdata.uniform("projection_matrix", Matrix());
 		changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
 	}
 	/* This actually should compare the relevant matrices rather than check for
@@ -201,6 +207,10 @@ void Renderer::end()
 		throw invalid_operation("Renderer::end");
 
 	*state = State();
+	if(default_camera)
+		set_camera(*default_camera);
+	else
+		standard_shdata.uniform("projection_matrix", Matrix());
 	shdata_stack.clear();
 	excluded.clear();
 
@@ -260,14 +270,15 @@ void Renderer::apply_state()
 	changed */
 
 	bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
+	bool legacy_textures = !state->shprog;
 
 	if(state->texturing)
-		state->texturing->bind();
+		state->texturing->bind(legacy_textures);
 	else
 	{
 		Texturing::unbind();
 		if(state->texture)
-			state->texture->bind_to(0);
+			state->texture->bind_to(0, legacy_textures);
 		else
 			Texture::unbind_from(0);
 	}
@@ -325,28 +336,28 @@ void Renderer::apply_state()
 				changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
 			}
 
-			if(state->material && (changed&MATERIAL_SHDATA))
+			if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
 			{
 				state->material->get_shader_data().apply();
 				changed &= ~MATERIAL_SHDATA;
 			}
 
-			if(changed&STANDARD_SHDATA)
+			if((changed&STANDARD_SHDATA) || shprog_changed)
 			{
 				standard_shdata.apply();
 				changed &= ~STANDARD_SHDATA;
 			}
 		}
 
-		if((changed&SHADER_DATA) || shprog_changed)
+		bool extra_shdata = (shdata_stack.size()>state->shdata_count);
+
+		if((changed&SHADER_DATA) || shprog_changed || extra_shdata)
 		{
-			vector<const ProgramData *>::const_iterator i = shdata_stack.begin();
-			if(!shprog_changed)
-				i += shdata_applied;
-			for(; i!=shdata_stack.end(); ++i)
+			if(extra_shdata)
+				shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+			for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
 				(*i)->apply();
 			changed &= ~SHADER_DATA;
-			shdata_applied = shdata_stack.size();
 		}
 	}
 	else