X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources%2Fresources.h;h=82d2f4c6798e4a9019380894b314aa56ad9aed57;hp=abda5cde7b29f8ee0756536e9acf918510a5333f;hb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;hpb=9d61da0868b3e61ab0cfb1bc98dcfd8374aa3356

diff --git a/source/resources/resources.h b/source/resources/resources.h
index abda5cde..82d2f4c6 100644
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -21,15 +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);
@@ -50,6 +64,9 @@ protected:
 	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 &);
 };
 
 } // namespace GL