Use DynamicObjectLoader for Material and Scene generic loaders

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

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 2d7e448788e0d81612bb191c7b4733b793e2c6c1..6d9c0571f429f37e8c2ce265ca8c88e92bfaf70c 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -1,10 +1,9 @@
 #include <msp/core/hash.h>
 #include <msp/strings/format.h>
 #include "basicmaterial.h"
-#include "gl.h"
 #include "pbrmaterial.h"
+#include "program.h"
 #include "resources.h"
-#include "uniform.h"
 #include "unlitmaterial.h"
 
 using namespace std;
@@ -18,12 +17,12 @@ const Program *Material::create_compatible_shader(const map<string, int> &extra_
        map<string, int> spec_values;
        fill_program_info(module_name, spec_values);
 
-       for(map<string, int>::const_iterator i=extra_spec.begin(); i!=extra_spec.end(); ++i)
-               spec_values[i->first] = i->second;
+       for(const auto &kvp: extra_spec)
+               spec_values[kvp.first] = kvp.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);
+       for(const auto &kvp: spec_values)
+               info += format(",%s:%d", kvp.first, kvp.second);
 
        Resources &res = Resources::get_global();
        string name = format("_material_%016x.shader", hash64(info));
@@ -55,9 +54,9 @@ void Material::set_debug_name(const string &name)
 #endif
 }
 
-Material::MaterialRegistry &Material::get_material_registry()
+Material::GenericLoader::TypeRegistry &Material::get_material_registry()
 {
-       static MaterialRegistry registry;
+       static GenericLoader::TypeRegistry registry;
        static bool initialized = false;
        if(!initialized)
        {
@@ -70,10 +69,6 @@ Material::MaterialRegistry &Material::get_material_registry()
 }
 
 
-Material::Loader::Loader(Material &m):
-       CollectionObjectLoader(m, 0)
-{ }
-
 Material::Loader::Loader(Material &m, Collection &c):
        CollectionObjectLoader(m, &c)
 { }
@@ -88,32 +83,5 @@ 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),
-       material(0),
-       mat_loader(0)
-{
-       set_actions(shared_actions);
-}
-
-Material::GenericLoader::~GenericLoader()
-{
-       delete material;
-       delete mat_loader;
-}
-
-void Material::GenericLoader::init_actions()
-{
-       add("type", &GenericLoader::type);
-}
-
-void Material::GenericLoader::type(const DataFile::Symbol &sym)
-{
-       get_material_registry().invoke(sym.name, *this);
-}
-
 } // namespace GL
 } // namespace Msp