X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.h;h=1f50e056d8cb286d8e99b4c739f83e5f09c777bd;hp=7847c2fc7b7889027fad0553aee364967e4517bf;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=aead6d04308d7873dc99aa4572ce1590a89ebcbd

diff --git a/source/texture3d.h b/source/texture3d.h
index 7847c2fc..1f50e056 100644
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -24,6 +24,7 @@ public:
 
 		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned, unsigned);
+		void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
 	};
 
 private:
@@ -45,44 +46,35 @@ public:
 	it can't be changed. */
 	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv = 0);
 
+	DEPRECATED void storage(PixelComponents c, unsigned w, unsigned h, unsigned d, unsigned l = 0)
+	{ storage(make_pixelformat(c, UNSIGNED_BYTE), w, h, d, l); }
+
 	/** 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. */
+	void image(unsigned level, const void *data);
+
+	DEPRECATED void image(unsigned level, PixelComponents comp, DataType type, const void *data);
 
 	/** Updates a cuboid-shaped 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,
+	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, int z, unsigned wd, unsigned ht, unsigned dp, const void *data);
+
+	DEPRECATED void sub_image(unsigned level,
 		int x, int y, int z, unsigned wd, unsigned ht, unsigned dp,
-		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.  To
-	construct a three-dimensional texture from a two-dimensional image, the
-	image is interpreted as an array of consecutive images.  If dp is -1, the
-	texture's width and height are equal.  If dp is -2, the texture's height and
-	depth are equal.  Otherwise, dp must be positive and determines the
-	texture's depth.  In all cases, the image's height must equal the texture's
-	height times its depth.
-	
-	Deprecated in favor of the base class version.*/
-	DEPRECATED void load_image(const std::string &fn, int dp = -1);
-
-	using Texture::load_image;
-
-	/** Uploads an image to the texture.  If storage has not been defined, it
-	will be set to match the image.  In this case the image will be treated as
-	a stack of square layers and its height must be divisible by its width.
-	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. */
-	virtual void image(const Graphics::Image &, unsigned, bool = false);
+		PixelComponents comp, 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.  In this case the
+	image will be treated as a stack of square layers and its height must be
+	divisible by its width.  Otherwise the image must match the defined
+	storage. */
+	virtual void image(const Graphics::Image &, unsigned = 0);
 
 	using Texture::image;