Adjust creator and notify functions in Resources

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

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 8a7780cd4016521c2b0cb39428270ad0f50c1609..63a72404339435329206acc68f5b9df515fb7dc0 100644 (file)
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -43,39 +43,43 @@ Resources::Resources(bool set_as_global):
        add_type<Animation>().suffix(".anim").keyword("animation");
        add_type<Armature>().suffix(".arma").keyword("armature");
        add_type<Camera>().keyword("camera")
-               .notify(&Resources::set_debug_name<Camera>);
+               .notify(&set_debug_name<Camera>);
        add_type<Font>().keyword("font");
        add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
        add_type<Light>().keyword("light");
        add_type<Lighting>().suffix(".lightn").keyword("lighting")
-               .notify(&Resources::set_debug_name<Lighting>);
+               .notify(&set_debug_name<Lighting>);
        add_type<Material>().suffix(".mat")
-               .creator(&Resources::create_material).notify(&Resources::set_debug_name<Material>);
+               .creator([this](const string &n){ return create_generic<Material>(n); })
+               .notify(&set_debug_name<Material>);
        add_type<Mesh>().keyword("mesh")
-               .creator(&Resources::create_mesh).notify(&Resources::set_debug_name<Mesh>);
+               .creator([this](const string &n){ return create_mesh(n); })
+               .notify(&set_debug_name<Mesh>);
        add_type<Module>().suffix(".glsl").suffix(".spv")
-               .creator(&Resources::create_module);
+               .creator([this](const string &n){ return create_module(n); });
        add_type<Object>().keyword("object");
        add_type<SequenceTemplate>().suffix(".seq").keyword("sequence");
        add_type<Pose>().keyword("pose");
        add_type<Program>().keyword("shader")
-               .creator(&Resources::create_program).notify(&Resources::set_debug_name<Program>);
+               .creator([this](const string &n){ return create_program(n); })
+               .notify(&set_debug_name<Program>);
        add_type<Sampler>().suffix(".samp").keyword("sampler")
-               .notify(&Resources::set_debug_name<Sampler>);
+               .notify(&set_debug_name<Sampler>);
        add_type<Scene>().suffix(".scene")
-               .creator(&Resources::create_scene);
+               .creator([this](const string &n){ return create_generic<Scene>(n); });
        add_type<Technique>().suffix(".tech").keyword("technique")
-               .notify(&Resources::set_debug_name<Technique>);
+               .notify(&set_debug_name<Technique>);
        add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d")
-               .notify(&Resources::set_debug_name<Texture1D>);
+               .notify(&set_debug_name<Texture1D>);
        add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d")
-               .creator(&Resources::create_texture2d).notify(&Resources::set_debug_name<Texture2D>);
+               .creator([this](const string &n){ return create_texture2d(n); })
+               .notify(&set_debug_name<Texture2D>);
        add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d")
-               .notify(&Resources::set_debug_name<Texture3D>);
+               .notify(&set_debug_name<Texture3D>);
        add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube")
-               .notify(&Resources::set_debug_name<TextureCube>);
+               .notify(&set_debug_name<TextureCube>);
        add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array")
-               .notify(&Resources::set_debug_name<Texture2DArray>);
+               .notify(&set_debug_name<Texture2DArray>);
 
        add_source(get_builtins());
 
@@ -121,14 +125,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 +154,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);
@@ -244,7 +236,6 @@ Program *Resources::create_program(const string &name)
                Module &module = get<Module>(base);
                RefPtr<Program> shprog = new Program;
                shprog->add_stages(module);
-               shprog->link();
                return shprog.release();
        }
 
@@ -270,7 +261,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