X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=f05d15b8271fe0ce9f216b62258f50d10758f231;hb=4d3bee9264c4e60fb811019fc1699e17a338d13d;hp=54ef25a10bca8e59a123eb96322123e393595640;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 54ef25a1..f05d15b8 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -72,9 +72,39 @@ const PipelinePass &Pipeline::get_pass(const Tag &tag) const
 
 void Pipeline::add_renderable(const Renderable &r)
 {
+	for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		if(i->renderable==&r)
+		{
+			i->passes.clear();
+			return;
+		}
+
 	renderables.push_back(&r);
 }
 
+void Pipeline::add_renderable_for_pass(const Renderable &r, const Tag &tag)
+{
+	for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		if(i->renderable==&r)
+		{
+			i->passes.insert(tag);
+			return;
+		}
+
+	renderables.push_back(&r);
+	renderables.back().passes.insert(tag);
+}
+
+void Pipeline::remove_renderable(const Renderable &r)
+{
+	for(vector<Slot>::iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		if(i->renderable==&r)
+		{
+			renderables.erase(i);
+			return;
+		}
+}
+
 void Pipeline::add_effect(Effect &e)
 {
 	effects.push_back(&e);
@@ -95,7 +125,6 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
 		depth_buf = new Renderbuffer;
 		depth_buf->storage(DEPTH_COMPONENT, width, height);
 		fbo->attach(DEPTH_ATTACHMENT, *depth_buf);
-		Framebuffer::unbind();
 	}
 }
 
@@ -110,8 +139,9 @@ void Pipeline::render(const Tag &tag) const
 	for(vector<Effect *>::const_iterator i=pass.effects.begin(); i!=pass.effects.end(); ++i)
 		(*i)->prepare();
 
-	for(vector<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		(*i)->render(tag);
+	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
+		if(i->passes.empty() || i->passes.count(tag))
+			i->renderable->render(tag);
 
 	for(vector<Effect *>::const_iterator i=pass.effects.end(); i!=pass.effects.begin();)
 		(*--i)->cleanup();
@@ -125,7 +155,7 @@ void Pipeline::render_all() const
 	if(fbo)
 	{
 		fbo->bind();
-		clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
+		fbo->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 
 	for(vector<Effect *>::const_iterator i=effects.begin(); i!=effects.end(); ++i)
@@ -145,5 +175,10 @@ void Pipeline::render_all() const
 		(*i)->render(*color_buf);
 }
 
+
+Pipeline::Slot::Slot(const Renderable *r):
+	renderable(r)
+{ }
+
 } // namespace GL
 } // namespace Msp