X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.h;h=7553b6b703c944a2144e989bf605d41b9ae2295c;hp=6c089ed2fc675c27ed40edf9d07f85cffe1dd019;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=a86623004ba91baef76dac9275e9b79366acce16

diff --git a/source/texture2d.h b/source/texture2d.h
index 6c089ed2..7553b6b7 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,8 +3,6 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
@@ -12,8 +10,8 @@ namespace GL {
 
 /**
 Two-dimensional texture.  Consists of an array of texels in the shape of a
-rectangle.  Texture coordinate have a principal range of [0, 1].  This is the
-most common type of texture.
+rectangle.  Texture coordinate have a range of [0, 1].  Coordinates outside of
+this range are subject to wrapping.  This is the most common type of texture.
 */
 class Texture2D: public Texture
 {
@@ -22,56 +20,78 @@ public:
 	{
 	public:
 		Loader(Texture2D &);
+		Loader(Texture2D &, Collection &);
 	private:
-		void image_data(const std::string &);
+		void init();
+
 		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned);
-		void storage_b(PixelFormat, unsigned, unsigned, unsigned);
+		void storage_levels(PixelFormat, unsigned, unsigned, unsigned);
 	};
 
 private:
-	PixelFormat ifmt;
+	class AsyncLoader;
+
 	unsigned width;
 	unsigned height;
+	unsigned levels;
 	unsigned allocated;
 
 public:
-	Texture2D();
+	Texture2D(ResourceManager * = 0);
+	virtual ~Texture2D();
+
+	/** Defines storage structure for the texture.  If lv is zero, the number
+	of mipmap levels is automatically determined from storage dimensions.
 
-	/** Defines storage structure for the texture.  Must be called before an
-	image can be uploaded.  Once storage is defined, it can't be changed. */
-	void storage(PixelFormat fmt, unsigned wd, unsigned ht);
+	Must be called before an image can be uploaded.  Once storage is defined,
+	it can't be changed. */
+	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv = 0);
+
+	DEPRECATED void storage(PixelComponents cm, unsigned wd, unsigned ht, unsigned lv = 0)
+	{ storage(make_pixelformat(cm, UNSIGNED_BYTE), wd, ht, lv); }
 
 	/** Allocates storage for the texture.  The contents are initially
 	undefined.  If storage has already been allocated, does nothing. */
 	void allocate(unsigned level);
 
-	/** Uploads an image to the texture.  Storage must be defined beforehand.
-	The image data must have dimensions and format compatible with the defined
-	storage. */
-	void image(unsigned level, PixelFormat fmt, DataType type, const void *data);
+	/** Updates the contents of the entire texture.  Storage must be defined
+	beforehand.  The image data must have dimensions and format matching the
+	defined storage. */
+	virtual void image(unsigned level, const void *data);
+
+	DEPRECATED void image(unsigned level, PixelComponents fmt, DataType type, const void *data);
 
 	/** Updates a rectangular region of the texture.  Storage must be defined
-	and allocated beforehand.  The update region must be fully inside the
-	texture. */
-	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
-		PixelFormat fmt, DataType type, const void *data);
+	beforehand.  The image data must be in a format mathing the defined storage
+	and the update region must be fully inside the texture. */
+	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data);
+
+	DEPRECATED void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
+		PixelComponents fmt, DataType type, const void *data);
 
-	/** Loads an image from a file and uploads it to the texture.  If storage
-	has not been defined, it will be set to match the loaded image.  Otherwise
-	the image must be compatible with the defined storage. */
-	void load_image(const std::string &fn);
+	/** Updates the contents of the entire texture from an image.  If storage
+	has not been defined, it will be set to match the image.  Otherwise the
+	image must match the defined storage. */
+	virtual void image(const Graphics::Image &, unsigned lv = 0);
 
-	/** 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. */
-	void image(const Graphics::Image &);
+	using Texture::image;
 
+private:
+	void image(const Graphics::Image &, unsigned, bool);
+
+public:
 	unsigned get_width() const { return width; }
 	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);
+	virtual UInt64 get_data_size() const;
+	virtual void unload();
 };
 
 } // namespace GL