Implement loading functionality for texture classes that were missing it

[libs/gl.git] / source / texture3d.h

diff --git a/source/texture3d.h b/source/texture3d.h
index 93cae7e84e573ff40b0e5685210a9ab6c3ca990c..75ae0fe902acb1eb8974591df86b67c9505e5fb3 100644 (file)
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -13,6 +13,19 @@ 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);
+       };
+
 private:
        PixelFormat ifmt;
        unsigned width;
@@ -50,9 +63,22 @@ public:
        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. */
+       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);
+
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
        unsigned get_depth() const { return depth; }