Add keywords for light and material to Resources::Loader

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

diff --git a/source/resources/resources.h b/source/resources/resources.h
index 82d2f4c6798e4a9019380894b314aa56ad9aed57..f830faaa510ff722a7dfc485195b015217efef48 100644 (file)
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -28,12 +28,11 @@ public:
                Loader(Resources &);
 
        private:
-               void scene(const std::string &);
+               template<typename T>
+               void generic(const std::string &);
        };
 
 private:
-       TextureFilter default_tex_filter;
-       float default_tex_anisotropy;
        bool srgb_conversion;
        ResourceManager *resource_manager;
 
@@ -46,9 +45,6 @@ public:
        static Resources &get_global();
        static const DataFile::CollectionSource &get_builtins();
 
-       void set_default_texture_filter(TextureFilter);
-       void set_default_texture_anisotropy(float);
-
        /** Enables or disables sRGB conversion.  If enabled, textures and material
        colors are converted from sRGB to linear color space when loaded. */
        DEPRECATED void set_srgb_conversion(bool);
@@ -58,15 +54,16 @@ public:
        void set_resource_manager(ResourceManager *);
 
 protected:
-       Material *create_material(const std::string &);
+       template<typename T>
+       T *create_generic(const std::string &);
+
        Mesh *create_mesh(const std::string &);
-       Scene *create_scene(const std::string &);
        Texture2D *create_texture2d(const std::string &);
        Module *create_module(const std::string &);
        Program *create_program(const std::string &);
 
        template<typename T>
-       void set_debug_name(const std::string &, T &);
+       static void set_debug_name(const std::string &, T &);
 };
 
 } // namespace GL