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)
+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
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)
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