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

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 8517805e..eca9a49a 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -1,14 +1,7 @@
-/* $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"
@@ -65,28 +58,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)