Rearrange type specification in material datafiles

[libs/gl.git] / source / materials / material.cpp

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 25ed72189b1bac8c43ef1e028d5f940a1b086214..36d0958f5afb18aaa5270750f7c8e031193583a4 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -43,6 +43,8 @@ const Program *Material::create_compatible_shader(DataFile::Collection &coll) co
        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)
@@ -62,6 +64,7 @@ void Material::attach_texture_to(const Texture *tex, Texturing &texturing, Progr
        texturing.attach(unit, *tex, sampler);
        tex_shdata.uniform(name, unit);
 }
+#pragma GCC diagnostic pop
 
 Material::MaterialRegistry &Material::get_material_registry()
 {
@@ -91,7 +94,7 @@ void Material::Loader::init_actions()
        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);
 }
@@ -100,14 +103,27 @@ void Material::Loader::sampler(const std::string &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