X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.cpp;h=49b487982993d259f3807c8b3820f9991cf85998;hb=df6f8f1f26b1f230dcb1d626d278c43fd48d468d;hp=74505c8e0b15ce6d457cf08369592c2e8084bfa8;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/technique.cpp b/source/technique.cpp
index 74505c8e..49b48798 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2008-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -20,6 +20,14 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+RenderPass &Technique::add_pass(const GL::Tag &tag)
+{
+	if(passes.count(tag))
+		throw KeyError("Duplicate pass");
+
+	return passes[tag];
+}
+
 bool Technique::has_pass(const GL::Tag &tag) const
 {
 	return passes.count(tag);
@@ -80,17 +88,15 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 	add("texture", &InheritLoader::texture);
 }
 
-void Technique::InheritLoader::texture(const string &slot, const string &name)
+void Technique::InheritLoader::texture(const std::string &slot, const string &name)
 {
 	Texture *tex = get_collection().get<Texture>(name);
 	for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
 	{
-		try
-		{
-			i->second.set_texture(slot, tex);
-		}
-		catch(const KeyError &)
-		{ }
+		int index = i->second.get_texture_index(slot);
+		if(index<0)
+			continue;
+		i->second.set_texture(index, tex);
 	}
 }