X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.h;h=e738ab53beba296520c3d130744a82b8b3e4208c;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=b68210b05c98230d892e7dcb780a2331095b3124;hpb=ada4b7614137221b64a00f31fde1498064e9fb19;p=libs%2Fgl.git

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index b68210b0..e738ab53 100644
--- 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.
 
@@ -80,7 +78,6 @@ public:
 	void image(TextureCubeFace, const Graphics::Image &);
 
 	virtual void image(const Graphics::Image &, unsigned = 0);
-	using Texture::image;
 
 	unsigned get_size() const { return size; }
 private:
@@ -88,12 +85,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);
 
@@ -107,7 +98,7 @@ public:
 	Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
 
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-	virtual std::uint64_t get_data_size() const;
+	virtual std::size_t get_data_size() const;
 	virtual void unload() { }
 };