X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=06b1403bd827e934400a550cd29f2bcef919e64b;hb=3ac3a51;hp=6898e6688f793438cd553ea73e60ea9688df4e93;hpb=dff7004fa078d55911664c0f513b5dc6c9449420;p=libs%2Fgl.git

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 6898e668..06b1403b 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -47,6 +47,9 @@ void Sequence::init(unsigned w, unsigned h)
 
 Sequence::~Sequence()
 {
+	for(vector<PostProcStep>::iterator i=postproc.begin(); i!=postproc.end(); ++i)
+		if(i->owned)
+			delete i->postproc;
 	delete target[0];
 	delete target[1];
 	delete target_ms;
@@ -114,25 +117,25 @@ Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
 
 void Sequence::add_postprocessor(PostProcessor &pp)
 {
-	add_postprocessor(&pp, true);
+	add_postprocessor(&pp, false);
 }
 
 void Sequence::add_postprocessor_owned(PostProcessor *pp)
 {
-	add_postprocessor(pp, false);
+	add_postprocessor(pp, true);
 }
 
-void Sequence::add_postprocessor(PostProcessor *pp, bool keep)
+void Sequence::add_postprocessor(PostProcessor *pp, bool owned)
 {
-	postproc.push_back(pp);
-	if(keep)
-		postproc.back().keep();
+	postproc.push_back(PostProcStep(pp, owned));
 	try
 	{
 		create_targets(0);
 	}
 	catch(...)
 	{
+		if(!owned)
+			delete pp;
 		postproc.pop_back();
 		throw;
 	}
@@ -140,20 +143,16 @@ void Sequence::add_postprocessor(PostProcessor *pp, bool keep)
 
 void Sequence::setup_frame(Renderer &renderer)
 {
-	for(StepList::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+	for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
 		if(Renderable *renderable = i->get_renderable())
 			renderable->setup_frame(renderer);
-	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		i->renderable->setup_frame(renderer);
 }
 
 void Sequence::finish_frame()
 {
-	for(StepList::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+	for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
 		if(Renderable *renderable = i->get_renderable())
 			renderable->finish_frame();
-	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
-		i->renderable->finish_frame();
 }
 
 void Sequence::render(Renderer &renderer, Tag tag) const
@@ -174,7 +173,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 		fbo.clear();
 	}
 
-	for(StepList::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+	for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
 	{
 		if(const DepthTest *dt = i->get_depth_test())
 			dt->bind();
@@ -191,10 +190,6 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
 		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());
 	}
 
 	if(target[0])
@@ -214,7 +209,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 				out_fbo->bind();
 			const Texture2D &color = target[j]->get_target_texture(RENDER_COLOR);
 			const Texture2D &depth = target[j]->get_target_texture(RENDER_DEPTH);
-			postproc[i]->render(renderer, color, depth);
+			postproc[i].postproc->render(renderer, color, depth);
 		}
 	}
 }
@@ -278,10 +273,5 @@ void Sequence::Step::set_clipping(const Clipping *c)
 	clipping =c;
 }
 
-
-Sequence::Slot::Slot(Renderable *r):
-	renderable(r)
-{ }
-
 } // namespace GL
 } // namespace Msp