X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=221fbd7b76a28aee38d95382a2b797e34fd5d24c;hb=0221e39a685c4f3122a0fae032a7888b5ce40579;hp=eba3286fee15fddce63b67e503f551990b0bf65d;hpb=4d7f66ea28c788e12f700216b9c53af9e71b8390;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index eba3286f..221fbd7b 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,9 +3,6 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
-#include "resource.h"
 #include "texture.h"
 
 namespace Msp {
@@ -27,10 +24,8 @@ public:
 	private:
 		void init();
 
-		void image_data(const std::string &);
 		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned);
-		void storage_b(PixelFormat, unsigned, unsigned, unsigned);
 	};
 
 private:
@@ -43,6 +38,7 @@ private:
 
 public:
 	Texture2D(ResourceManager * = 0);
+	virtual ~Texture2D();
 
 	/** Defines storage structure for the texture.  Must be called before an
 	image can be uploaded.  Once storage is defined, it can't be changed. */
@@ -63,16 +59,13 @@ public:
 	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
 		PixelFormat fmt, DataType type, const void *data);
 
-	/// Loads a Graphics::Image from a file and uploads it to the texture.
-	void load_image(const std::string &fn, bool srgb = false);
-
 	/** Uploads an image to the texture.  If storage has not been defined, it
 	will be set to match the image.  Otherwise the image must be compatible with
 	the defined storage.
 
 	If srgb is true and storage is determined by this call, then an sRGB pixel
 	format will be used. */
-	void image(const Graphics::Image &, bool srgb = false);
+	virtual void image(const Graphics::Image &, bool srgb = false);
 
 private:
 	void image(const Graphics::Image &, bool, bool);
@@ -85,7 +78,7 @@ private:
 	void get_level_size(unsigned, unsigned &, unsigned &);
 
 public:
-	virtual Resource::AsyncLoader *load(IO::Seekable &);
+	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
 	virtual UInt64 get_data_size() const;
 	virtual void unload();
 };