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);
}
void Material::GenericLoader::init_actions()
{
- get_material_registry().add_all(*this);
+ get_material_registry().invoke_all(*this);
}
} // namespace GL