X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=62aeaab938b60830d30dad685443a1e6490b95bb;hb=656b4577fccfb02bea747871e5ab10148f002443;hp=517037a0029785198fd724c44e5c92943f11ee82;hpb=3663bed18358a2399b2a8a8f7779d85e0ed81bd0;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 517037a0..62aeaab9 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -72,7 +72,37 @@ 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)
@@ -89,8 +119,7 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
 		color_buf = new Texture2D;
 		color_buf->set_min_filter(NEAREST);
 		color_buf->set_mag_filter(NEAREST);
-		color_buf->storage((hdr ? RGB16F : RGB), width, height, 0);
-		color_buf->image(0, RGB, UNSIGNED_BYTE, 0);
+		color_buf->storage((hdr ? RGB16F : RGB), width, height);
 		fbo->attach(COLOR_ATTACHMENT0, *color_buf, 0);
 		depth_buf = new Renderbuffer;
 		depth_buf->storage(DEPTH_COMPONENT, width, height);
@@ -109,8 +138,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();
@@ -144,5 +174,10 @@ void Pipeline::render_all() const
 		(*i)->render(*color_buf);
 }
 
+
+Pipeline::Slot::Slot(const Renderable *r):
+	renderable(r)
+{ }
+
 } // namespace GL
 } // namespace Msp