Use an explicit material slot name in RenderPass

[libs/gl.git] / source / technique.cpp

diff --git a/source/technique.cpp b/source/technique.cpp
index 2b02f35f0cbc70d8cc8621f6a47c0a6f5caf2b9d..928c4ff6ea8cb4f00d5c6d73af7c1c263e339678 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -28,15 +28,36 @@ const RenderPass &Technique::get_pass(const Tag &tag) const
        return get_item(passes, tag);
 }
 
-void Technique::replace_texture(const string &slot, const Texture &tex)
+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)
-                       continue;
-               i->second.set_texture(index, &tex);
+               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
@@ -92,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)
@@ -108,7 +133,8 @@ void Technique::InheritLoader::material(const string &pass_tag, const string &na
 
 void Technique::InheritLoader::texture(const string &slot, const string &name)
 {
-       obj.replace_texture(slot, get_collection().get<Texture>(name));
+       if(!obj.replace_texture(slot, get_collection().get<Texture>(name)))
+               throw key_error(slot);
 }
 
 } // namespace GL