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

SceneGraph: ignore deprecated warnings in deprecated functions on GCC. 

Gaah, why GCC can't ignore that by itself -- nobody cares if a
deprecated API uses another deprecated API. Clang does that right.
pull/158/head
Vladimír Vondruš 10 years ago
parent
5d3c0f4c6a
commit
0b3e9cddbc
12 changed files with 364 additions and 0 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. 7
      src/Magnum/SceneGraph/AbstractTranslation.h
  2. 14
      src/Magnum/SceneGraph/AbstractTranslationRotation2D.h
  3. 35
      src/Magnum/SceneGraph/AbstractTranslationRotation3D.h
  4. 21
      src/Magnum/SceneGraph/AbstractTranslationRotationScaling2D.h
  5. 42
      src/Magnum/SceneGraph/AbstractTranslationRotationScaling3D.h
  6. 21
      src/Magnum/SceneGraph/DualComplexTransformation.h
  7. 42
      src/Magnum/SceneGraph/DualQuaternionTransformation.h
  8. 35
      src/Magnum/SceneGraph/MatrixTransformation2D.h
  9. 56
      src/Magnum/SceneGraph/MatrixTransformation3D.h
  10. 28
      src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
  11. 49
      src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
  12. 14
      src/Magnum/SceneGraph/TranslationTransformation.h

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

@ -82,6 +82,10 @@ class AbstractTranslation: public AbstractTransformation<dimensions, T> {
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() or @ref translateLocal() instead.
@ -89,6 +93,9 @@ class AbstractTranslation: public AbstractTransformation<dimensions, T> {
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
#endif
#endif
/* Overloads to remove WTF-factor from method chaining order */

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

@ -70,6 +70,10 @@ template<class T> class AbstractBasicTranslationRotation2D: public AbstractBasic
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -77,6 +81,9 @@ template<class T> class AbstractBasicTranslationRotation2D: public AbstractBasic
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
#endif
#endif
/* Overloads to remove WTF-factor from method chaining order */
@ -94,6 +101,10 @@ 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"
#endif
CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation2D<T>& translate(const Math::Vector2<T>& vector, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -101,6 +112,9 @@ template<class T> class AbstractBasicTranslationRotation2D: public AbstractBasic
AbstractBasicTranslation2D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
#endif

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

@ -74,6 +74,10 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -81,6 +85,9 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
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
#endif
#endif
/**
@ -112,6 +119,10 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateX()
* @deprecated Use @ref rotateX() or @ref rotateXLocal() instead.
@ -119,6 +130,9 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
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
#endif
#endif
/**
@ -150,6 +164,10 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateY()
* @deprecated Use @ref rotateY() or @ref rotateYLocal() instead.
@ -157,6 +175,9 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
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
#endif
#endif
/**
@ -188,6 +209,10 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateZ()
* @deprecated Use @ref rotateZ() or @ref rotateZLocal() instead.
@ -195,6 +220,9 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
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
#endif
#endif
/* Overloads to remove WTF-factor from method chaining order */
@ -212,6 +240,10 @@ 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"
#endif
CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotation3D<T>& translate(const Math::Vector3<T>& vector, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -219,6 +251,9 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
AbstractBasicTranslation3D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
#endif

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

@ -70,6 +70,10 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief scale()
* @deprecated Use @ref scale() or @ref scaleLocal() instead.
@ -77,6 +81,9 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
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
#endif
#endif
/* Overloads to remove WTF-factor from method chaining order */
@ -94,6 +101,10 @@ 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"
#endif
CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotationScaling2D<T>& translate(const Math::Vector2<T>& vector, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -101,6 +112,9 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
AbstractBasicTranslationRotation2D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
AbstractBasicTranslationRotationScaling2D<T>& rotate(Math::Rad<T> angle) {
AbstractBasicTranslationRotation2D<T>::rotate(angle);
@ -111,6 +125,10 @@ 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"
#endif
CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotationScaling2D<T>& rotate(Math::Rad<T> angle, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -118,6 +136,9 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
AbstractBasicTranslationRotation2D<T>::rotate(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
#endif

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

@ -70,6 +70,10 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief scale()
* @deprecated Use @ref scale() or @ref scaleLocal() instead.
@ -80,6 +84,9 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
#endif
return type == TransformationType::Global ? scale(vector) : scaleLocal(vector);
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
/* Overloads to remove WTF-factor from method chaining order */
@ -97,6 +104,10 @@ 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"
#endif
CORRADE_DEPRECATED("use translate() or translateLocal() instead") AbstractBasicTranslationRotationScaling3D<T>& translate(const Math::Vector3<T>& vector, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -104,6 +115,9 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::translate(vector, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& normalizedAxis) {
AbstractBasicTranslationRotation3D<T>::rotate(angle, normalizedAxis);
@ -114,6 +128,10 @@ 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"
#endif
CORRADE_DEPRECATED("use rotate() or rotateLocal() instead") AbstractBasicTranslationRotationScaling3D<T>& rotate(Math::Rad<T> angle, const Math::Vector3<T>& normalizedAxis, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -121,6 +139,9 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::rotate(angle, normalizedAxis, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotateX(Math::Rad<T> angle) {
AbstractBasicTranslationRotation3D<T>::rotateX(angle);
@ -131,6 +152,10 @@ 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"
#endif
CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") AbstractBasicTranslationRotationScaling3D<T>& rotateX(Math::Rad<T> angle, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -138,6 +163,9 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::rotateX(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotateY(Math::Rad<T> angle) {
AbstractBasicTranslationRotation3D<T>::rotateY(angle);
@ -148,6 +176,10 @@ 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"
#endif
CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") AbstractBasicTranslationRotationScaling3D<T>& rotateY(Math::Rad<T> angle, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -155,6 +187,9 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::rotateY(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
AbstractBasicTranslationRotationScaling3D<T>& rotateZ(Math::Rad<T> angle) {
AbstractBasicTranslationRotation3D<T>::rotateZ(angle);
@ -165,6 +200,10 @@ 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"
#endif
CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") AbstractBasicTranslationRotationScaling3D<T>& rotateZ(Math::Rad<T> angle, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
@ -172,6 +211,9 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
AbstractBasicTranslationRotation3D<T>::rotateZ(angle, type);
return *this;
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
#endif

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

@ -110,6 +110,10 @@ template<class T> class BasicDualComplexTransformation: public AbstractBasicTran
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief transform()
* @deprecated Use @ref transform() or @ref transformLocal() instead.
@ -117,6 +121,9 @@ template<class T> class BasicDualComplexTransformation: public AbstractBasicTran
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
#endif
#endif
/**
@ -143,6 +150,10 @@ template<class T> class BasicDualComplexTransformation: public AbstractBasicTran
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() or @ref translateLocal() instead.
@ -150,6 +161,9 @@ template<class T> class BasicDualComplexTransformation: public AbstractBasicTran
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
#endif
#endif
/**
@ -175,6 +189,10 @@ template<class T> class BasicDualComplexTransformation: public AbstractBasicTran
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -182,6 +200,9 @@ template<class T> class BasicDualComplexTransformation: public AbstractBasicTran
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
#endif
#endif
protected:

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

@ -110,6 +110,10 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief transform()
* @deprecated Use @ref transform() or @ref transformLocal() instead.
@ -117,6 +121,9 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
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
#endif
#endif
/**
@ -142,6 +149,10 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() or @ref translateLocal() instead.
@ -149,6 +160,9 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
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
#endif
#endif
/**
@ -177,6 +191,10 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -184,6 +202,9 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
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
#endif
#endif
/* Overloads to remove WTF-factor from method chaining order */
@ -195,12 +216,19 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
return rotateLocal(angle, Math::Vector3<T>::xAxis());
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
CORRADE_DEPRECATED("use rotateX() or rotateXLocal() instead") Object<BasicDualQuaternionTransformation<T>>& rotateX(Math::Rad<T> angle, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
#endif
return rotate(angle, Math::Vector3<T>::xAxis(), type);
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
Object<BasicDualQuaternionTransformation<T>>& rotateY(Math::Rad<T> angle) {
return rotate(angle, Math::Vector3<T>::yAxis());
@ -209,12 +237,19 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
return rotateLocal(angle, Math::Vector3<T>::yAxis());
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
CORRADE_DEPRECATED("use rotateY() or rotateYLocal() instead") Object<BasicDualQuaternionTransformation<T>>& rotateY(Math::Rad<T> angle, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
#endif
return rotate(angle, Math::Vector3<T>::yAxis(), type);
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
Object<BasicDualQuaternionTransformation<T>>& rotateZ(Math::Rad<T> angle) {
return rotate(angle, Math::Vector3<T>::zAxis());
@ -223,12 +258,19 @@ template<class T> class BasicDualQuaternionTransformation: public AbstractBasicT
return rotateLocal(angle, Math::Vector3<T>::zAxis());
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
CORRADE_DEPRECATED("use rotateZ() or rotateZLocal() instead") Object<BasicDualQuaternionTransformation<T>>& rotateZ(Math::Rad<T> angle, TransformationType type) {
#ifdef _MSC_VER
#pragma warning(suppress: 4996)
#endif
return rotate(angle, Math::Vector3<T>::zAxis(), type);
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif
#endif

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

@ -87,6 +87,10 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief transform()
* @deprecated Use @ref transform() or @ref transformLocal() instead.
@ -94,6 +98,9 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
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
#endif
#endif
/** @copydoc AbstractTranslationRotationScaling2D::resetTransformation() */
@ -125,6 +132,10 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() or @ref translateLocal() instead.
@ -132,6 +143,9 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -158,6 +172,10 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -165,6 +183,9 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -191,6 +212,10 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief scale()
* @deprecated Use @ref scale() or @ref scaleLocal() instead.
@ -198,6 +223,9 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -226,6 +254,10 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief reflect()
* @deprecated Use @ref reflect() or @ref reflectLocal() instead.
@ -233,6 +265,9 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
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
#endif
#endif
protected:

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

@ -92,6 +92,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief transform()
* @deprecated Use @ref transform() or @ref transformLocal() instead.
@ -99,6 +103,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -125,6 +132,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() or @ref translateLocal() instead.
@ -132,6 +143,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -161,6 +175,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -168,6 +186,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -194,6 +215,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateX()
* @deprecated Use @ref rotateX() or @ref rotateXLocal() instead.
@ -201,6 +226,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -227,6 +255,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateY()
* @deprecated Use @ref rotateY() or @ref rotateYLocal() instead.
@ -234,6 +266,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -260,6 +295,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateZ()
* @deprecated Use @ref rotateZ() or @ref rotateZLocal() instead.
@ -267,6 +306,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -293,6 +335,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief scale()
* @deprecated Use @ref scale() or @ref scaleLocal() instead.
@ -300,6 +346,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
/**
@ -327,6 +376,10 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief reflect()
* @deprecated Use @ref reflect() or @ref reflectLocal() instead.
@ -334,6 +387,9 @@ template<class T> class BasicMatrixTransformation3D: public AbstractBasicTransla
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
#endif
#endif
protected:

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

@ -115,6 +115,10 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief transform()
* @deprecated Use @ref transform() or @ref transformLocal() instead.
@ -122,6 +126,9 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
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
#endif
#endif
/**
@ -148,6 +155,10 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() or @ref translateLocal() instead.
@ -155,6 +166,9 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
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
#endif
#endif
/**
@ -182,6 +196,10 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -189,6 +207,9 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
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
#endif
#endif
/**
@ -216,6 +237,10 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief reflect()
* @deprecated Use @ref reflect() or @ref reflectLocal() instead.
@ -223,6 +248,9 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
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
#endif
#endif
protected:

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

@ -114,6 +114,10 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief transform()
* @deprecated Use @ref transform() or @ref transformLocal() instead.
@ -121,6 +125,9 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
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
#endif
#endif
/**
@ -147,6 +154,10 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() or @ref translateLocal() instead.
@ -154,6 +165,9 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
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
#endif
#endif
/**
@ -184,6 +198,10 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotate()
* @deprecated Use @ref rotate() or @ref rotateLocal() instead.
@ -191,6 +209,9 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
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
#endif
#endif
/**
@ -217,6 +238,10 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateX()
* @deprecated Use @ref rotateX() or @ref rotateXLocal() instead.
@ -224,6 +249,9 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
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
#endif
#endif
/**
@ -250,6 +278,10 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateY()
* @deprecated Use @ref rotateY() or @ref rotateYLocal() instead.
@ -257,6 +289,9 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
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
#endif
#endif
/**
@ -283,6 +318,10 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief rotateZ()
* @deprecated Use @ref rotateZ() or @ref rotateZLocal() instead.
@ -290,6 +329,9 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
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
#endif
#endif
/**
@ -317,6 +359,10 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief reflect()
* @deprecated Use @ref reflect() or @ref reflectLocal() instead.
@ -324,6 +370,9 @@ template<class T> class BasicRigidMatrixTransformation3D: public AbstractBasicTr
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
#endif
#endif
protected:

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

@ -95,6 +95,10 @@ class TranslationTransformation: public AbstractTranslation<dimensions, T, Trans
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief transform()
* @deprecated Use @ref transform() instead.
@ -102,6 +106,9 @@ class TranslationTransformation: public AbstractTranslation<dimensions, T, Trans
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
#endif
#endif
/**
@ -119,6 +126,10 @@ class TranslationTransformation: public AbstractTranslation<dimensions, T, Trans
}
#ifdef MAGNUM_BUILD_DEPRECATED
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/**
* @copybrief translate()
* @deprecated Use @ref translate() instead.
@ -126,6 +137,9 @@ class TranslationTransformation: public AbstractTranslation<dimensions, T, Trans
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
#endif
#endif
protected:

Write Preview
Loading…
Cancel
Save