Minor fixes to texture anisotropy handling

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

diff --git a/source/texture3d.h b/source/texture3d.h
index 93cae7e84e573ff40b0e5685210a9ab6c3ca990c..cf336e52b0227fb859d2125cb686f07d70db46b3 100644 (file)
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -13,13 +13,27 @@ right cuboid.  Texture coordinates have a principal range of [0, 1].
 */
 class Texture3D: public Texture
 {
 */
 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:
 private:

-       PixelFormat ifmt;

        unsigned width;
        unsigned height;
        unsigned depth;
        unsigned allocated;
 
        unsigned width;
        unsigned height;
        unsigned depth;
        unsigned allocated;
 

+protected:
+       Texture3D(GLenum);

 public:
        Texture3D();
 
 public:
        Texture3D();
 


@@ -50,14 +64,28 @@ 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
        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);
 
        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; }
        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; }
 
 public:
        virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }