Technique::~Technique()
{
- for(map<unsigned, ObjectPass>::iterator i=passes.begin(); i!=passes.end(); ++i)
+ for(PassMap::iterator i=passes.begin(); i!=passes.end(); ++i)
delete i->second.shdata;
}
bool Technique::has_pass(const GL::Tag &tag) const
{
- return passes.count(tag.id);
+ return passes.count(tag);
}
const ObjectPass &Technique::get_pass(const GL::Tag &tag) const
{
- map<unsigned, ObjectPass>::const_iterator i=passes.find(tag.id);
+ PassMap::const_iterator i=passes.find(tag);
if(i==passes.end())
throw KeyError("Unknown pass");
return i->second;
unsigned Technique::get_texture_index(const std::string &n) const
{
- for(unsigned i=0; i<tex_names.size(); ++i)
- if(tex_names[i]==n)
+ for(unsigned i=0; i<textures.size(); ++i)
+ if(textures[i].name==n)
return i;
throw KeyError("Unknown texture slot", n);
if(i>=textures.size())
throw KeyError("Texture index out of range");
- return textures[i];
+ return textures[i].texture;
}
void Technique::Loader::finish()
{
- for(map<unsigned, ObjectPass>::iterator i=tech.passes.begin(); i!=tech.passes.end(); ++i)
+ for(PassMap::iterator i=tech.passes.begin(); i!=tech.passes.end(); ++i)
if(i->second.shdata)
{
for(unsigned j=0; j<tech.textures.size(); ++j)
- i->second.shdata->uniform(i->second.shprog->get_uniform_location(tech.tex_names[j]), static_cast<int>(j));
+ {
+ unsigned loc=i->second.shprog->get_uniform_location(tech.textures[j].name);
+ i->second.shdata->uniform(loc, static_cast<int>(j));
+ }
}
}
void Technique::Loader::pass(const string &n)
{
- unsigned id=Tag(n).id;
- if(tech.passes.count(id))
+ Tag tag(n);
+ if(tech.passes.count(tag))
throw KeyError("Duplicate pass name", n);
ObjectPass p;
load_sub(p, coll);
- tech.passes[id]=p;
+ tech.passes[tag]=p;
}
void Technique::Loader::shader(const string &n)
void Technique::Loader::shader_texture(const string &n)
{
string::size_type eqsign=n.find('=');
+ TextureSlot tex;
if(eqsign!=string::npos)
{
- tech.textures.push_back(coll.get<Texture>(n.substr(eqsign+1)));
- tech.tex_names.push_back(n.substr(0, eqsign));
+ tex.name=n.substr(0, eqsign);
+ tex.texture=coll.get<Texture>(n.substr(eqsign+1));
}
else
{
- tech.textures.push_back(coll.get<Texture>(n));
- tech.tex_names.push_back(n);
+ string::size_type dot=n.rfind('.');
+ tex.name=n.substr(0, dot);
+ tex.texture = coll.get<Texture>(n);
}
+ for(string::iterator i=tex.name.begin(); i!=tex.name.end(); ++i)
+ if(!isalnum(*i))
+ *i='_';
+ tech.textures.push_back(tex);
}
void Technique::Loader::texture(const string &n)
throw Exception("Only one main texture may be specified");
tech.main_texture=coll.get<Texture>(n);
- tech.textures.push_back(tech.main_texture);
- tech.tex_names.push_back("texture");
+ TextureSlot tex;
+ tex.name="texture";
+ tex.texture=tech.main_texture;
+ tech.textures.push_back(tex);
}
void Technique::Loader::texture_slot(const string &n)
{
- tech.tex_names.push_back(n);
- tech.textures.push_back(0);
+ TextureSlot tex;
+ tex.name=n;
+ tech.textures.push_back(tex);
}
} // namespace GL