X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.h;h=5818458618de4e32df8c4d846fdf978e49bc1737;hb=4a639bc5e80fce2467855a9e8f4c6cdff2f0adc0;hp=ae305153fec6860a8f37e3128f037214f07d5e25;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;p=libs%2Fgl.git

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index ae305153..58184586 100644
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -11,12 +11,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
 };
 
 /**
@@ -52,13 +52,9 @@ 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;
 
-	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();
@@ -70,34 +66,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);
-
 	/** 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);
 
-	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;
 
@@ -107,12 +87,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);
 
@@ -126,10 +100,12 @@ 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() { }
 };
 
+GLenum get_gl_cube_face(TextureCubeFace);
+
 void operator>>(const LexicalConverter &, TextureCubeFace &);
 
 } // namespace GL