namespace Msp {
namespace GL {
-RenderPass &Technique::add_pass(const Tag &tag)
+RenderPass &Technique::add_pass(Tag tag)
{
return insert_unique(passes, tag, RenderPass())->second;
}
-bool Technique::has_pass(const Tag &tag) const
+bool Technique::has_pass(Tag tag) const
{
return passes.count(tag);
}
-const RenderPass &Technique::get_pass(const Tag &tag) const
+const RenderPass &Technique::get_pass(Tag tag) const
{
return get_item(passes, tag);
}
-const RenderPass *Technique::find_pass(const Tag &tag) const
+const RenderPass *Technique::find_pass(Tag tag) const
{
PassMap::const_iterator i = passes.find(tag);
return (i!=passes.end() ? &i->second : 0);
bool replaced = false;
for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
{
- int index = i->second.get_texture_index(slot);
- if(index>=0)
+ Tag tag = i->second.get_texture_tag(slot);
+ if(tag.id)
{
- i->second.set_texture(index, &tex);
+ i->second.set_texture(tag, &tex);
replaced = true;
}
}
bool Technique::replace_uniforms(const ProgramData &shdata)
{
bool replaced = false;
- const vector<string> &uniform_names = shdata.get_uniform_names();
+ const vector<Tag> &uniform_tags = shdata.get_uniform_tags();
for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
{
RefPtr<ProgramData> new_shdata;
- for(vector<string>::const_iterator j=uniform_names.begin(); j!=uniform_names.end(); ++j)
+ for(vector<Tag>::const_iterator j=uniform_tags.begin(); j!=uniform_tags.end(); ++j)
{
- const string &name = i->second.get_slotted_uniform_name(*j);
- if(name.empty())
+ Tag tag = i->second.get_slotted_uniform_tag(*j);
+ if(!tag.id)
continue;
if(!new_shdata)
new_shdata = new ProgramData(*i->second.get_shader_data());
- new_shdata->uniform(name, shdata.get_uniform(*j));
+ new_shdata->uniform(tag, shdata.get_uniform(*j));
replaced = true;
}
}
+DataFile::Loader::ActionMap Technique::Loader::shared_actions;
+
Technique::Loader::Loader(Technique &t):
DataFile::CollectionObjectLoader<Technique>(t, 0)
{
- init();
+ set_actions(shared_actions);
}
Technique::Loader::Loader(Technique &t, Collection &c):
DataFile::CollectionObjectLoader<Technique>(t, &c)
{
- init();
+ set_actions(shared_actions);
}
-void Technique::Loader::init()
+void Technique::Loader::init_actions()
{
add("inherit", &Loader::inherit);
add("pass", &Loader::pass);