ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

SceneGraph: removed long-deprecated TransformationType enum and related. 

Use separate <transform>() and <transform>Local() functions instead-
pull/231/head
Vladimír Vondruš 8 years ago
parent
fae2852db7
commit
53c4adfa79
13 changed files with 1 additions and 1111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/Magnum/SceneGraph/AbstractTransformation.h
  2. 22
      src/Magnum/SceneGraph/AbstractTranslation.h
  3. 40
      src/Magnum/SceneGraph/AbstractTranslationRotation2D.h
  4. 106
      src/Magnum/SceneGraph/AbstractTranslationRotation3D.h
  5. 58
      src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h
  6. 112
      src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h
  7. 66
      src/Magnum/SceneGraph/DualComplexTransformation.h
  8. 117
      src/Magnum/SceneGraph/DualQuaternionTransformation.h
  9. 110
      src/Magnum/SceneGraph/MatrixTransformation2D.h
  10. 176
      src/Magnum/SceneGraph/MatrixTransformation3D.h
  11. 88
      src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
  12. 154
      src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
  13. 44
      src/Magnum/SceneGraph/TranslationTransformation.h

19
src/Magnum/SceneGraph/AbstractTransformation.h
Unescape View File

@ -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 <Corrade/Utility/Macros.h>
#include "Magnum/SceneGraph/SceneGraph.h"
#include "Magnum/SceneGraph/visibility.h"
@ -88,21 +86,6 @@ template<UnsignedInt dimensions, class T> 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

22
src/Magnum/SceneGraph/AbstractTranslation.h
Unescape View File

@ -81,28 +81,6 @@ class AbstractTranslation: public AbstractTransformation<dimensions, T> {
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<dimensions, T, TranslationType>& translate(const VectorTypeFor<dimensions, TranslationType>& 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<dimensions, T, TranslationType>& resetTransformation() {

40
src/Magnum/SceneGraph/AbstractTranslationRotation2D.h
Unescape View File

@ -69,28 +69,6 @@ template<class T> 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<T>& rotate(Math::Rad<T> 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<T>& resetTransformation() {
@ -105,24 +83,6 @@ template<class T> class AbstractBasicTranslationRotation2D: public AbstractBasic
AbstractBasicTranslation2D<T>::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<T>& translate(const Math::Vector2<T>& vector, TransformationType type) {
AbstractBasicTranslation2D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
#endif
protected:

106
src/Magnum/SceneGraph/AbstractTranslationRotation3D.h
Unescape View File

@ -73,28 +73,6 @@ template<class T> 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<T>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& 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 T> 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<T>& rotateX(Math::Rad<T> 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 T> 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<T>& rotateY(Math::Rad<T> 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 T> 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<T>& rotateZ(Math::Rad<T> 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<T>& resetTransformation() {
@ -259,24 +171,6 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
AbstractBasicTranslation3D<T>::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<T>& translate(const Math::Vector3<T>& vector, TransformationType type) {
AbstractBasicTranslation3D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
#endif
protected:

58
src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h
Unescape View File

@ -69,28 +69,6 @@ template<class T> 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<T>& scale(const Math::Vector2<T>& 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<T>& resetTransformation() {
@ -105,24 +83,6 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
AbstractBasicTranslationRotation2D<T>::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<T>& translate(const Math::Vector2<T>& vector, TransformationType type) {
AbstractBasicTranslationRotation2D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
AbstractBasicTranslationRotationScaling2D<T>& rotate(Math::Rad<T> angle) {
AbstractBasicTranslationRotation2D<T>::rotate(angle);
return *this;
@ -131,24 +91,6 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
AbstractBasicTranslationRotation2D<T>::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<T>& rotate(Math::Rad<T> angle, TransformationType type) {
AbstractBasicTranslationRotation2D<T>::rotate(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
#endif
protected:

112
src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h
Unescape View File

@ -69,28 +69,6 @@ template<class T> 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<T>& scale(const Math::Vector3<T>& 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<T>& resetTransformation() {
@ -105,24 +83,6 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::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<T>& translate(const Math::Vector3<T>& vector, TransformationType type) {
AbstractBasicTranslationRotation3D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& normalizedAxis) {
AbstractBasicTranslationRotation3D<T>::rotate(angle, normalizedAxis);
return *this;
@ -131,24 +91,6 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::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<T>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& normalizedAxis, TransformationType type) {
AbstractBasicTranslationRotation3D<T>::rotate(angle, normalizedAxis, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotateX(Math::Rad<T> angle) {
AbstractBasicTranslationRotation3D<T>::rotateX(angle);
return *this;
@ -157,24 +99,6 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::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<T>& rotateX(Math::Rad<T> angle, TransformationType type) {
AbstractBasicTranslationRotation3D<T>::rotateX(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotateY(Math::Rad<T> angle) {
AbstractBasicTranslationRotation3D<T>::rotateY(angle);
return *this;
@ -183,24 +107,6 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::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<T>& rotateY(Math::Rad<T> angle, TransformationType type) {
AbstractBasicTranslationRotation3D<T>::rotateY(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotateZ(Math::Rad<T> angle) {
AbstractBasicTranslationRotation3D<T>::rotateZ(angle);
return *this;
@ -209,24 +115,6 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::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<T>& rotateZ(Math::Rad<T> angle, TransformationType type) {
AbstractBasicTranslationRotation3D<T>::rotateZ(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
#endif
protected:

66
src/Magnum/SceneGraph/DualComplexTransformation.h
Unescape View File

@ -109,28 +109,6 @@ template<class T> 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<BasicDualComplexTransformation<T>>& transform(const Math::DualComplex<T>& 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 T> class BasicDualComplexTransformation: public AbstractBasicTran
return transformLocalInternal(Math::DualComplex<T>::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<BasicDualComplexTransformation<T>>& translate(const Math::Vector2<T>& 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 T> class BasicDualComplexTransformation: public AbstractBasicTran
return transformLocalInternal(Math::DualComplex<T>::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<BasicDualComplexTransformation<T>>& rotate(Math::Rad<T> 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;

117
src/Magnum/SceneGraph/DualQuaternionTransformation.h
Unescape View File

@ -109,28 +109,6 @@ template<class T> 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<BasicDualQuaternionTransformation<T>>& transform(const Math::DualQuaternion<T>& 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 T> class BasicDualQuaternionTransformation: public AbstractBasicT
return transformLocalInternal(Math::DualQuaternion<T>::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<BasicDualQuaternionTransformation<T>>& translate(const Math::Vector3<T>& 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 T> class BasicDualQuaternionTransformation: public AbstractBasicT
return transformLocalInternal(Math::DualQuaternion<T>::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<BasicDualQuaternionTransformation<T>>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& 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<BasicDualQuaternionTransformation<T>>& rotateX(Math::Rad<T> angle) {
@ -230,69 +164,18 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
Object<BasicDualQuaternionTransformation<T>>& rotateXLocal(Math::Rad<T> angle) {
return rotateLocal(angle, Math::Vector3<T>::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<BasicDualQuaternionTransformation<T>>& rotateX(Math::Rad<T> angle, TransformationType type) {
return rotate(angle, Math::Vector3<T>::xAxis(), type);
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
Object<BasicDualQuaternionTransformation<T>>& rotateY(Math::Rad<T> angle) {
return rotate(angle, Math::Vector3<T>::yAxis());
}
Object<BasicDualQuaternionTransformation<T>>& rotateYLocal(Math::Rad<T> angle) {
return rotateLocal(angle, Math::Vector3<T>::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<BasicDualQuaternionTransformation<T>>& rotateY(Math::Rad<T> angle, TransformationType type) {
return rotate(angle, Math::Vector3<T>::yAxis(), type);
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
Object<BasicDualQuaternionTransformation<T>>& rotateZ(Math::Rad<T> angle) {
return rotate(angle, Math::Vector3<T>::zAxis());
}
Object<BasicDualQuaternionTransformation<T>>& rotateZLocal(Math::Rad<T> angle) {
return rotateLocal(angle, Math::Vector3<T>::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<BasicDualQuaternionTransformation<T>>& rotateZ(Math::Rad<T> angle, TransformationType type) {
return rotate(angle, Math::Vector3<T>::zAxis(), type);
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#endif
#endif
protected:

110
src/Magnum/SceneGraph/MatrixTransformation2D.h
Unescape View File

@ -86,28 +86,6 @@ template<class T> 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<BasicMatrixTransformation2D<T>>& transform(const Math::Matrix3<T>& 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<BasicMatrixTransformation2D<T>>& resetTransformation() {
return setTransformation({});
@ -136,28 +114,6 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
return transformLocal(Math::Matrix3<T>::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<BasicMatrixTransformation2D<T>>& translate(const Math::Vector2<T>& 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 T> class BasicMatrixTransformation2D: public AbstractBasicTransla
return transformLocal(Math::Matrix3<T>::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<BasicMatrixTransformation2D<T>>& rotate(Math::Rad<T> 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 T> class BasicMatrixTransformation2D: public AbstractBasicTransla
return transformLocal(Math::Matrix3<T>::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<BasicMatrixTransformation2D<T>>& scale(const Math::Vector2<T>& 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 T> class BasicMatrixTransformation2D: public AbstractBasicTransla
return transformLocal(Math::Matrix3<T>::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<BasicMatrixTransformation2D<T>>& reflect(const Math::Vector2<T>& 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;

176
src/Magnum/SceneGraph/MatrixTransformation3D.h
Unescape View File

@ -91,28 +91,6 @@ template<class T> 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<BasicMatrixTransformation3D<T>>& transform(const Math::Matrix4<T>& 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 T> class BasicMatrixTransformation3D: public AbstractBasicTransla
return transformLocal(Math::Matrix4<T>::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<BasicMatrixTransformation3D<T>>& translate(const Math::Vector3<T>& 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 T> class BasicMatrixTransformation3D: public AbstractBasicTransla
return transformLocal(Math::Matrix4<T>::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<BasicMatrixTransformation3D<T>>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& 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 T> class BasicMatrixTransformation3D: public AbstractBasicTransla
return transformLocal(Math::Matrix4<T>::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<BasicMatrixTransformation3D<T>>& rotateX(Math::Rad<T> 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 T> class BasicMatrixTransformation3D: public AbstractBasicTransla
return transformLocal(Math::Matrix4<T>::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<BasicMatrixTransformation3D<T>>& rotateY(Math::Rad<T> 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 T> class BasicMatrixTransformation3D: public AbstractBasicTransla
return transformLocal(Math::Matrix4<T>::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<BasicMatrixTransformation3D<T>>& rotateZ(Math::Rad<T> 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 T> class BasicMatrixTransformation3D: public AbstractBasicTransla
return transformLocal(Math::Matrix4<T>::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<BasicMatrixTransformation3D<T>>& scale(const Math::Vector3<T>& 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 T> class BasicMatrixTransformation3D: public AbstractBasicTransla
return transformLocal(Math::Matrix4<T>::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<BasicMatrixTransformation3D<T>>& reflect(const Math::Vector3<T>& 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;

88
src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
Unescape View File

@ -114,28 +114,6 @@ template<class T> 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<BasicRigidMatrixTransformation2D<T>>& transform(const Math::Matrix3<T>& 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 T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix3<T>::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<BasicRigidMatrixTransformation2D<T>>& translate(const Math::Vector2<T>& 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 T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix3<T>::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<BasicRigidMatrixTransformation2D<T>>& rotate(Math::Rad<T> 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 T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix3<T>::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<BasicRigidMatrixTransformation2D<T>>& reflect(const Math::Vector2<T>& 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;

154
src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
Unescape View File

@ -113,28 +113,6 @@ template<class T> 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<BasicRigidMatrixTransformation3D<T>>& transform(const Math::Matrix4<T>& 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 T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix4<T>::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<BasicRigidMatrixTransformation3D<T>>& translate(const Math::Vector3<T>& 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 T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix4<T>::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<BasicRigidMatrixTransformation3D<T>>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& 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 T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix4<T>::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<BasicRigidMatrixTransformation3D<T>>& rotateX(Math::Rad<T> 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 T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix4<T>::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<BasicRigidMatrixTransformation3D<T>>& rotateY(Math::Rad<T> 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 T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix4<T>::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<BasicRigidMatrixTransformation3D<T>>& rotateZ(Math::Rad<T> 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 T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
return transformLocalInternal(Math::Matrix4<T>::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<BasicRigidMatrixTransformation3D<T>>& reflect(const Math::Vector3<T>& 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;

44
src/Magnum/SceneGraph/TranslationTransformation.h
Unescape View File

@ -94,28 +94,6 @@ class TranslationTransformation: public AbstractTranslation<dimensions, T, Trans
return translate(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() instead.
*/
CORRADE_DEPRECATED("use transform() instead") Object<TranslationTransformation<dimensions, T, TranslationType>>& transform(const VectorTypeFor<dimensions, TranslationType>& 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<dimensions, T, Trans
return static_cast<Object<TranslationTransformation<dimensions, T, TranslationType>>&>(*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<TranslationTransformation<dimensions, T, TranslationType>>& translate(const VectorTypeFor<dimensions, TranslationType>& 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;

Write Preview
Loading…
Cancel
Save