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 b68210b05c98230d892e7dcb780a2331095b3124..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,16 +51,13 @@ public:
        };
 
 private:
-       unsigned size;
-       unsigned levels;
+       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.
 
@@ -88,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);