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

diff --git a/source/texture2d.h b/source/texture2d.h
index 8508b043..7553b6b7 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -1,82 +1,97 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_TEXTURE2D_H_
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/gbase/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
+#include <msp/graphics/image.h>
 #include "texture.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-Two-dimensional texture class.  This is the most common type of texture.
+Two-dimensional texture.  Consists of an array of texels in the shape of a
+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
 {
 public:
-	class Loader: public Texture::Loader
+	class Loader: public Msp::DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>
 	{
 	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 the texture storage.  This function may only be successfully called
-	once.
-	*/
-	void storage(PixelFormat fmt, unsigned wd, unsigned ht);
+	/** Defines storage structure for the texture.  If lv is zero, the number
+	of mipmap levels is automatically determined from storage dimensions.
 
-	/** Allocates texture storage.  If storage has already been allocated, this
-	function does nothing. */
+	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 have been called prior to
-	this, and the image must have dimensions conforming to the specified
-	storage.  For level>0, mipmapping rules apply to the image dimensions. */
-	void image(unsigned level, PixelFormat fmt, DataType type, const void *data);
-
-	/**
-	Uploads a sub-image into the texture.  Unlike full image upload, there are
-	no constraints on the size of the sub-image.
-	*/
-	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data);
-
-	/**
-	Loads an image from a file and uploads it to the texture.  If storage() has
-	not been called, the storage format will be set to match the loaded image.
-	*/
-	void load_image(const std::string &fn);
-
-	unsigned get_width() const  { return width; }
+
+	/** 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
+	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);
+
+	/** 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);
+
+	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 image(const Graphics::Image &);
-	void require_storage();
-	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