X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=8757ea92e87e54a6a0e1b0dc33afe1c7f5b006e3;hb=b07e3b2103c53e3cd6a4674eef481178ec64f2c7;hp=8517805e23197aef724029280d0684cdadde2ec6;hpb=7f888de83aa5398fafaa7661547ee80395377b5c;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 8517805e..8757ea92 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2009-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#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"
@@ -42,6 +34,9 @@ Pipeline::~Pipeline()
 	delete fbo;
 	delete color_buf;
 	delete depth_buf;
+	delete fbo_ms;
+	delete color_buf_ms;
+	delete depth_buf_ms;
 }
 
 void Pipeline::set_hdr(bool h)
@@ -65,28 +60,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)
@@ -124,11 +110,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);
@@ -146,15 +127,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
@@ -169,16 +144,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)