X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.h;h=b62466cb0a75bc524cf11a484567bfe17eb02625;hp=251561b99490c5ca93166bd9679e121a3fbc92d2;hb=a80b074c70ec991f27114efd13686038cf42c493;hpb=530ace590ddb8024fbffc944d006aae7876a25f9

diff --git a/source/texture2d.h b/source/texture2d.h
index 251561b9..b62466cb 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -9,17 +9,29 @@ Distributed under the LGPL
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
+#include <msp/datafile/loader.h>
 #include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
 namespace GL {
 
+class Image;
+
 /**
 Two-dimensional texture class.  This is the most common type of texture.
 */
 class Texture2D: public Texture
 {
+public:
+	class Loader: public Texture::Loader
+	{
+	public:
+		Loader(Texture2D &);
+	private:
+		void image_data(const std::string &);
+	};
+
 private:
 	PixelFormat ifmt;
 	sizei width;
@@ -56,6 +68,9 @@ public:
 
 	sizei get_width() const  { return width; }
 	sizei get_height() const { return height; }
+
+private:
+	void image(const Image &);
 };
 
 } // namespace GL