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

diff --git a/source/texture2d.h b/source/texture2d.h
index 251561b9..6c089ed2 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -1,14 +1,9 @@
-/* $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/graphics/image.h>
+#include "datatype.h"
 #include "pixelformat.h"
 #include "texture.h"
 
@@ -16,46 +11,67 @@ 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 principal range of [0, 1].  This is the
+most common type of texture.
 */
 class Texture2D: public Texture
 {
+public:
+	class Loader: public Msp::DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>
+	{
+	public:
+		Loader(Texture2D &);
+	private:
+		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:
 	PixelFormat ifmt;
-	sizei width;
-	sizei height;
-	int border;
+	unsigned width;
+	unsigned height;
+	unsigned allocated;
 
 public:
 	Texture2D();
 
-	/**
-	Defines the texture storage.  This function may only be successfully called
-	once.
-	*/
-	void storage(PixelFormat fmt, sizei wd, sizei ht, int brd);
-	
-	/**
-	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.
-	*/
-	void image(int level, PixelFormat fmt, GLenum type, const void *data);
+	/** 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);
 
-	/**
-	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(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum type, const void *data);
+	/** Allocates storage for the texture.  The contents are initially
+	undefined.  If storage has already been allocated, does nothing. */
+	void allocate(unsigned level);
 
-	/**
-	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.
-	*/
+	/** 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 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);
+
+	/** 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);
 
-	sizei get_width() const  { return width; }
-	sizei get_height() const { return height; }
+	/** 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 &);
+
+	unsigned get_width() const { return width; }
+	unsigned get_height() const { return height; }
+
+private:
+	void get_level_size(unsigned, unsigned &, unsigned &);
 };
 
 } // namespace GL