X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.h;h=e7e3a79e951909f081349e32a53661b5f844cb1a;hp=d791633d3a306ef08607016efe4b956d850f43fa;hb=HEAD;hpb=be6ffe96ecb4707599fe1a6f620c348760213d46

diff --git a/source/core/texture3d.h b/source/core/texture3d.h
index d791633d..e7e3a79e 100644
--- a/source/core/texture3d.h
+++ b/source/core/texture3d.h
@@ -9,8 +9,7 @@ namespace Msp {
 namespace GL {
 
 /**
-Three-dimensional texture.  Consists of an array of texels in the shape of a
-right cuboid.  Texture coordinates have a principal range of [0, 1].
+Three-dimensional texture, consisting of a cuboid-shaped array of texels.
 */
 class Texture3D: public Texture3DBackend
 {
@@ -25,7 +24,6 @@ public:
 	private:
 		void init();
 
-		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned, unsigned);
 		void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
 	};
@@ -34,47 +32,37 @@ protected:
 	unsigned width = 0;
 	unsigned height = 0;
 	unsigned depth = 0;
-	unsigned levels = 0;
 
 	Texture3D(unsigned);
 public:
 	Texture3D() = default;
 
-	/** 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);
-
-	/** 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);
-
-	/** Updates a cuboid-shaped 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, int z, unsigned wd, unsigned ht, unsigned dp, 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. */
+	/** Sets storage format and dimensions and allocates memory for the texture.
+	If lv is zero, a complete mipmap pyramid is automatically created.  Storage
+	cannot be changed once set. */
+	void storage(PixelFormat, unsigned wd, unsigned ht, unsigned dp, unsigned lv = 0);
+
+	/** Replaces contents of an entire mipmap level.  Allocated storage must
+	exist.  The image data is interpreted according to the storage format and
+	must have size matching the selected mipmap level. */
+	void image(unsigned level, const void *);
+
+	/** Replaces a cuboid-shaped region of the texture.  Allocated storage must
+	exist.  The image data is interpreted according to the storage format and
+	the region must be fully inside the texture. */
+	void sub_image(unsigned level, unsigned x, unsigned y, unsigned z, unsigned wd, unsigned ht, unsigned dp, const void *);
+
+	/** Sets the texture's contents from an image.  The image is treated as a
+	stack of square layers and its height must be divisible by its width.  If
+	storage has not been allocated yet, it will be set to match the image.
+	Otherwise the image must be compatible with the existing storage. */
 	virtual void image(const Graphics::Image &, unsigned = 0);
 
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
 	unsigned get_depth() const { return depth; }
 protected:
-	unsigned get_n_levels() const;
 	LinAl::Vector<unsigned, 3> get_level_size(unsigned) const;
-
-public:
-	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-	virtual std::size_t get_data_size() const;
-	virtual void unload() { }
 };
 
 } // namespace GL