X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftechnique.cpp;h=928c4ff6ea8cb4f00d5c6d73af7c1c263e339678;hp=15406a931e10e8a6249434d91a9d7002180efeea;hb=cfd4d36c2b6b6095ada3aef8082e5d409a233a21;hpb=ec7e6f12a85a7dd65e57bf88b80c2d94601dd56f

diff --git a/source/technique.cpp b/source/technique.cpp
index 15406a93..928c4ff6 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -13,21 +13,53 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-RenderPass &Technique::add_pass(const GL::Tag &tag)
+RenderPass &Technique::add_pass(const Tag &tag)
 {
 	return insert_unique(passes, tag, RenderPass())->second;
 }
 
-bool Technique::has_pass(const GL::Tag &tag) const
+bool Technique::has_pass(const Tag &tag) const
 {
 	return passes.count(tag);
 }
 
-const RenderPass &Technique::get_pass(const GL::Tag &tag) const
+const RenderPass &Technique::get_pass(const Tag &tag) const
 {
 	return get_item(passes, tag);
 }
 
+bool Technique::replace_texture(const string &slot, const Texture &tex)
+{
+	bool replaced = false;
+	for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
+	{
+		int index = i->second.get_texture_index(slot);
+		if(index>=0)
+		{
+			i->second.set_texture(index, &tex);
+			replaced = true;
+		}
+	}
+
+	return replaced;
+}
+
+bool Technique::replace_material(const string &slot, const Material &mat)
+{
+	bool replaced = false;
+	for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
+	{
+		const string &pass_slot = i->second.get_material_slot_name();
+		if(!pass_slot.empty() && pass_slot==slot)
+		{
+			i->second.set_material(&mat);
+			replaced = true;
+		}
+	}
+
+	return replaced;
+}
+
 bool Technique::has_shaders() const
 {
 	for(PassMap::const_iterator i=passes.begin(); i!=passes.end(); ++i)
@@ -81,10 +113,14 @@ Technique::InheritLoader::InheritLoader(Technique &t, Collection &c):
 	add("texture", &InheritLoader::texture);
 }
 
-void Technique::InheritLoader::material(const string &pass_tag, const string &name)
+void Technique::InheritLoader::material(const string &slot, const string &name)
 {
-	RenderPass &pass = get_item(obj.passes, pass_tag);
 	const Material &mat = get_collection().get<Material>(name);
+	if(obj.replace_material(slot, mat))
+		return;
+
+	// For backwards compatibility
+	RenderPass &pass = get_item(obj.passes, slot);
 	if(const Material *base_mat = pass.get_material())
 	{
 		for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
@@ -97,14 +133,8 @@ void Technique::InheritLoader::material(const string &pass_tag, const string &na
 
 void Technique::InheritLoader::texture(const string &slot, const string &name)
 {
-	Texture &tex = get_collection().get<Texture>(name);
-	for(PassMap::iterator i=obj.passes.begin(); i!=obj.passes.end(); ++i)
-	{
-		int index = i->second.get_texture_index(slot);
-		if(index<0)
-			continue;
-		i->second.set_texture(index, &tex);
-	}
+	if(!obj.replace_texture(slot, get_collection().get<Texture>(name)))
+		throw key_error(slot);
 }
 
 } // namespace GL