X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=61b1bebdbac92611e9fcc853eea99a4a4e19a5a4;hb=287985a83e42e1e0af0c1522272d97d96fce00f9;hp=55eda001a79ec0b12dc3c1e52628327653733365;hpb=f098a871fc6dc7b61a5aca5581fa327e4124c036;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index 55eda001..61b1bebd 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -8,7 +8,9 @@ Distributed under the LGPL
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
-#include <GL/gl.h>
+#include <istream>
+#include <msp/datafile/loader.h>
+#include "gl.h"
 #include "types.h"
 
 namespace Msp {
@@ -24,22 +26,34 @@ enum TextureFilter
 	LINEAR_MIPMAP_LINEAR   = GL_LINEAR_MIPMAP_LINEAR
 };
 
-enum TextureFormat
-{
-	LUMINANCE8,
-	LUMINANCE8_ALPHA8,
-	RGB8,
-	RGBA8,
-	BGR8,
-	BGRA8
-};
+std::istream &operator>>(std::istream &, TextureFilter &);
 
+
+/**
+Base class for textures.  This class only defines operations common for all
+texture types and is not instantiable.  For specifying images for textures, see
+one of the dimensioned texture classes.
+*/
 class Texture
 {
+protected:
+	class Loader: public DataFile::Loader
+	{
+	protected:
+		Texture &tex;
+
+	public:
+		Loader(Texture &);
+		void min_filter(TextureFilter);
+		void mag_filter(TextureFilter);
+		void generate_mipmap(bool);
+	};
+
 public:
 	~Texture();
 
 	void bind() const;
+	void bind_to(unsigned) const;
 	void parameter(GLenum, int);
 	void parameter(GLenum, float);
 	void set_min_filter(TextureFilter f) { parameter(GL_TEXTURE_MIN_FILTER, f); }