From 13ca01c82626936627acc2b33871d787249f98af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 23 May 2015 23:30:27 +0200 Subject: [PATCH] Minor code reorganization. --- src/Magnum/AbstractTexture.h | 6 +++--- src/Magnum/CubeMapTextureArray.h | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Magnum/AbstractTexture.h b/src/Magnum/AbstractTexture.h index d32a5f1ff..e8ab6f836 100644 --- a/src/Magnum/AbstractTexture.h +++ b/src/Magnum/AbstractTexture.h @@ -269,6 +269,9 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { /** @brief Move assignment */ AbstractTexture& operator=(AbstractTexture&& other) noexcept; + /** @brief OpenGL texture ID */ + GLuint id() const { return _id; } + #ifndef MAGNUM_TARGET_WEBGL /** * @brief Texture label @@ -306,9 +309,6 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject { } #endif - /** @brief OpenGL texture ID */ - GLuint id() const { return _id; } - /** * @brief Bind texture to given texture unit * diff --git a/src/Magnum/CubeMapTextureArray.h b/src/Magnum/CubeMapTextureArray.h index d6870f063..28b760461 100644 --- a/src/Magnum/CubeMapTextureArray.h +++ b/src/Magnum/CubeMapTextureArray.h @@ -84,17 +84,6 @@ the six sides of the cube map, fourth part is layer in the array. See */ class MAGNUM_EXPORT CubeMapTextureArray: public AbstractTexture { public: - /** - * @brief Constructor - * - * Creates new OpenGL texture object. If @extension{ARB,direct_state_access} - * (part of OpenGL 4.5) is not available, the texture is created on - * first use. - * @see @fn_gl{CreateTextures} with @def_gl{TEXTURE_CUBE_MAP_ARRAY}, - * eventually @fn_gl{GenTextures} - */ - explicit CubeMapTextureArray(): AbstractTexture(GL_TEXTURE_CUBE_MAP_ARRAY) {} - /** * @brief Max supported size of one side of cube map texture array * @@ -106,6 +95,17 @@ class MAGNUM_EXPORT CubeMapTextureArray: public AbstractTexture { */ static Vector3i maxSize(); + /** + * @brief Constructor + * + * Creates new OpenGL texture object. If @extension{ARB,direct_state_access} + * (part of OpenGL 4.5) is not available, the texture is created on + * first use. + * @see @fn_gl{CreateTextures} with @def_gl{TEXTURE_CUBE_MAP_ARRAY}, + * eventually @fn_gl{GenTextures} + */ + explicit CubeMapTextureArray(): AbstractTexture(GL_TEXTURE_CUBE_MAP_ARRAY) {} + /** * @copybrief Texture::setBaseLevel() * @return Reference to self (for method chaining)