Deprecate the mipmap_levels parameter in Texture

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

diff --git a/source/texturecube.h b/source/texturecube.h
index 62f1189aa541426ff86d0cdcb5593604155a2dea..f5a364047874aa10569e2fe1a4c727e69b47063b 100644 (file)
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -49,18 +49,23 @@ public:
        };
 
 private:
-       PixelFormat ifmt;
        unsigned size;
+       unsigned levels;
        unsigned allocated;
 
+       static TextureCubeFace face_order[6];
        static Vector3 directions[6];
+       static unsigned orientations[12];
 
 public:
        TextureCube();
 
-       /** 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 size);
+       /** 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 size, unsigned lv = 0);
 
        /** Allocates storage for the cube faces.  The contents are initially
        undefined.  If storage has already been allocated, does nothing. */
@@ -81,7 +86,8 @@ public:
 
        void image(TextureCubeFace, const Graphics::Image &, bool = false);
 
-       virtual void image(const Graphics::Image &, bool = false);
+       virtual void image(const Graphics::Image &, unsigned, bool = false);
+       using Texture::image;
 
        unsigned get_size() const { return size; }
 private:
@@ -93,6 +99,8 @@ public:
        and 5, inclusive. */
        static TextureCubeFace enumerate_faces(unsigned);
 
+       static unsigned get_face_index(TextureCubeFace);
+
        /** Returns a vector pointing out of the face. */
        static const Vector3 &get_face_direction(TextureCubeFace);