X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=b9db62d84ef4526945beba95b377bf4ee5afe418;hb=7cbe8cc9893fe14f889321bd55e78b0ed6503e23;hp=de98b2d383283d4822d1ed7e9b684ac60ed98e4b;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index de98b2d3..b9db62d8 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -1,7 +1,6 @@
+#include <msp/core/maputils.h>
 #include "blend.h"
 #include "camera.h"
-#include "effect.h"
-#include "except.h"
 #include "framebuffer.h"
 #include "lighting.h"
 #include "pipeline.h"
@@ -58,28 +57,19 @@ void Pipeline::set_camera(const Camera *c)
 
 PipelinePass &Pipeline::add_pass(const Tag &tag)
 {
-	if(passes.count(tag))
-		throw KeyError("Pass already exists");
-
-	PipelinePass &pass = passes[tag];
+	PipelinePass &pass = insert_unique(passes, tag, PipelinePass())->second;
 	pass_order.push_back(tag);
 	return pass;
 }
 
 PipelinePass &Pipeline::get_pass(const Tag &tag)
 {
-	PassMap::iterator i = passes.find(tag);
-	if(i==passes.end())
-		throw KeyError("Unknown pass");
-	return i->second;
+	return get_item(passes, tag);
 }
 
 const PipelinePass &Pipeline::get_pass(const Tag &tag) const
 {
-	PassMap::const_iterator i = passes.find(tag);
-	if(i==passes.end())
-		throw KeyError("Unknown pass");
-	return i->second;
+	return get_item(passes, tag);
 }
 
 void Pipeline::add_renderable(const Renderable &r)
@@ -117,11 +107,6 @@ void Pipeline::remove_renderable(const Renderable &r)
 		}
 }
 
-void Pipeline::add_effect(Effect &e)
-{
-	effects.push_back(&e);
-}
-
 void Pipeline::add_postprocessor(PostProcessor &pp)
 {
 	postproc.push_back(&pp);
@@ -139,15 +124,9 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 	Bind bind_blend(pass.blend);
 	Bind bind_lighting(pass.lighting);
 
-	for(vector<Effect *>::const_iterator i=pass.effects.begin(); i!=pass.effects.end(); ++i)
-		(*i)->prepare();
-
 	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		if(i->passes.empty() || i->passes.count(tag))
 			i->renderable->render(renderer, tag);
-
-	for(vector<Effect *>::const_iterator i=pass.effects.end(); i!=pass.effects.begin();)
-		(*--i)->cleanup();
 }
 
 void Pipeline::render_all() const
@@ -162,16 +141,10 @@ void Pipeline::render_all() const
 		f->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 
-	for(vector<Effect *>::const_iterator i=effects.begin(); i!=effects.end(); ++i)
-		(*i)->prepare();
-
 	Renderer renderer(camera);
 	for(vector<Tag>::const_iterator i=pass_order.begin(); i!=pass_order.end(); ++i)
 		render(renderer, *i);
 
-	for(vector<Effect *>::const_iterator i=effects.end(); i!=effects.begin();)
-		(*--i)->cleanup();
-
 	if(fbo)
 	{
 		if(fbo_ms)