X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=044ab55db7d3404d0f7ac9db3181d1e3eb3e5281;hb=42c44db6aa2961cffea6263f337adbd9d161c59c;hp=5e155f2e970ac75f4ba85b59d857e66aa3c30f0b;hpb=f82ef715f0d7e1e7d0b93be4b7b89c8ce6bba40b;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 5e155f2e..044ab55d 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -20,8 +20,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Renderer::Renderer():
-	changed(0)
+Renderer::Renderer()
 {
 	state_stack.reserve(16);
 	state_stack.push_back(State());
@@ -111,18 +110,6 @@ void Renderer::flush_textures()
 	texture_stack.erase(texture_stack.begin()+state->texture_count, texture_stack.end());
 }
 
-void Renderer::set_material(const Material *m)
-{
-	if(m)
-		add_shader_data(m->get_shader_data());
-}
-
-void Renderer::set_lighting(const Lighting *l)
-{
-	if(l)
-		add_shader_data(l->get_shader_data());
-}
-
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 {
 	state->shprog = p;
@@ -142,13 +129,13 @@ void Renderer::add_shader_data(const ProgramData &d)
 		}
 	}
 
-	flush_shader_data_();
+	flush_shader_data();
 	shdata_stack.push_back(&d);
 	state->shdata_count = shdata_stack.size();
 	changed |= SHADER_DATA;
 }
 
-void Renderer::flush_shader_data_()
+void Renderer::flush_shader_data()
 {
 	if(shdata_stack.size()>state->shdata_count)
 		shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
@@ -213,27 +200,10 @@ void Renderer::end()
 	*state = State();
 	shdata_stack.clear();
 	add_shader_data(standard_shdata);
-	excluded.clear();
 
 	commands.use_pipeline(0);
 }
 
-void Renderer::exclude(const Renderable &renderable)
-{
-	excluded.insert(&renderable);
-}
-
-void Renderer::include(const Renderable &renderable)
-{
-	excluded.erase(&renderable);
-}
-
-void Renderer::render(const Renderable &renderable, Tag tag)
-{
-	if(!excluded.count(&renderable))
-		renderable.render(*this, tag);
-}
-
 void Renderer::clear(const ClearValue *values)
 {
 	pipeline_state.set_framebuffer(state->framebuffer);
@@ -321,11 +291,13 @@ void Renderer::apply_state()
 		flush_textures();
 
 	for(const BoundTexture &t: texture_stack)
-	{
-		int unit = (t.tag.id ? state->shprog->get_uniform_binding(t.tag) : t.unit);
-		if(unit>=0)
-			pipeline_state.set_texture(unit, t.texture, t.sampler);
-	}
+		if(t.texture && t.replaced<0)
+		{
+			if(t.binding<0 || shprog_changed)
+				t.binding = state->shprog->get_uniform_binding(t.tag);
+			if(t.binding>=0)
+				pipeline_state.set_texture(t.binding, t.texture, t.sampler);
+		}
 
 	bool shdata_changed = changed&SHADER_DATA;
 	for(auto i=shdata_stack.begin(); (!shdata_changed && i!=shdata_stack.end()); ++i)