Explicitly define the number of mipmap levels in textures

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

diff --git a/source/texture3d.h b/source/texture3d.h
index fa4c050f039c38f9a0734b0f6ec11ec21082e92b..437c852ab92f943ed569de54eb4c61f6b34402bf 100644 (file)
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -2,8 +2,6 @@
 #define MSP_GL_TEXTURE3D_H_
 
 #include <string>
 #define MSP_GL_TEXTURE3D_H_
 
 #include <string>

-#include "datatype.h"
-#include "pixelformat.h"

 #include "texture.h"
 
 namespace Msp {
 #include "texture.h"
 
 namespace Msp {


@@ -15,19 +13,37 @@ 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 width;
        unsigned height;
        unsigned depth;

+       unsigned levels;

        unsigned allocated;
 
        unsigned allocated;
 

+protected:
+       Texture3D(GLenum);

 public:
        Texture3D();
 
 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);

 
        /** Allocates storage for the texture.  The contents are initially
        undefined.  If storage has already been allocated, does nothing. */
 
        /** Allocates storage for the texture.  The contents are initially
        undefined.  If storage has already been allocated, does nothing. */


@@ -52,17 +68,31 @@ 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:
 
 public:

-       virtual AsyncLoader *load(IO::Seekable &) { return 0; }
+       virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }

        virtual UInt64 get_data_size() const;
        virtual void unload() { }
 };
        virtual UInt64 get_data_size() const;
        virtual void unload() { }
 };