Clean up includes and forward declarations for the core classes

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

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index 0f83e29e138953e8d2e5c6c7595adb8323ea3a33..8bb5cf43131f101fb5089b7913d091a510ada681 100644 (file)
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -1,7 +1,6 @@
 #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 "vector.h"
@@ -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
 };
 
 /**
@@ -53,7 +52,6 @@ private:
        unsigned size;
        unsigned levels;
 
-       static const TextureCubeFace face_order[6];
        static const Vector3 directions[6];
        static const unsigned orientations[12];
 
@@ -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);
 
@@ -111,6 +103,8 @@ public:
        virtual void unload() { }
 };
 
+unsigned get_gl_cube_face(TextureCubeFace);
+
 void operator>>(const LexicalConverter &, TextureCubeFace &);
 
 } // namespace GL