Use default member initializers for simple types

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

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index 39fe0c699b4b6358fa9efe6c7348504450690742..2f445919ba718ad97d3cda995fc4cc2aba25ce7a 100644 (file)
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -1,9 +1,8 @@
 #ifndef MSP_GL_TEXTURECUBE_H_
 #define MSP_GL_TEXTURECUBE_H_
 
-#include <msp/gl/extensions/arb_texture_cube_map.h>
 #include <msp/graphics/image.h>
-#include "texture.h"
+#include "texturecube_backend.h"
 #include "vector.h"
 
 namespace Msp {
@@ -11,12 +10,12 @@ namespace GL {
 
 enum TextureCubeFace
 {
-       POSITIVE_X = GL_TEXTURE_CUBE_MAP_POSITIVE_X,
-       NEGATIVE_X = GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
-       POSITIVE_Y = GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
-       NEGATIVE_Y = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
-       POSITIVE_Z = GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
-       NEGATIVE_Z = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+       POSITIVE_X = 0,
+       NEGATIVE_X = 1,
+       POSITIVE_Y = 2,
+       NEGATIVE_Y = 3,
+       POSITIVE_Z = 4,
+       NEGATIVE_Z = 5
 };
 
 /**
@@ -31,8 +30,10 @@ All faces of a cube map texture must be allocated for it to be usable.
 
 Requires OpenGL version 1.3.
 */
-class TextureCube: public Texture
+class TextureCube: public TextureCubeBackend
 {
+       friend TextureCubeBackend;
+
 public:
        class Loader: public Msp::DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>
        {
@@ -50,19 +51,13 @@ public:
        };
 
 private:
-       unsigned size;
-       unsigned levels;
-       /* Lowest six bits track allocation status of faces on the base level.  Bit
-       seven is set if the entire base level is allocated. */
-       unsigned allocated;
+       unsigned size = 0;
+       unsigned levels = 0;
 
-       static TextureCubeFace face_order[6];
-       static Vector3 directions[6];
-       static unsigned orientations[12];
+       static const Vector3 directions[6];
+       static const unsigned orientations[12];
 
 public:
-       TextureCube();
-
        /** Defines storage structure for the texture.  If lv is zero, the number
        of mipmap levels is automatically determined from storage dimensions.
 
@@ -70,42 +65,18 @@ public:
        it can't be changed. */
        void storage(PixelFormat fmt, unsigned size, unsigned lv = 0);
 
-       DEPRECATED void storage(PixelComponents c, unsigned s, unsigned l = 0)
-       { storage(make_pixelformat(c, UNSIGNED_BYTE), s, l); }
-
-       /** Allocates storage for the cube faces.  The contents are initially
-       undefined.  If storage has already been allocated, does nothing. */
-       void allocate(unsigned level);
-
-private:
-       void allocate_(unsigned);
-
-public:
        /** Updates the contents of a face.  Storage must be defined beforehand.
        The image data must have dimensions and format matching the defined
        storage. */
        void image(TextureCubeFace face, unsigned level, const void *data);
 
-private:
-       void image_(TextureCubeFace, unsigned, const void *);
-
-public:
-       DEPRECATED void image(TextureCubeFace face, unsigned level,
-               PixelComponents comp, DataType type, const void *data);
-
        /** Updates a rectangular region of a face.  Storage must be defined
        beforehand.  The image data must be in a format mathing the defined storage
        and the update region must be fully inside the face. */
        void sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned w, unsigned h, const void *data);
 
-       DEPRECATED void sub_image(TextureCubeFace face, unsigned level,
-               int x, int y, unsigned w, unsigned h,
-               PixelComponents comp, DataType type, const void *data);
-
        void image(TextureCubeFace, const Graphics::Image &);
 
-       DEPRECATED void image(TextureCubeFace, const Graphics::Image &, bool);
-
        virtual void image(const Graphics::Image &, unsigned = 0);
        using Texture::image;
 
@@ -115,12 +86,6 @@ private:
        unsigned get_level_size(unsigned) const;
 
 public:
-       /** Translates indices into face constants.  Valid indices are between 0
-       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);
 
@@ -134,7 +99,7 @@ public:
        Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
 
        virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-       virtual UInt64 get_data_size() const;
+       virtual std::uint64_t get_data_size() const;
        virtual void unload() { }
 };