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

diff --git a/source/technique.cpp b/source/technique.cpp
index 15406a93..2b02f35f 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -13,21 +13,32 @@ 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);
 }
 
+void Technique::replace_texture(const string &slot, const Texture &tex)
+{
+	for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
+	{
+		int index = i->second.get_texture_index(slot);
+		if(index<0)
+			continue;
+		i->second.set_texture(index, &tex);
+	}
+}
+
 bool Technique::has_shaders() const
 {
 	for(PassMap::const_iterator i=passes.begin(); i!=passes.end(); ++i)
@@ -97,14 +108,7 @@ 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);
-	}
+	obj.replace_texture(slot, get_collection().get<Texture>(name));
 }
 
 } // namespace GL