X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.h;h=f1aec26b283b2d6cb871f551e84456ffcc8e6b1e;hb=be92396630a2065e43c21d9d1904e97014844cff;hp=6f04a26088b1a4d0768185440d1c1ef98ad9b850;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/resources/resources.h b/source/resources/resources.h
index 6f04a260..f1aec26b 100644
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -9,8 +9,10 @@ namespace GL {
 
 class Material;
 class Mesh;
+class Module;
 class Program;
 class ResourceManager;
+class Scene;
 class Texture2D;
 
 /**
@@ -19,20 +21,43 @@ application-specific collection.
 */
 class Resources: virtual public DataFile::Collection
 {
+public:
+	class Loader: public DataFile::DerivedObjectLoader<Resources, Collection::Loader>
+	{
+	public:
+		Loader(Resources &);
+
+	private:
+		template<typename T, typename L = typename T::GenericLoader>
+		void generic(const std::string &);
+	};
+
 private:
-	TextureFilter default_tex_filter;
-	float default_tex_anisotropy;
+	template<typename T>
+	class GenericResourceLoader: public T::GenericLoader
+	{
+	private:
+		Resources &resources;
+
+	public:
+		GenericResourceLoader(Resources &r): T::GenericLoader(r), resources(r) { }
+
+	protected:
+		virtual void type(const DataFile::Symbol &);
+	};
+
 	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);
@@ -42,10 +67,16 @@ public:
 	void set_resource_manager(ResourceManager *);
 
 protected:
-	Material *create_material(const std::string &);
+	template<typename T, typename L = typename T::GenericLoader>
+	T *create_generic(const std::string &);
+
 	Mesh *create_mesh(const std::string &);
-	Texture2D *create_texture2d(const std::string &);
+	Texture *create_texture(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