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

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 54ef25a1..63bdc4e8 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)
@@ -86,16 +116,18 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
 	if(!fbo)
 	{
 		fbo = new Framebuffer;
+
 		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 = new Texture2D;
+		depth_buf->set_min_filter(NEAREST);
+		depth_buf->set_mag_filter(NEAREST);
 		depth_buf->storage(DEPTH_COMPONENT, width, height);
-		fbo->attach(DEPTH_ATTACHMENT, *depth_buf);
-		Framebuffer::unbind();
+		fbo->attach(DEPTH_ATTACHMENT, *depth_buf, 0);
 	}
 }
 
@@ -110,8 +142,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 +158,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)
@@ -142,8 +175,13 @@ void Pipeline::render_all() const
 
 	// XXX Need two color buffer textures to handle multiple post-processors correctly
 	for(vector<PostProcessor *>::const_iterator i=postproc.begin(); i!=postproc.end(); ++i)
-		(*i)->render(*color_buf);
+		(*i)->render(*color_buf, *depth_buf);
 }
 
+
+Pipeline::Slot::Slot(const Renderable *r):
+	renderable(r)
+{ }
+
 } // namespace GL
 } // namespace Msp