X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=477eaca382fa55dbe6ab1925fb62677db1ed72c1;hb=912ae952489699769be43f90d4478263461964a4;hp=af0844c55e26938f00b2201e2f10abd576ece537;hpb=8d6ed0b5fb02e2a2f9142e869fd705c36f57a225;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index af0844c5..477eaca3 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -8,6 +8,8 @@
 namespace Msp {
 namespace GL {
 
+class Resources;
+
 enum TextureFilter
 {
 	/// No filtering
@@ -66,11 +68,18 @@ wrapping is applied.  The default for all directions is REPEAT.
 class Texture
 {
 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);
 		void max_anisotropy(float);
@@ -118,6 +127,11 @@ protected:
 public:
 	void set_min_filter(TextureFilter);
 	void set_mag_filter(TextureFilter);
+
+	/** Sets filter for both minification and magnification.  Since mipmapping
+	is not applicable to magnification, LINEAR is used instead. */
+	void set_filter(TextureFilter);
+
 	void set_max_anisotropy(float);
 
 	/** Sets the wrapping mode for all coordinates. */
@@ -143,11 +157,11 @@ 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);
 };