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 d87f2f830afd7583df377b641a0a70873829e5e6..36d0958f5afb18aaa5270750f7c8e031193583a4 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -103,14 +103,27 @@ void Material::Loader::sampler(const 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().invoke_all(*this);
+       add("type", &GenericLoader::type);
+}
+
+void Material::GenericLoader::type(const DataFile::Symbol &sym)
+{
+       get_material_registry().invoke(sym.name, *this);
 }
 
 } // namespace GL