X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fpipeline.cpp;h=dc1eba1d117cdcca5d6b190c53b3545ed31fd86c;hp=bcbbb05fe3b63aa0064c6e71db0fa5142f28d867;hb=3b159edbe4e80a2bc19c4c2fcd42cb996b9fbfe0;hpb=17af32b5943c845c97baee0733ca86c5a5b722ed

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index bcbbb05f..dc1eba1d 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -78,7 +78,7 @@ void Pipeline::set_camera(const Camera *c)
 
 Pipeline::Pass &Pipeline::add_pass(const Tag &tag)
 {
-	passes.push_back(Pass(tag));
+	passes.push_back(Pass(tag, 0));
 	return passes.back();
 }
 
@@ -117,6 +117,12 @@ void Pipeline::remove_renderable(const Renderable &r)
 		}
 }
 
+Pipeline::Pass &Pipeline::add_pass(const Tag &tag, const Renderable &r)
+{
+	passes.push_back(Pass(tag, &r));
+	return passes.back();
+}
+
 void Pipeline::add_postprocessor(PostProcessor &pp)
 {
 	postproc.push_back(&pp);
@@ -134,6 +140,9 @@ void Pipeline::add_postprocessor(PostProcessor &pp)
 void Pipeline::setup_frame() const
 {
 	in_frame = true;
+	for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
+		if(const Renderable *renderable = i->get_renderable())
+			renderable->setup_frame();
 	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		i->renderable->setup_frame();
 }
@@ -141,6 +150,9 @@ void Pipeline::setup_frame() const
 void Pipeline::finish_frame() const
 {
 	in_frame = false;
+	for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
+		if(const Renderable *renderable = i->get_renderable())
+			renderable->finish_frame();
 	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		i->renderable->finish_frame();
 }
@@ -164,7 +176,10 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 		setup_frame();
 
 	const Framebuffer *out_fbo = Framebuffer::current();
-	// XXX Make sure the correct FBO is restored if an exception is thrown
+	// These is a no-ops but will ensure the related state gets restored
+	BindRestore restore_fbo(out_fbo);
+	BindRestore restore_depth_test(DepthTest::current());
+	BindRestore restore_blend(Blend::current());
 
 	if(target[0])
 	{
@@ -173,21 +188,35 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 		fbo.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 
+
 	for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i)
 	{
-		Bind bind_depth_test(i->get_depth_test());
-		Bind bind_blend(i->get_blend());
+		if(const DepthTest *dt = i->get_depth_test())
+			dt->bind();
+		else
+			DepthTest::unbind();
+
+		if(const Blend *b = i->get_blend())
+			b->bind();
+		else
+			Blend::unbind();
+
 		renderer.set_lighting(i->get_lighting());
+		renderer.set_clipping(i->get_clipping());
+
+		if(const Renderable *renderable = i->get_renderable())
+			renderer.render(*renderable, i->get_tag());
 
 		for(vector<Slot>::const_iterator j=renderables.begin(); j!=renderables.end(); ++j)
 			if(j->passes.empty() || j->passes.count(i->get_tag()))
 				renderer.render(*j->renderable, i->get_tag());
 	}
 
-	renderer.end();
-
 	if(target[0])
 	{
+		BindRestore unbind_depth_test(static_cast<DepthTest *>(0));
+		BindRestore unbind_blend(static_cast<Blend *>(0));
+
 		if(samples)
 			target[0]->fbo.blit_from(target_ms->fbo, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false);
 
@@ -198,10 +227,8 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 				target[1-j]->fbo.bind();
 			else
 				out_fbo->bind();
-			postproc[i]->render(target[j]->color, target[j]->depth);
+			postproc[i]->render(renderer, target[j]->color, target[j]->depth);
 		}
-
-		out_fbo->bind();
 	}
 
 	if(!was_in_frame)
@@ -237,11 +264,13 @@ void Pipeline::create_targets(unsigned recreate)
 }
 
 
-Pipeline::Pass::Pass(const Tag &t):
+Pipeline::Pass::Pass(const Tag &t, const Renderable *r):
 	tag(t),
 	lighting(0),
 	depth_test(0),
-	blend(0)
+	blend(0),
+	clipping(0),
+	renderable(r)
 { }
 
 void Pipeline::Pass::set_lighting(const Lighting *l)
@@ -259,6 +288,11 @@ void Pipeline::Pass::set_blend(const Blend *b)
 	blend = b;
 }
 
+void Pipeline::Pass::set_clipping(const Clipping *c)
+{
+	clipping =c;
+}
+
 
 Pipeline::Slot::Slot(const Renderable *r):
 	renderable(r)