From b4f88f00ab546339796cb33cded963089adb4c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 17 Nov 2019 14:26:44 +0100 Subject: [PATCH] Remove last remaining APIs deprecated in 2018.04. --- doc/changelog.dox | 14 ++++++++++ src/Magnum/Audio/Buffer.h | 12 --------- src/Magnum/Shaders/AbstractVector.h | 9 ------- src/Magnum/Shaders/Flat.h | 11 +------- src/Magnum/Shaders/Phong.h | 42 +++-------------------------- 5 files changed, 18 insertions(+), 70 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 851e887eb..2e2d16487 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -136,6 +136,20 @@ See also: @ref Platform::Sdl2Application now premultiply the value with @ref Platform::GlfwApplication::dpiScaling() "dpiScaling()" to work independently on display DPI. This might break existing uses. +- Removed remaining APIs deprecated in version 2018.04: + - @cpp Audio::Buffer::Format @ce, use @ref Audio::BufferFormat instead + - @cpp Shaders::*Vector::setVectorTexture() @ce, + @cpp Shaders::Flat::setTexture() @ce, + @cpp Shaders::Phong::setAmbientTexture() @ce, + @cpp Shaders::Phong::setDiffuseTexture() @ce, + @cpp Shaders::Phong::setSpecularTexture() @ce and + @cpp Shaders::Phong::setTextures() @ce, use + @ref Shaders::AbstractVector::bindVectorTexture() "Shaders::*Vector::bindVectorTexture()", + @ref Shaders::Flat::bindTexture(), + @ref Shaders::Phong::bindAmbientTexture(), + @ref Shaders::Phong::bindDiffuseTexture(), + @ref Shaders::Phong::bindSpecularTexture() and + @ref Shaders::Phong::bindTextures() instead @subsection changelog-latest-documentation Documentation diff --git a/src/Magnum/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h index 6b4f7ada0..1ab8fb746 100644 --- a/src/Magnum/Audio/Buffer.h +++ b/src/Magnum/Audio/Buffer.h @@ -42,23 +42,11 @@ #include "Magnum/Audio/Audio.h" #include "Magnum/Audio/visibility.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#include "Magnum/Audio/BufferFormat.h" -#endif - namespace Magnum { namespace Audio { /** @brief Sample buffer */ class MAGNUM_AUDIO_EXPORT Buffer { public: - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief BufferFormat - * @deprecated Use @ref BufferFormat instead. - */ - typedef CORRADE_DEPRECATED("use BufferFormat instead") BufferFormat Format; - #endif - /** * @brief Constructor * diff --git a/src/Magnum/Shaders/AbstractVector.h b/src/Magnum/Shaders/AbstractVector.h index 55f586cc2..f465841fc 100644 --- a/src/Magnum/Shaders/AbstractVector.h +++ b/src/Magnum/Shaders/AbstractVector.h @@ -86,15 +86,6 @@ template class AbstractVector: public GL::AbstractShader */ AbstractVector& bindVectorTexture(GL::Texture2D& texture); - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief bindVectorTexture() - * @deprecated Use @ref bindVectorTexture() instead. - */ - CORRADE_DEPRECATED("use bindVectorTexture() instead") AbstractVector& setVectorTexture(GL::Texture2D& texture) { - return bindVectorTexture(texture); - } - #endif - #ifndef DOXYGEN_GENERATING_OUTPUT protected: #else diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h index ac7101da1..63fe09d77 100644 --- a/src/Magnum/Shaders/Flat.h +++ b/src/Magnum/Shaders/Flat.h @@ -188,7 +188,7 @@ template class MAGNUM_SHADERS_EXPORT Flat: public GL::Ab enum class Flag: UnsignedByte { /** * Multiply color with a texture. - * @see @ref setColor(), @ref setTexture() + * @see @ref setColor(), @ref bindTexture() */ Textured = 1 << 0, @@ -327,15 +327,6 @@ template class MAGNUM_SHADERS_EXPORT Flat: public GL::Ab Flat& setObjectId(UnsignedInt id); #endif - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief bindTexture() - * @deprecated Use @ref bindTexture() instead. - */ - CORRADE_DEPRECATED("use bindTexture() instead") Flat& setTexture(GL::Texture2D& texture) { - return bindTexture(texture); - } - #endif - private: Flags _flags; Int _transformationProjectionMatrixUniform{0}, diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h index 45720a867..c87e907a0 100644 --- a/src/Magnum/Shaders/Phong.h +++ b/src/Magnum/Shaders/Phong.h @@ -203,19 +203,19 @@ class MAGNUM_SHADERS_EXPORT Phong: public GL::AbstractShaderProgram { enum class Flag: UnsignedByte { /** * Multiply ambient color with a texture. - * @see @ref setAmbientColor(), @ref setAmbientTexture() + * @see @ref setAmbientColor(), @ref bindAmbientTexture() */ AmbientTexture = 1 << 0, /** * Multiply diffuse color with a texture. - * @see @ref setDiffuseColor(), @ref setDiffuseTexture() + * @see @ref setDiffuseColor(), @ref bindDiffuseTexture() */ DiffuseTexture = 1 << 1, /** * Multiply specular color with a texture. - * @see @ref setSpecularColor(), @ref setSpecularTexture() + * @see @ref setSpecularColor(), @ref bindSpecularTexture() */ SpecularTexture = 1 << 2, @@ -323,15 +323,6 @@ class MAGNUM_SHADERS_EXPORT Phong: public GL::AbstractShaderProgram { */ Phong& bindAmbientTexture(GL::Texture2D& texture); - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief bindAmbientTexture() - * @deprecated Use @ref bindAmbientTexture() instead. - */ - CORRADE_DEPRECATED("use bindAmbientTexture() instead") Phong& setAmbientTexture(GL::Texture2D& texture) { - return bindAmbientTexture(texture); - } - #endif - /** * @brief Set diffuse color * @return Reference to self (for method chaining) @@ -354,15 +345,6 @@ class MAGNUM_SHADERS_EXPORT Phong: public GL::AbstractShaderProgram { */ Phong& bindDiffuseTexture(GL::Texture2D& texture); - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief bindDiffuseTexture() - * @deprecated Use @ref bindDiffuseTexture() instead. - */ - CORRADE_DEPRECATED("use bindDiffuseTexture() instead") Phong& setDiffuseTexture(GL::Texture2D& texture) { - return bindDiffuseTexture(texture); - } - #endif - /** * @brief Bind a normal texture * @return Reference to self (for method chaining) @@ -400,15 +382,6 @@ class MAGNUM_SHADERS_EXPORT Phong: public GL::AbstractShaderProgram { */ Phong& bindSpecularTexture(GL::Texture2D& texture); - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief bindSpecularTexture() - * @deprecated Use @ref bindSpecularTexture() instead. - */ - CORRADE_DEPRECATED("use bindSpecularTexture() instead") Phong& setSpecularTexture(GL::Texture2D& texture) { - return bindSpecularTexture(texture); - } - #endif - /** * @brief Bind textures * @return Reference to self (for method chaining) @@ -428,15 +401,6 @@ class MAGNUM_SHADERS_EXPORT Phong: public GL::AbstractShaderProgram { #endif ); - #ifdef MAGNUM_BUILD_DEPRECATED - /** @brief @copybrief bindTextures() - * @deprecated Use @ref bindTextures() instead. - */ - CORRADE_DEPRECATED("use bindTextures() instead") Phong& setTextures(GL::Texture2D* ambient, GL::Texture2D* diffuse, GL::Texture2D* specular) { - return bindTextures(ambient, diffuse, specular); - } - #endif - /** * @brief Set shininess * @return Reference to self (for method chaining)