void raw_data(const std::string &);
void storage(PixelFormat, unsigned, unsigned, unsigned);
+ void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
};
private:
unsigned width;
unsigned height;
unsigned depth;
+ unsigned levels;
unsigned allocated;
protected:
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. */
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.*/
- 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 &, 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;
unsigned get_width() const { return width; }
unsigned get_height() const { return height; }