X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.h;h=1f8b5f7ea557e94abcded7d8f7fd423b7fea7cdd;hp=7504f321d218543ea151700ed819cdd0eb9cb96d;hb=7af837734a28a14b3e24a421187d12ecd16572d0;hpb=cabb833e9b4ca10b9f350f3be6c351dce6a66822

diff --git a/source/texture2d.h b/source/texture2d.h
index 7504f321..1f8b5f7e 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,22 +24,20 @@ 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:
 	class AsyncLoader;
 
-	PixelFormat ifmt;
 	unsigned width;
 	unsigned height;
 	unsigned allocated;
 
 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 +58,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);
@@ -82,7 +74,8 @@ public:
 	unsigned get_height() const { return height; }
 
 private:
-	void get_level_size(unsigned, unsigned &, unsigned &);
+	unsigned get_n_levels() const;
+	void get_level_size(unsigned, unsigned &, unsigned &) const;
 
 public:
 	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);