X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=db6165fed82628206f29d69b39036d2160edefca;hb=17a9a0741c5c7c1ba497eea5212fdf6ff9a422bb;hp=6b8117fe4f7d11b1c385e174cb343da29f48d909;hpb=7857d9df8852071e404a63988f6ad3ddb8f70916;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index 6b8117fe..db6165fe 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -4,6 +4,7 @@
 #include <msp/datafile/objectloader.h>
 #include "gl.h"
 #include "predicate.h"
+#include "resource.h"
 
 namespace Msp {
 namespace GL {
@@ -63,14 +64,20 @@ texture to be usable.
 If texture coordinates fall outside of the principal range of the texture,
 wrapping is applied.  The default for all directions is REPEAT.
 */
-class Texture
+class Texture: public Resource
 {
 protected:
-	class Loader: public DataFile::ObjectLoader<Texture>
+	class Loader: public DataFile::CollectionObjectLoader<Texture>
 	{
+	protected:
+		bool srgb;
+
 	public:
 		Loader(Texture &);
+		Loader(Texture &, Collection &);
 	private:
+		void init();
+
 		void filter(TextureFilter);
 		void generate_mipmap(bool);
 		void mag_filter(TextureFilter);
@@ -108,7 +115,7 @@ protected:
 	Predicate cmp_func;
 	mutable int dirty_params;
 
-	Texture(GLenum);
+	Texture(GLenum, ResourceManager * = 0);
 	Texture(const Texture &);
 	Texture &operator=(const Texture &);
 public:
@@ -137,6 +144,10 @@ public:
 	when a texture image is uploaded. */
 	void set_generate_mipmap(bool);
 
+protected:
+	void auto_generate_mipmap();
+
+public:
 	/** Sets depth texture comparison.  Has no effect on other formats.  When
 	comparison is enabled, the third component of the texture coordinate is
 	compared against the texel value, and the result is returned as the texture
@@ -149,12 +160,14 @@ public:
 	GLenum get_target() const { return target; }
 	unsigned get_id() const { return id; }
 
-	void bind() const;
+	void bind() const { bind_to(0); }
 	void bind_to(unsigned) const;
 
-	static const Texture *current();
-	static void unbind();
+	static const Texture *current(unsigned = 0);
+	static void unbind() { unbind_from(0); }
 	static void unbind_from(unsigned);
+
+	virtual UInt64 get_data_size() const { return 0; }
 };
 
 } // namespace GL