X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.h;h=0633f3c74c802e51c2c4d163dd5d30d382a7e378;hb=e087bfd5a9a850db30c399e95ef3fd8ab48005d1;hp=3036c2f463ef44425d0a4f48939a84fb363aae37;hpb=dccad64b2ec82249d850b9745614042171499972;p=libs%2Fgl.git

diff --git a/source/resources/resources.h b/source/resources/resources.h
index 3036c2f4..0633f3c7 100644
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -12,6 +12,7 @@ class Mesh;
 class Module;
 class Program;
 class ResourceManager;
+class Scene;
 class Texture2D;
 
 /**
@@ -20,20 +21,29 @@ application-specific collection.
 */
 class Resources: virtual public DataFile::Collection
 {
+public:
+	class Loader: public DataFile::DerivedObjectLoader<Resources, Collection::Loader>
+	{
+	public:
+		Loader(Resources &);
+
+	private:
+		void scene(const std::string &);
+	};
+
 private:
-	TextureFilter default_tex_filter;
-	float default_tex_anisotropy;
 	bool srgb_conversion;
 	ResourceManager *resource_manager;
 
+	static Resources *global_resources;
+
 public:
-	Resources();
+	Resources(bool = true);
+	virtual ~Resources();
 
+	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);
@@ -43,11 +53,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 &);
 	Texture2D *create_texture2d(const std::string &);
 	Module *create_module(const std::string &);
 	Program *create_program(const std::string &);
+
+	template<typename T>
+	static void set_debug_name(const std::string &, T &);
 };
 
 } // namespace GL