X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.h;h=ecdff9d6c90549ae7e958e815e67e8493a4b050c;hb=9087cc0;hp=c55a3c1ae3bffd40be72d97183e0fbbebe86bd7e;hpb=cabb833e9b4ca10b9f350f3be6c351dce6a66822;p=libs%2Fgl.git

diff --git a/source/texture3d.h b/source/texture3d.h
index c55a3c1a..ecdff9d6 100644
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -2,8 +2,6 @@
 #define MSP_GL_TEXTURE3D_H_
 
 #include <string>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
@@ -15,19 +13,41 @@ right cuboid.  Texture coordinates have a principal range of [0, 1].
 */
 class Texture3D: public Texture
 {
+public:
+	class Loader: public Msp::DataFile::DerivedObjectLoader<Texture3D, Texture::Loader>
+	{
+	public:
+		Loader(Texture3D &);
+		Loader(Texture3D &, Collection &);
+	private:
+		void init();
+
+		void raw_data(const std::string &);
+		void storage(PixelFormat, unsigned, unsigned, unsigned);
+		void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
+	};
+
 private:
-	PixelFormat ifmt;
 	unsigned width;
 	unsigned height;
 	unsigned depth;
+	unsigned levels;
 	unsigned allocated;
 
+protected:
+	Texture3D(GLenum);
 public:
 	Texture3D();
 
-	/** 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, unsigned dp);
+	/** Defines storage structure for the texture.  If lv is zero, the number
+	of mipmap levels is automatically determined from storage dimensions.
+
+	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 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. */
@@ -36,30 +56,32 @@ public:
 	/** 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);
+	void image(unsigned level, PixelComponents, 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,
 		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. */
-	void load_image(const std::string &fn, int dp = -1);
+		PixelComponents comp, DataType type, const void *data);
+
+	/** 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);
+
+	using Texture::image;
 
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
 	unsigned get_depth() const { return depth; }
-private:
-	void get_level_size(unsigned, unsigned &, unsigned &, unsigned &);
+protected:
+	unsigned get_n_levels() const;
+	void get_level_size(unsigned, unsigned &, unsigned &, unsigned &) const;
 
 public:
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }