namespace Msp {
namespace GL {
-Program *Material::create_compatible_shader() const
+const Program *Material::create_compatible_shader(DataFile::Collection &coll, const map<string, int> &extra_spec) const
{
- return new Program(create_program_source());
-}
+ string module_name;
+ map<string, int> spec_values;
+ fill_program_info(module_name, spec_values);
-const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
-{
- string source = create_program_source();
- string name = format("_material_%016x.glsl", hash64(source));
+ for(map<string, int>::const_iterator i=extra_spec.begin(); i!=extra_spec.end(); ++i)
+ spec_values[i->first] = i->second;
+
+ string info = module_name;
+ for(map<string, int>::const_iterator i=spec_values.begin(); i!=spec_values.end(); ++i)
+ info += format(",%s:%d", i->first, i->second);
+
+ string name = format("_material_%016x.shader", hash64(info));
Program *shprog = coll.find<Program>(name);
if(shprog)
return shprog;
- shprog = new Program(create_program_source());
+ const Module &module = coll.get<Module>(module_name);
+ shprog = new Program(module, spec_values);
try
{
coll.add(name, shprog);
return shprog;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
{
if(!tex)
texturing.attach(unit, *tex, sampler);
tex_shdata.uniform(name, unit);
}
+#pragma GCC diagnostic pop
Material::MaterialRegistry &Material::get_material_registry()
{
add("sampler", &Loader::sampler);
}
-void Material::Loader::sampler(const std::string &name)
+void Material::Loader::sampler(const string &name)
{
obj.sampler = &get_collection().get<Sampler>(name);
}
DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
Material::GenericLoader::GenericLoader(DataFile::Collection *c):
- coll(c)
+ coll(c),
+ material(0),
+ mat_loader(0)
{
set_actions(shared_actions);
}
+Material::GenericLoader::~GenericLoader()
+{
+ delete material;
+ delete mat_loader;
+}
+
void Material::GenericLoader::init_actions()
{
- get_material_registry().add_all(*this);
+ add("type", &GenericLoader::type);
+}
+
+void Material::GenericLoader::type(const DataFile::Symbol &sym)
+{
+ get_material_registry().invoke(sym.name, *this);
}
} // namespace GL