X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftechnique.cpp;h=49b487982993d259f3807c8b3820f9991cf85998;hb=09b835f0ff0ee594fbb555224a85b28398e14116;hp=78060e01f9b89e80e28f7171fc40cea23188d327;hpb=97015ec7bddd26aa746f5227e4109b7d32438cca;p=libs%2Fgl.git

diff --git a/source/technique.cpp b/source/technique.cpp
index 78060e01..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);
@@ -27,15 +35,26 @@ bool Technique::has_pass(const GL::Tag &tag) const
 
 const RenderPass &Technique::get_pass(const GL::Tag &tag) const
 {
-	PassMap::const_iterator i=passes.find(tag);
+	PassMap::const_iterator i = passes.find(tag);
 	if(i==passes.end())
 		throw KeyError("Unknown pass");
 	return i->second;
 }
 
 
+Technique::Loader::Loader(Technique &t):
+	DataFile::CollectionObjectLoader<Technique>(t, 0)
+{
+	init();
+}
+
 Technique::Loader::Loader(Technique &t, Collection &c):
 	DataFile::CollectionObjectLoader<Technique>(t, &c)
+{
+	init();
+}
+
+void Technique::Loader::init()
 {
 	add("inherit", &Loader::inherit);
 	add("pass", &Loader::pass);
@@ -43,7 +62,7 @@ Technique::Loader::Loader(Technique &t, Collection &c):
 
 void Technique::Loader::inherit(const string &n)
 {
-	obj.passes=get_collection().get<Technique>(n)->get_passes();
+	obj.passes = get_collection().get<Technique>(n)->get_passes();
 	InheritLoader ldr(obj, get_collection());
 	load_sub_with(ldr);
 }
@@ -55,7 +74,10 @@ void Technique::Loader::pass(const string &n)
 		throw KeyError("Duplicate pass name", n);
 
 	RenderPass p;
-	load_sub(p, *coll);
+	if(coll)
+		load_sub(p, get_collection());
+	else
+		load_sub(p);
 	obj.passes.insert(PassMap::value_type(tag, p));
 }
 
@@ -66,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);
+	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);
 	}
 }