From efb36b4e33c18256392269cf1b3e924e0eea5198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 6 May 2012 14:34:31 +0200 Subject: [PATCH] Removed cube map coordinates from AbstractTexture::Target. They are specified as CubeMapTexture::Coordinate anyway and this was just misleading. --- src/AbstractTexture.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index 76e991265..0f64319bf 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -427,12 +427,6 @@ class MAGNUM_EXPORT AbstractTexture { Array2D = GL_TEXTURE_2D_ARRAY, Rectangle = GL_TEXTURE_RECTANGLE, CubeMap = GL_TEXTURE_CUBE_MAP, - CubeMapPositiveX = GL_TEXTURE_CUBE_MAP_POSITIVE_X, - CubeMapNegativeX = GL_TEXTURE_CUBE_MAP_NEGATIVE_X, - CubeMapPositiveY = GL_TEXTURE_CUBE_MAP_POSITIVE_Y, - CubeMapNegativeY = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, - CubeMapPositiveZ = GL_TEXTURE_CUBE_MAP_POSITIVE_Z, - CubeMapNegativeZ = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z }; /** @@ -549,13 +543,7 @@ template<> struct AbstractTexture::DataHelper<2> { Texture2D = GL_TEXTURE_2D, Array1D = GL_TEXTURE_1D_ARRAY, Rectangle = GL_TEXTURE_RECTANGLE, - CubeMap = GL_TEXTURE_CUBE_MAP, - CubeMapPositiveX = GL_TEXTURE_CUBE_MAP_POSITIVE_X, - CubeMapNegativeX = GL_TEXTURE_CUBE_MAP_NEGATIVE_X, - CubeMapPositiveY = GL_TEXTURE_CUBE_MAP_POSITIVE_Y, - CubeMapNegativeY = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, - CubeMapPositiveZ = GL_TEXTURE_CUBE_MAP_POSITIVE_Z, - CubeMapNegativeZ = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z + CubeMap = GL_TEXTURE_CUBE_MAP }; inline constexpr static Target target() { return Target::Texture2D; }