diff --git a/src/Magnum/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h index fdd31d99b..f0e9986cf 100644 --- a/src/Magnum/SceneGraph/AbstractTransformation.h +++ b/src/Magnum/SceneGraph/AbstractTransformation.h @@ -26,11 +26,9 @@ */ /** @file - * @brief Class @ref Magnum::SceneGraph::AbstractTransformation, alias @ref Magnum::SceneGraph::AbstractBasicTransformation2D, @ref Magnum::SceneGraph::AbstractBasicTransformation3D, typedef @ref Magnum::SceneGraph::AbstractTransformation2D, @ref Magnum::SceneGraph::AbstractTransformation3D, enum @ref Magnum::SceneGraph::TransformationType + * @brief Class @ref Magnum::SceneGraph::AbstractTransformation, alias @ref Magnum::SceneGraph::AbstractBasicTransformation2D, @ref Magnum::SceneGraph::AbstractBasicTransformation3D, typedef @ref Magnum::SceneGraph::AbstractTransformation2D, @ref Magnum::SceneGraph::AbstractTransformation3D */ -#include - #include "Magnum/SceneGraph/SceneGraph.h" #include "Magnum/SceneGraph/visibility.h" @@ -88,21 +86,6 @@ template class AbstractTransformation { virtual void doResetTransformation() = 0; }; -#ifdef MAGNUM_BUILD_DEPRECATED -/** -@brief Transformation type -@deprecated Use `*Transformation*::*()` and `*Transformation::*Local*()` - overloads instead. -*/ -enum class CORRADE_DEPRECATED_ENUM("use *() and *Local() overloads instead") TransformationType: UnsignedByte { - /** Global transformation, applied after all other transformations. */ - Global = 0x00, - - /** Local transformation, applied before all other transformations. */ - Local = 0x01 -}; -#endif - /** @brief Base transformation for two-dimensional scenes diff --git a/src/Magnum/SceneGraph/AbstractTranslation.h b/src/Magnum/SceneGraph/AbstractTranslation.h index a2586aa2d..d6cba32ec 100644 --- a/src/Magnum/SceneGraph/AbstractTranslation.h +++ b/src/Magnum/SceneGraph/AbstractTranslation.h @@ -81,28 +81,6 @@ class AbstractTranslation: public AbstractTransformation { return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() or @ref translateLocal() instead. - */ - CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractTranslation& translate(const VectorTypeFor& vector, TransformationType type) { - return type == TransformationType::Global ? translate(vector) : translateLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT AbstractTranslation& resetTransformation() { diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h index 0b0b41985..2ccd2e23b 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation2D.h @@ -69,28 +69,6 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotation2D& rotate(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotate(angle) : rotateLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT AbstractBasicTranslationRotation2D& resetTransformation() { @@ -105,24 +83,6 @@ template class AbstractBasicTranslationRotation2D: public AbstractBasic AbstractBasicTranslation2D::translateLocal(vector); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation2D& translate(const Math::Vector2& vector, TransformationType type) { - AbstractBasicTranslation2D::translate(vector, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif #endif protected: diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h index 20c15fc44..e0d7fa573 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotation3D.h @@ -73,28 +73,6 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotation3D& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis, TransformationType type) { - return type == TransformationType::Global ? rotate(angle, normalizedAxis) : rotateLocal(angle, normalizedAxis); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around X axis * @param angle Angle (counterclockwise) @@ -123,28 +101,6 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateX() - * @deprecated Use @ref rotateX() or @ref rotateXLocal() instead. - */ - CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") AbstractBasicTranslationRotation3D& rotateX(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateX(angle) : rotateXLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around Y axis * @param angle Angle (counterclockwise) @@ -173,28 +129,6 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateY() - * @deprecated Use @ref rotateY() or @ref rotateYLocal() instead. - */ - CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") AbstractBasicTranslationRotation3D& rotateY(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateY(angle) : rotateYLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around Z axis * @param angle Angle (counterclockwise) @@ -223,28 +157,6 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateZ() - * @deprecated Use @ref rotateZ() or @ref rotateZLocal() instead. - */ - CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") AbstractBasicTranslationRotation3D& rotateZ(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateZ(angle) : rotateZLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT AbstractBasicTranslationRotation3D& resetTransformation() { @@ -259,24 +171,6 @@ template class AbstractBasicTranslationRotation3D: public AbstractBasic AbstractBasicTranslation3D::translateLocal(vector); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation3D& translate(const Math::Vector3& vector, TransformationType type) { - AbstractBasicTranslation3D::translate(vector, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif #endif protected: diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h index 6cf08e809..9d61ede9e 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h @@ -69,28 +69,6 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief scale() - * @deprecated Use @ref scale() or @ref scaleLocal() instead. - */ - CORRADE_DEPRECATED("use scale() or scaleLocal() instead") AbstractBasicTranslationRotationScaling2D& scale(const Math::Vector2& vector, TransformationType type) { - return type == TransformationType::Global ? scale(vector) : scaleLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT AbstractBasicTranslationRotationScaling2D& resetTransformation() { @@ -105,24 +83,6 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra AbstractBasicTranslationRotation2D::translateLocal(vector); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotationScaling2D& translate(const Math::Vector2& vector, TransformationType type) { - AbstractBasicTranslationRotation2D::translate(vector, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif AbstractBasicTranslationRotationScaling2D& rotate(Math::Rad angle) { AbstractBasicTranslationRotation2D::rotate(angle); return *this; @@ -131,24 +91,6 @@ template class AbstractBasicTranslationRotationScaling2D: public Abstra AbstractBasicTranslationRotation2D::rotateLocal(angle); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotationScaling2D& rotate(Math::Rad angle, TransformationType type) { - AbstractBasicTranslationRotation2D::rotate(angle, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif #endif protected: diff --git a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h index 5e7bbb64f..d87557690 100644 --- a/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h +++ b/src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h @@ -69,28 +69,6 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief scale() - * @deprecated Use @ref scale() or @ref scaleLocal() instead. - */ - CORRADE_DEPRECATED("use scale() or scaleLocal() instead") AbstractBasicTranslationRotationScaling3D& scale(const Math::Vector3& vector, TransformationType type) { - return type == TransformationType::Global ? scale(vector) : scaleLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT AbstractBasicTranslationRotationScaling3D& resetTransformation() { @@ -105,24 +83,6 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra AbstractBasicTranslationRotation3D::translateLocal(vector); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotationScaling3D& translate(const Math::Vector3& vector, TransformationType type) { - AbstractBasicTranslationRotation3D::translate(vector, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif AbstractBasicTranslationRotationScaling3D& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis) { AbstractBasicTranslationRotation3D::rotate(angle, normalizedAxis); return *this; @@ -131,24 +91,6 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra AbstractBasicTranslationRotation3D::rotateLocal(angle, normalizedAxis); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotationScaling3D& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis, TransformationType type) { - AbstractBasicTranslationRotation3D::rotate(angle, normalizedAxis, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif AbstractBasicTranslationRotationScaling3D& rotateX(Math::Rad angle) { AbstractBasicTranslationRotation3D::rotateX(angle); return *this; @@ -157,24 +99,6 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra AbstractBasicTranslationRotation3D::rotateXLocal(angle); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") AbstractBasicTranslationRotationScaling3D& rotateX(Math::Rad angle, TransformationType type) { - AbstractBasicTranslationRotation3D::rotateX(angle, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif AbstractBasicTranslationRotationScaling3D& rotateY(Math::Rad angle) { AbstractBasicTranslationRotation3D::rotateY(angle); return *this; @@ -183,24 +107,6 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra AbstractBasicTranslationRotation3D::rotateYLocal(angle); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") AbstractBasicTranslationRotationScaling3D& rotateY(Math::Rad angle, TransformationType type) { - AbstractBasicTranslationRotation3D::rotateY(angle, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif AbstractBasicTranslationRotationScaling3D& rotateZ(Math::Rad angle) { AbstractBasicTranslationRotation3D::rotateZ(angle); return *this; @@ -209,24 +115,6 @@ template class AbstractBasicTranslationRotationScaling3D: public Abstra AbstractBasicTranslationRotation3D::rotateZLocal(angle); return *this; } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") AbstractBasicTranslationRotationScaling3D& rotateZ(Math::Rad angle, TransformationType type) { - AbstractBasicTranslationRotation3D::rotateZ(angle, type); - return *this; - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif #endif protected: diff --git a/src/Magnum/SceneGraph/DualComplexTransformation.h b/src/Magnum/SceneGraph/DualComplexTransformation.h index f5d1786c4..62a0550a9 100644 --- a/src/Magnum/SceneGraph/DualComplexTransformation.h +++ b/src/Magnum/SceneGraph/DualComplexTransformation.h @@ -109,28 +109,6 @@ template class BasicDualComplexTransformation: public AbstractBasicTran return transformLocalInternal(transformation); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief transform() - * @deprecated Use @ref transform() or @ref transformLocal() instead. - */ - CORRADE_DEPRECATED("use transform() or transformLocal() instead") Object>& transform(const Math::DualComplex& transformation, TransformationType type) { - return type == TransformationType::Global ? transform(transformation) : transformLocal(transformation); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Translate object * @return Reference to self (for method chaining) @@ -154,28 +132,6 @@ template class BasicDualComplexTransformation: public AbstractBasicTran return transformLocalInternal(Math::DualComplex::translation(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() or @ref translateLocal() instead. - */ - CORRADE_DEPRECATED("use translate() or translateLocal() instead") Object>& translate(const Math::Vector2& vector, TransformationType type) { - return type == TransformationType::Global ? translate(vector) : translateLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object * @param angle Angle (counterclockwise) @@ -198,28 +154,6 @@ template class BasicDualComplexTransformation: public AbstractBasicTran return transformLocalInternal(Math::DualComplex::rotation(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") Object>& rotate(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotate(angle) : rotateLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - protected: /* Allow construction only from Object */ explicit BasicDualComplexTransformation() = default; diff --git a/src/Magnum/SceneGraph/DualQuaternionTransformation.h b/src/Magnum/SceneGraph/DualQuaternionTransformation.h index 8455102b0..afbd831ab 100644 --- a/src/Magnum/SceneGraph/DualQuaternionTransformation.h +++ b/src/Magnum/SceneGraph/DualQuaternionTransformation.h @@ -109,28 +109,6 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT return transformLocalInternal(transformation); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief transform() - * @deprecated Use @ref transform() or @ref transformLocal() instead. - */ - CORRADE_DEPRECATED("use transform() or transformLocal() instead") Object>& transform(const Math::DualQuaternion& transformation, TransformationType type) { - return type == TransformationType::Global ? transform(transformation) : transformLocal(transformation); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Translate object * @return Reference to self (for method chaining) @@ -153,28 +131,6 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT return transformLocalInternal(Math::DualQuaternion::translation(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() or @ref translateLocal() instead. - */ - CORRADE_DEPRECATED("use translate() or translateLocal() instead") Object>& translate(const Math::Vector3& vector, TransformationType type) { - return type == TransformationType::Global ? translate(vector) : translateLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object * @param angle Angle (counterclockwise) @@ -200,28 +156,6 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT return transformLocalInternal(Math::DualQuaternion::rotation(angle, normalizedAxis)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("usr rotate() or rotateLocal() instead") Object>& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis, TransformationType type) { - return type == TransformationType::Global ? rotate(angle, normalizedAxis) : rotateLocal(angle, normalizedAxis); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /* Overloads to remove WTF-factor from method chaining order */ #ifndef DOXYGEN_GENERATING_OUTPUT Object>& rotateX(Math::Rad angle) { @@ -230,69 +164,18 @@ template class BasicDualQuaternionTransformation: public AbstractBasicT Object>& rotateXLocal(Math::Rad angle) { return rotateLocal(angle, Math::Vector3::xAxis()); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") Object>& rotateX(Math::Rad angle, TransformationType type) { - return rotate(angle, Math::Vector3::xAxis(), type); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif Object>& rotateY(Math::Rad angle) { return rotate(angle, Math::Vector3::yAxis()); } Object>& rotateYLocal(Math::Rad angle) { return rotateLocal(angle, Math::Vector3::yAxis()); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") Object>& rotateY(Math::Rad angle, TransformationType type) { - return rotate(angle, Math::Vector3::yAxis(), type); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif Object>& rotateZ(Math::Rad angle) { return rotate(angle, Math::Vector3::zAxis()); } Object>& rotateZLocal(Math::Rad angle) { return rotateLocal(angle, Math::Vector3::zAxis()); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") Object>& rotateZ(Math::Rad angle, TransformationType type) { - return rotate(angle, Math::Vector3::zAxis(), type); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif #endif protected: diff --git a/src/Magnum/SceneGraph/MatrixTransformation2D.h b/src/Magnum/SceneGraph/MatrixTransformation2D.h index de1e4c445..484ca1f67 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation2D.h @@ -86,28 +86,6 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla return setTransformation(_transformation*transformation); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief transform() - * @deprecated Use @ref transform() or @ref transformLocal() instead. - */ - CORRADE_DEPRECATED("use transform() or transformLocal() instead") Object>& transform(const Math::Matrix3& transformation, TransformationType type) { - return type == TransformationType::Global ? transform(transformation) : transformLocal(transformation); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** @copydoc AbstractTranslationRotationScaling2D::resetTransformation() */ Object>& resetTransformation() { return setTransformation({}); @@ -136,28 +114,6 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla return transformLocal(Math::Matrix3::translation(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() or @ref translateLocal() instead. - */ - CORRADE_DEPRECATED("use translate() or translateLocal() instead") Object>& translate(const Math::Vector2& vector, TransformationType type) { - return type == TransformationType::Global ? translate(vector) : translateLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object * @param angle Angle (counterclockwise) @@ -181,28 +137,6 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla return transformLocal(Math::Matrix3::rotation(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") Object>& rotate(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotate(angle) : rotateLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Scale object * @return Reference to self (for method chaining) @@ -226,28 +160,6 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla return transformLocal(Math::Matrix3::scaling(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief scale() - * @deprecated Use @ref scale() or @ref scaleLocal() instead. - */ - CORRADE_DEPRECATED("use scale() or scaleLocal() instead") Object>& scale(const Math::Vector2& vector, TransformationType type) { - return type == TransformationType::Global ? scale(vector) : scaleLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Reflect object * @param normal Normal of the line through which to reflect @@ -273,28 +185,6 @@ template class BasicMatrixTransformation2D: public AbstractBasicTransla return transformLocal(Math::Matrix3::reflection(normal)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief reflect() - * @deprecated Use @ref reflect() or @ref reflectLocal() instead. - */ - CORRADE_DEPRECATED("use reflect() or reflectLocal() instead") Object>& reflect(const Math::Vector2& normal, TransformationType type) { - return type == TransformationType::Global ? reflect(normal) : reflectLocal(normal); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - protected: /* Allow construction only from Object */ explicit BasicMatrixTransformation2D() = default; diff --git a/src/Magnum/SceneGraph/MatrixTransformation3D.h b/src/Magnum/SceneGraph/MatrixTransformation3D.h index 041eeb0a9..bfca1c74f 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation3D.h @@ -91,28 +91,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return setTransformation(_transformation*transformation); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief transform() - * @deprecated Use @ref transform() or @ref transformLocal() instead. - */ - CORRADE_DEPRECATED("use transform() or transformLocal() instead") Object>& transform(const Math::Matrix4& transformation, TransformationType type) { - return type == TransformationType::Global ? transform(transformation) : transformLocal(transformation); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Translate object * @return Reference to self (for method chaining) @@ -136,28 +114,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return transformLocal(Math::Matrix4::translation(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() or @ref translateLocal() instead. - */ - CORRADE_DEPRECATED("use translate() or translateLocal() instead") Object>& translate(const Math::Vector3& vector, TransformationType type) { - return type == TransformationType::Global ? translate(vector) : translateLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object * @param angle Angle (counterclockwise) @@ -184,28 +140,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return transformLocal(Math::Matrix4::rotation(angle, normalizedAxis)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") Object>& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis, TransformationType type) { - return type == TransformationType::Global ? rotate(angle, normalizedAxis) : rotateLocal(angle, normalizedAxis); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around X axis * @param angle Angle (counterclockwise) @@ -229,28 +163,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return transformLocal(Math::Matrix4::rotationX(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateX() - * @deprecated Use @ref rotateX() or @ref rotateXLocal() instead. - */ - CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") Object>& rotateX(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateX(angle) : rotateXLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around Y axis * @param angle Angle (counterclockwise) @@ -274,28 +186,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return transformLocal(Math::Matrix4::rotationY(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateY() - * @deprecated Use @ref rotateY() or @ref rotateYLocal() instead. - */ - CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") Object>& rotateY(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateY(angle) : rotateYLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around Z axis * @param angle Angle (counterclockwise) @@ -319,28 +209,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return transformLocal(Math::Matrix4::rotationZ(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateZ() - * @deprecated Use @ref rotateZ() or @ref rotateZLocal() instead. - */ - CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") Object>& rotateZ(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateZ(angle) : rotateZLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Scale object * @return Reference to self (for method chaining) @@ -364,28 +232,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return transformLocal(Math::Matrix4::scaling(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief scale() - * @deprecated Use @ref scale() or @ref scaleLocal() instead. - */ - CORRADE_DEPRECATED("use scale() or scaleLocal() instead") Object>& scale(const Math::Vector3& vector, TransformationType type) { - return type == TransformationType::Global ? scale(vector) : scaleLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Reflect object * @param normal Normal of the plane through which to reflect @@ -410,28 +256,6 @@ template class BasicMatrixTransformation3D: public AbstractBasicTransla return transformLocal(Math::Matrix4::reflection(normal)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief reflect() - * @deprecated Use @ref reflect() or @ref reflectLocal() instead. - */ - CORRADE_DEPRECATED("use reflect() or reflectLocal() instead") Object>& reflect(const Math::Vector3& normal, TransformationType type) { - return type == TransformationType::Global ? reflect(normal) : reflectLocal(normal); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - protected: /* Allow construction only from Object */ explicit BasicMatrixTransformation3D() = default; diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h index d5b551d01..2de9a6845 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h @@ -114,28 +114,6 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr return transformLocalInternal(transformation); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief transform() - * @deprecated Use @ref transform() or @ref transformLocal() instead. - */ - CORRADE_DEPRECATED("use transform() or transformLocal() instead") Object>& transform(const Math::Matrix3& transformation, TransformationType type) { - return type == TransformationType::Global ? transform(transformation) : transformLocal(transformation); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * Translate object * @return Reference to self (for method chaining) @@ -159,28 +137,6 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr return transformLocalInternal(Math::Matrix3::translation(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() or @ref translateLocal() instead. - */ - CORRADE_DEPRECATED("use translate() or translateLocal() instead") Object>& translate(const Math::Vector2& vector, TransformationType type) { - return type == TransformationType::Global ? translate(vector) : translateLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object * @param angle Angle (counterclockwise) @@ -205,28 +161,6 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr return transformLocalInternal(Math::Matrix3::rotation(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") Object>& rotate(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotate(angle) : rotateLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Reflect object * @param normal Normal of the line through which to reflect @@ -251,28 +185,6 @@ template class BasicRigidMatrixTransformation2D: public AbstractBasicTr return transformLocalInternal(Math::Matrix3::reflection(normal)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief reflect() - * @deprecated Use @ref reflect() or @ref reflectLocal() instead. - */ - CORRADE_DEPRECATED("use reflect() or reflectInternal() instead") Object>& reflect(const Math::Vector2& normal, TransformationType type) { - return type == TransformationType::Global ? reflect(normal) : reflectLocal(normal); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - protected: /* Allow construction only from Object */ explicit BasicRigidMatrixTransformation2D() = default; diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h index 4f6b22565..439840491 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h @@ -113,28 +113,6 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr return transformLocalInternal(transformation); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief transform() - * @deprecated Use @ref transform() or @ref transformLocal() instead. - */ - CORRADE_DEPRECATED("use transform() or transformLocal() instead") Object>& transform(const Math::Matrix4& transformation, TransformationType type) { - return type == TransformationType::Global ? transform(transformation) : transformLocal(transformation); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Translate object * @return Reference to self (for method chaining) @@ -158,28 +136,6 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr return transformLocalInternal(Math::Matrix4::translation(vector)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() or @ref translateLocal() instead. - */ - CORRADE_DEPRECATED("use translate() or translateLocal() instead") Object>& translate(const Math::Vector3& vector, TransformationType type) { - return type == TransformationType::Global ? translate(vector) : translateLocal(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object * @param angle Angle (counterclockwise) @@ -207,28 +163,6 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr return transformLocalInternal(Math::Matrix4::rotation(angle, normalizedAxis)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotate() - * @deprecated Use @ref rotate() or @ref rotateLocal() instead. - */ - CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") Object>& rotate(Math::Rad angle, const Math::Vector3& normalizedAxis, TransformationType type) { - return type == TransformationType::Global ? rotate(angle, normalizedAxis) : rotateLocal(angle, normalizedAxis); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around X axis * @param angle Angle (counterclockwise) @@ -252,28 +186,6 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr return transformLocalInternal(Math::Matrix4::rotationX(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateX() - * @deprecated Use @ref rotateX() or @ref rotateXLocal() instead. - */ - CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") Object>& rotateX(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateX(angle) : rotateXLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around Y axis * @param angle Angle (counterclockwise) @@ -297,28 +209,6 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr return transformLocalInternal(Math::Matrix4::rotationY(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateY() - * @deprecated Use @ref rotateY() or @ref rotateYLocal() instead. - */ - CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") Object>& rotateY(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateY(angle) : rotateYLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Rotate object around Z axis * @param angle Angle (counterclockwise) @@ -342,28 +232,6 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr return transformLocalInternal(Math::Matrix4::rotationZ(angle)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief rotateZ() - * @deprecated Use @ref rotateZ() or @ref rotateZLocal() instead. - */ - CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") Object>& rotateZ(Math::Rad angle, TransformationType type) { - return type == TransformationType::Global ? rotateZ(angle) : rotateZLocal(angle); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Reflect object * @param normal Normal of the plane through which to reflect @@ -388,28 +256,6 @@ template class BasicRigidMatrixTransformation3D: public AbstractBasicTr return transformLocalInternal(Math::Matrix4::reflection(normal)); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief reflect() - * @deprecated Use @ref reflect() or @ref reflectLocal() instead. - */ - CORRADE_DEPRECATED("use reflect() or reflectLocal() instead") Object>& reflect(const Math::Vector3& normal, TransformationType type) { - return type == TransformationType::Global ? reflect(normal) : reflectLocal(normal); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - protected: /* Allow construction only from Object */ explicit BasicRigidMatrixTransformation3D() = default; diff --git a/src/Magnum/SceneGraph/TranslationTransformation.h b/src/Magnum/SceneGraph/TranslationTransformation.h index 19ff31c92..b002116cb 100644 --- a/src/Magnum/SceneGraph/TranslationTransformation.h +++ b/src/Magnum/SceneGraph/TranslationTransformation.h @@ -94,28 +94,6 @@ class TranslationTransformation: public AbstractTranslation>& transform(const VectorTypeFor& transformation, TransformationType) { - return transform(transformation); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - /** * @brief Translate object * @return Reference to self (for method chaining) @@ -130,28 +108,6 @@ class TranslationTransformation: public AbstractTranslation>&>(*this); } - #ifdef MAGNUM_BUILD_DEPRECATED - #ifdef __GNUC__ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable: 4996) - #endif - /** - * @brief @copybrief translate() - * @deprecated Use @ref translate() instead. - */ - CORRADE_DEPRECATED("use translate() instead") Object>& translate(const VectorTypeFor& vector, TransformationType) { - return translate(vector); - } - #ifdef __GNUC__ - #pragma GCC diagnostic pop - #elif defined(_MSC_VER) - #pragma warning(pop) - #endif - #endif - protected: /* Allow construction only from Object */ explicit TranslationTransformation() = default;