Unify the loader wrappers for Material and Scene

[libs/gl.git] / source / resources / resources.cpp

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 62bdabf60594e796439833b110e512bcd3544b24..80a19e7c9bdd6aa3ed30f037930613defc39182b 100644 (file)
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -50,7 +50,7 @@ Resources::Resources(bool set_as_global):
        add_type<Lighting>().suffix(".lightn").keyword("lighting")
                .notify(&Resources::set_debug_name<Lighting>);
        add_type<Material>().suffix(".mat")
-               .creator(&Resources::create_material).notify(&Resources::set_debug_name<Material>);
+               .creator(&Resources::create_generic<Material>).notify(&Resources::set_debug_name<Material>);
        add_type<Mesh>().keyword("mesh")
                .creator(&Resources::create_mesh).notify(&Resources::set_debug_name<Mesh>);
        add_type<Module>().suffix(".glsl").suffix(".spv")
@@ -63,7 +63,7 @@ Resources::Resources(bool set_as_global):
        add_type<Sampler>().suffix(".samp").keyword("sampler")
                .notify(&Resources::set_debug_name<Sampler>);
        add_type<Scene>().suffix(".scene")
-               .creator(&Resources::create_scene);
+               .creator(&Resources::create_generic<Scene>);
        add_type<Technique>().suffix(".tech").keyword("technique")
                .notify(&Resources::set_debug_name<Technique>);
        add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d")
@@ -121,14 +121,15 @@ void Resources::set_resource_manager(ResourceManager *m)
        resource_manager = m;
 }
 
-Material *Resources::create_material(const string &name)
+template<typename T>
+T *Resources::create_generic(const string &name)
 {
        if(RefPtr<IO::Seekable> io = open_raw(name))
        {
                DataFile::Parser parser(*io, name);
-               Material::GenericLoader ldr(this);
+               typename T::GenericLoader ldr(*this);
                ldr.load(parser);
-               return ldr.get_material();
+               return ldr.get_object();
        }
 
        return 0;
@@ -149,19 +150,6 @@ Mesh *Resources::create_mesh(const string &name)
        return 0;
 }
 
-Scene *Resources::create_scene(const string &name)
-{
-       if(RefPtr<IO::Seekable> io = open_raw(name))
-       {
-               DataFile::Parser parser(*io, name);
-               Scene::GenericLoader ldr(*this);
-               ldr.load(parser);
-               return ldr.get_scene();
-       }
-
-       return 0;
-}
-
 Texture2D *Resources::create_texture2d(const string &name)
 {
        string ext = FS::extpart(name);
@@ -269,7 +257,7 @@ void Resources::Loader::scene(const string &name)
 {
        Scene::GenericLoader ldr(obj);
        load_sub_with(ldr);
-       obj.add(name, ldr.get_scene());
+       obj.add(name, ldr.get_object());
 }
 
 } // namespace GL