From b2c353bf21cb8da37e68431434b0841bf8ad3e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 20 Sep 2023 17:26:30 +0200 Subject: [PATCH] Math: use Math typedefs from Magnum.h where possible in tests. Instead of defining the same types and vaguely risking little differences. Typedefs that don't exist in Magnum.h (such as integer quaternions) and typedefs that differ from Magnum.h (such as using Vector<4, T> instead of Vector4) stay as typedefs, to make it clear what *deliberately* differs and what not. Typedefs that didn't conflict with the template types in Math (such as Vector3us) are removed entirely, as the typedef from Magnum.h can be used directly in that case, without any `using`. --- src/Magnum/Math/Algorithms/Test/QrTest.cpp | 6 +-- src/Magnum/Math/Algorithms/Test/SvdTest.cpp | 12 +++--- src/Magnum/Math/Test/AngleTest.cpp | 8 ++-- src/Magnum/Math/Test/BezierTest.cpp | 10 ++--- src/Magnum/Math/Test/ColorTest.cpp | 29 +++++--------- src/Magnum/Math/Test/ComplexTest.cpp | 12 +++--- .../Math/Test/ConfigurationValueTest.cpp | 40 +++++++++---------- src/Magnum/Math/Test/CubicHermiteTest.cpp | 18 ++++----- src/Magnum/Math/Test/DistanceTest.cpp | 8 ++-- src/Magnum/Math/Test/DualComplexTest.cpp | 12 +++--- src/Magnum/Math/Test/DualQuaternionTest.cpp | 12 +++--- src/Magnum/Math/Test/DualTest.cpp | 8 ++-- src/Magnum/Math/Test/FrustumTest.cpp | 7 ++-- src/Magnum/Math/Test/FunctionsBatchTest.cpp | 7 ++-- src/Magnum/Math/Test/FunctionsTest.cpp | 15 +++---- src/Magnum/Math/Test/HalfTest.cpp | 2 +- src/Magnum/Math/Test/IntersectionTest.cpp | 19 ++++----- src/Magnum/Math/Test/Matrix3Test.cpp | 12 +++--- src/Magnum/Math/Test/Matrix4Test.cpp | 20 +++++----- src/Magnum/Math/Test/MatrixTest.cpp | 10 ++--- src/Magnum/Math/Test/PackingBatchTest.cpp | 15 ++----- src/Magnum/Math/Test/PackingTest.cpp | 6 +-- src/Magnum/Math/Test/QuaternionTest.cpp | 14 +++---- src/Magnum/Math/Test/RangeTest.cpp | 11 ++--- src/Magnum/Math/Test/UnitTest.cpp | 2 +- src/Magnum/Math/Test/Vector2Test.cpp | 4 +- src/Magnum/Math/Test/Vector3Test.cpp | 5 +-- src/Magnum/Math/Test/Vector4Test.cpp | 7 ++-- src/Magnum/Math/Test/VectorTest.cpp | 4 +- 29 files changed, 149 insertions(+), 186 deletions(-) diff --git a/src/Magnum/Math/Algorithms/Test/QrTest.cpp b/src/Magnum/Math/Algorithms/Test/QrTest.cpp index 39cad2ab5..83140afbc 100644 --- a/src/Magnum/Math/Algorithms/Test/QrTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/QrTest.cpp @@ -41,9 +41,9 @@ struct QrTest: TestSuite::Tester { using namespace Math::Literals; -typedef Matrix3x3 Matrix3x3; -typedef Vector3 Vector3; -typedef Matrix4 Matrix4; +using Magnum::Matrix3x3; +using Magnum::Vector3; +using Magnum::Matrix4; QrTest::QrTest() { addTests({&QrTest::test, diff --git a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp index 3e4aea4f9..2a4ed82ae 100644 --- a/src/Magnum/Math/Algorithms/Test/SvdTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/SvdTest.cpp @@ -97,9 +97,9 @@ template void SvdTest::test() { } void SvdTest::decomposeRotationScaling() { - typedef Math::Matrix4 Matrix4; - typedef Math::Matrix3x3 Matrix3x3; - typedef Math::Vector3 Vector3; + using Magnum::Matrix4; + using Magnum::Matrix3x3; + using Magnum::Vector3; using namespace Math::Literals; @@ -119,9 +119,9 @@ void SvdTest::decomposeRotationScaling() { } void SvdTest::decomposeRotationShear() { - typedef Math::Matrix4 Matrix4; - typedef Math::Matrix3x3 Matrix3x3; - typedef Math::Vector3 Vector3; + using Magnum::Matrix4; + using Magnum::Matrix3x3; + using Magnum::Vector3; using namespace Math::Literals; diff --git a/src/Magnum/Math/Test/AngleTest.cpp b/src/Magnum/Math/Test/AngleTest.cpp index 96be720c9..14d948a07 100644 --- a/src/Magnum/Math/Test/AngleTest.cpp +++ b/src/Magnum/Math/Test/AngleTest.cpp @@ -61,10 +61,10 @@ struct AngleTest: TestSuite::Tester { #endif }; -typedef Math::Deg Deg; -typedef Math::Rad Rad; -typedef Math::Deg Degd; -typedef Math::Rad Radd; +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Degd; +using Magnum::Radd; using namespace Literals; diff --git a/src/Magnum/Math/Test/BezierTest.cpp b/src/Magnum/Math/Test/BezierTest.cpp index b63b46c8e..349ff82f3 100644 --- a/src/Magnum/Math/Test/BezierTest.cpp +++ b/src/Magnum/Math/Test/BezierTest.cpp @@ -56,13 +56,11 @@ template<> struct BezierConverter<2, 2, Float, QBezier2D> { namespace Test { namespace { -typedef Math::Vector2 Vector2; -typedef Math::Vector2 Vector2d; +using Magnum::Vector2; typedef Math::Bezier<1, 2, Float> LinearBezier2D; -typedef Math::QuadraticBezier2D QuadraticBezier2D; -typedef Math::QuadraticBezier2D QuadraticBezier2Dd; -typedef Math::CubicBezier2D CubicBezier2D; -typedef Math::CubicHermite2D CubicHermite2D; +using Magnum::QuadraticBezier2D; +using Magnum::CubicBezier2D; +using Magnum::CubicHermite2D; struct BezierTest: TestSuite::Tester { explicit BezierTest(); diff --git a/src/Magnum/Math/Test/ColorTest.cpp b/src/Magnum/Math/Test/ColorTest.cpp index d2dbaf329..adf57a9ce 100644 --- a/src/Magnum/Math/Test/ColorTest.cpp +++ b/src/Magnum/Math/Test/ColorTest.cpp @@ -155,25 +155,16 @@ struct ColorTest: TestSuite::Tester { #endif }; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3; -typedef Math::Vector3 Vector3ub; -typedef Math::Vector3 Vector3us; -typedef Math::Color3 Color3; -typedef Math::Color3 Color3ub; -typedef Math::Color3 Color3us; - -typedef Math::Vector4 Vector4; -typedef Math::Vector4 Vector4ub; -typedef Math::Vector4 Vector4h; -typedef Math::Color4 Color4; -typedef Math::Color4 Color4h; -typedef Math::Color4 Color4ub; -typedef Math::Color4 Color4us; - -typedef Math::ColorHsv ColorHsv; - -typedef Math::Deg Deg; +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Color3; + +using Magnum::Vector4; +using Magnum::Color4; + +using Magnum::ColorHsv; + +using Magnum::Deg; using namespace Literals; diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp index 6af9268fc..438c53c68 100644 --- a/src/Magnum/Math/Test/ComplexTest.cpp +++ b/src/Magnum/Math/Test/ComplexTest.cpp @@ -159,12 +159,12 @@ ComplexTest::ComplexTest() { &ComplexTest::debug}); } -typedef Math::Deg Deg; -typedef Math::Rad Rad; -typedef Math::Complex Complex; -typedef Math::Vector2 Vector2; -typedef Math::Matrix3 Matrix3; -typedef Math::Matrix2x2 Matrix2x2; +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Complex; +using Magnum::Vector2; +using Magnum::Matrix3; +using Magnum::Matrix2x2; using namespace Math::Literals; diff --git a/src/Magnum/Math/Test/ConfigurationValueTest.cpp b/src/Magnum/Math/Test/ConfigurationValueTest.cpp index be810a0e1..2d845a590 100644 --- a/src/Magnum/Math/Test/ConfigurationValueTest.cpp +++ b/src/Magnum/Math/Test/ConfigurationValueTest.cpp @@ -84,7 +84,7 @@ ConfigurationValueTest::ConfigurationValueTest() { } void ConfigurationValueTest::deg() { - typedef Math::Deg Deg; + using Magnum::Deg; Utility::Configuration c; @@ -97,7 +97,7 @@ void ConfigurationValueTest::deg() { } void ConfigurationValueTest::rad() { - typedef Math::Rad Rad; + using Magnum::Rad; Utility::Configuration c; @@ -131,7 +131,7 @@ void ConfigurationValueTest::vector() { } void ConfigurationValueTest::vector2() { - typedef Math::Vector2 Vector2; + using Magnum::Vector2; Utility::Configuration c; @@ -144,7 +144,7 @@ void ConfigurationValueTest::vector2() { } void ConfigurationValueTest::vector3() { - typedef Math::Vector3 Vector3; + using Magnum::Vector3; Utility::Configuration c; @@ -157,7 +157,7 @@ void ConfigurationValueTest::vector3() { } void ConfigurationValueTest::vector4() { - typedef Math::Vector4 Vector4; + using Magnum::Vector4; Utility::Configuration c; @@ -170,8 +170,8 @@ void ConfigurationValueTest::vector4() { } void ConfigurationValueTest::color() { - typedef Math::Color3 Color3; - typedef Math::Color4 Color4; + using Magnum::Color3; + using Magnum::Color4; Utility::Configuration c; @@ -191,8 +191,8 @@ void ConfigurationValueTest::color() { } void ConfigurationValueTest::rectangularMatrix() { - typedef Math::Vector4 Vector4; - typedef Math::Matrix3x4 Matrix3x4; + using Magnum::Vector4; + using Magnum::Matrix3x4; Matrix3x4 m(Vector4(3.0f, 5.0f, 8.0f, 4.0f), Vector4(4.0f, 4.0f, 7.0f, 3.125f), @@ -221,8 +221,8 @@ void ConfigurationValueTest::rectangularMatrix() { } void ConfigurationValueTest::matrix() { - typedef Math::Vector4 Vector4; - typedef Math::Matrix4x4 Matrix4x4; + using Magnum::Vector4; + using Magnum::Matrix4x4; Utility::Configuration c; @@ -238,7 +238,7 @@ void ConfigurationValueTest::matrix() { } void ConfigurationValueTest::matrix3() { - typedef Math::Matrix3 Matrix3; + using Magnum::Matrix3; Utility::Configuration c; @@ -253,7 +253,7 @@ void ConfigurationValueTest::matrix3() { } void ConfigurationValueTest::matrix4() { - typedef Math::Matrix4 Matrix4; + using Magnum::Matrix4; Utility::Configuration c; @@ -269,7 +269,7 @@ void ConfigurationValueTest::matrix4() { } void ConfigurationValueTest::complex() { - typedef Math::Complex Complex; + using Magnum::Complex; Utility::Configuration c; @@ -290,7 +290,7 @@ void ConfigurationValueTest::complex() { } void ConfigurationValueTest::dualComplex() { - typedef Math::DualComplex DualComplex; + using Magnum::DualComplex; Utility::Configuration c; @@ -311,7 +311,7 @@ void ConfigurationValueTest::dualComplex() { } void ConfigurationValueTest::quaternion() { - typedef Math::Quaternion Quaternion; + using Magnum::Quaternion; Utility::Configuration c; @@ -332,7 +332,7 @@ void ConfigurationValueTest::quaternion() { } void ConfigurationValueTest::dualQuaternion() { - typedef Math::DualQuaternion DualQuaternion; + using Magnum::DualQuaternion; Utility::Configuration c; @@ -353,7 +353,7 @@ void ConfigurationValueTest::dualQuaternion() { } void ConfigurationValueTest::range() { - typedef Math::Range2D Range2D; + using Magnum::Range2D; Utility::Configuration c; @@ -366,8 +366,8 @@ void ConfigurationValueTest::range() { } void ConfigurationValueTest::bezier() { - typedef Math::Vector2 Vector2; - typedef Math::CubicBezier2D CubicBezier2D; + using Magnum::Vector2; + using Magnum::CubicBezier2D; Utility::Configuration c; diff --git a/src/Magnum/Math/Test/CubicHermiteTest.cpp b/src/Magnum/Math/Test/CubicHermiteTest.cpp index 6fee39860..0e83dd9b4 100644 --- a/src/Magnum/Math/Test/CubicHermiteTest.cpp +++ b/src/Magnum/Math/Test/CubicHermiteTest.cpp @@ -209,15 +209,15 @@ CubicHermiteTest::CubicHermiteTest() { using namespace Math::Literals; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3; -typedef Math::Complex Complex; -typedef Math::Quaternion Quaternion; -typedef Math::CubicBezier2D CubicBezier2D; -typedef Math::CubicHermite1D CubicHermite1D; -typedef Math::CubicHermite2D CubicHermite2D; -typedef Math::CubicHermiteComplex CubicHermiteComplex; -typedef Math::CubicHermiteQuaternion CubicHermiteQuaternion; +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Complex; +using Magnum::Quaternion; +using Magnum::CubicBezier2D; +using Magnum::CubicHermite1D; +using Magnum::CubicHermite2D; +using Magnum::CubicHermiteComplex; +using Magnum::CubicHermiteQuaternion; void CubicHermiteTest::constructScalar() { constexpr CubicHermite1D a{2.0f, -2.0f, -0.5f}; diff --git a/src/Magnum/Math/Test/DistanceTest.cpp b/src/Magnum/Math/Test/DistanceTest.cpp index 651297ae1..faf4b18bb 100644 --- a/src/Magnum/Math/Test/DistanceTest.cpp +++ b/src/Magnum/Math/Test/DistanceTest.cpp @@ -50,10 +50,10 @@ struct DistanceTest: TestSuite::Tester { void pointPlaneNormalizedNotNormalized(); }; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3; -typedef Math::Vector4 Vector4; -typedef Math::Constants Constants; +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Vector4; +using Magnum::Constants; DistanceTest::DistanceTest() { addTests({&DistanceTest::pointPoint2D, diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp index 46d763992..237464651 100644 --- a/src/Magnum/Math/Test/DualComplexTest.cpp +++ b/src/Magnum/Math/Test/DualComplexTest.cpp @@ -103,13 +103,13 @@ struct DualComplexTest: TestSuite::Tester { using namespace Math::Literals; -typedef Math::Deg Deg; -typedef Math::Rad Rad; -typedef Math::Complex Complex; +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Complex; typedef Math::Dual Dual; -typedef Math::DualComplex DualComplex; -typedef Math::Matrix3 Matrix3; -typedef Math::Vector2 Vector2; +using Magnum::DualComplex; +using Magnum::Matrix3; +using Magnum::Vector2; DualComplexTest::DualComplexTest() { addTests({&DualComplexTest::construct, diff --git a/src/Magnum/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp index 7db262982..e628de10e 100644 --- a/src/Magnum/Math/Test/DualQuaternionTest.cpp +++ b/src/Magnum/Math/Test/DualQuaternionTest.cpp @@ -110,13 +110,13 @@ struct DualQuaternionTest: TestSuite::Tester { void debug(); }; -typedef Math::Deg Deg; -typedef Math::Rad Rad; +using Magnum::Deg; +using Magnum::Rad; typedef Math::Dual Dual; -typedef Math::Matrix4 Matrix4; -typedef Math::DualQuaternion DualQuaternion; -typedef Math::Quaternion Quaternion; -typedef Math::Vector3 Vector3; +using Magnum::Matrix4; +using Magnum::DualQuaternion; +using Magnum::Quaternion; +using Magnum::Vector3; using namespace Literals; diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index 18d1ad33c..4863693e4 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -69,11 +69,11 @@ struct DualTest: TestSuite::Tester { }; typedef Math::Dual Dual; -typedef Math::Vector2 Vector2; +using Magnum::Vector2; typedef Math::Dual DualVector2; -typedef Math::Deg Deg; -typedef Math::Rad Rad; -typedef Math::Constants Constants; +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Constants; using namespace Literals; diff --git a/src/Magnum/Math/Test/FrustumTest.cpp b/src/Magnum/Math/Test/FrustumTest.cpp index 63c85f923..dd96a486c 100644 --- a/src/Magnum/Math/Test/FrustumTest.cpp +++ b/src/Magnum/Math/Test/FrustumTest.cpp @@ -87,10 +87,9 @@ struct FrustumTest: TestSuite::Tester { void debug(); }; -typedef Math::Vector4 Vector4; -typedef Math::Matrix4 Matrix4; -typedef Math::Frustum Frustum; -typedef Math::Frustum Frustumd; +using Magnum::Vector4; +using Magnum::Matrix4; +using Magnum::Frustum; FrustumTest::FrustumTest() { addTests({&FrustumTest::construct, diff --git a/src/Magnum/Math/Test/FunctionsBatchTest.cpp b/src/Magnum/Math/Test/FunctionsBatchTest.cpp index 588caefd9..fe043cb89 100644 --- a/src/Magnum/Math/Test/FunctionsBatchTest.cpp +++ b/src/Magnum/Math/Test/FunctionsBatchTest.cpp @@ -51,10 +51,9 @@ struct FunctionsBatchTest: TestSuite::Tester { using namespace Literals; -typedef Math::Constants Constants; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3i; -typedef Math::Vector3 Vector3; +using Magnum::Constants; +using Magnum::Vector2; +using Magnum::Vector3; FunctionsBatchTest::FunctionsBatchTest() { addTests({&FunctionsBatchTest::isInf, diff --git a/src/Magnum/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp index 780fca20f..d8a110288 100644 --- a/src/Magnum/Math/Test/FunctionsTest.cpp +++ b/src/Magnum/Math/Test/FunctionsTest.cpp @@ -90,15 +90,12 @@ struct FunctionsTest: TestSuite::Tester { using namespace Literals; -typedef Math::Constants Constants; -typedef Math::Deg Deg; -typedef Math::Rad Rad; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3; -typedef Math::Vector4 Vector4; -typedef Math::Vector3 Vector3ub; -typedef Math::Vector3 Vector3b; -typedef Math::Vector3 Vector3i; +using Magnum::Constants; +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Vector4; FunctionsTest::FunctionsTest() { addRepeatedTests({ diff --git a/src/Magnum/Math/Test/HalfTest.cpp b/src/Magnum/Math/Test/HalfTest.cpp index 163595a36..896d28886 100644 --- a/src/Magnum/Math/Test/HalfTest.cpp +++ b/src/Magnum/Math/Test/HalfTest.cpp @@ -76,7 +76,7 @@ struct HalfTest: TestSuite::Tester { #endif }; -typedef Math::Constants Constants; +using Magnum::Constants; using namespace Literals; diff --git a/src/Magnum/Math/Test/IntersectionTest.cpp b/src/Magnum/Math/Test/IntersectionTest.cpp index 47d5e3e96..1c3f3a8d9 100644 --- a/src/Magnum/Math/Test/IntersectionTest.cpp +++ b/src/Magnum/Math/Test/IntersectionTest.cpp @@ -59,17 +59,14 @@ struct IntersectionTest: TestSuite::Tester { void aabbCone(); }; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3; -typedef Math::Vector3 Vector3d; -typedef Math::Vector4 Vector4; -typedef Math::Matrix4 Matrix4; -typedef Math::Matrix4 Matrix4d; -typedef Math::Frustum Frustum; -typedef Math::Constants Constants; -typedef Math::Range3D Range3D; -typedef Math::Rad Rad; -typedef Math::Rad Radd; +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Vector4; +using Magnum::Matrix4; +using Magnum::Frustum; +using Magnum::Constants; +using Magnum::Range3D; +using Magnum::Rad; IntersectionTest::IntersectionTest() { addTests({&IntersectionTest::pointCircle, diff --git a/src/Magnum/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp index 3ac4a3e76..f46b8bbe0 100644 --- a/src/Magnum/Math/Test/Matrix3Test.cpp +++ b/src/Magnum/Math/Test/Matrix3Test.cpp @@ -104,13 +104,13 @@ struct Matrix3Test: TestSuite::Tester { void debug(); }; -typedef Math::Deg Deg; -typedef Math::Matrix2x2 Matrix2x2; -typedef Math::Matrix2x4 Matrix2x4; -typedef Math::Matrix3 Matrix3; +using Magnum::Deg; +using Magnum::Matrix2x2; +using Magnum::Matrix2x4; +using Magnum::Matrix3; typedef Math::Matrix3 Matrix3i; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3; +using Magnum::Vector2; +using Magnum::Vector3; typedef Math::Vector<4, Float> Vector4; /* to avoid having to include Vector4 */ Matrix3Test::Matrix3Test() { diff --git a/src/Magnum/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp index 57b7a8e12..345efbe17 100644 --- a/src/Magnum/Math/Test/Matrix4Test.cpp +++ b/src/Magnum/Math/Test/Matrix4Test.cpp @@ -124,17 +124,17 @@ struct Matrix4Test: TestSuite::Tester { void debug(); }; -typedef Math::Deg Deg; -typedef Math::Rad Rad; -typedef Math::Matrix2x2 Matrix2x2; -typedef Math::Matrix2x3 Matrix2x3; -typedef Math::Matrix3x3 Matrix3x3; -typedef Math::Matrix4 Matrix4; +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Matrix2x2; +using Magnum::Matrix2x3; +using Magnum::Matrix3x3; +using Magnum::Matrix4; typedef Math::Matrix4 Matrix4i; -typedef Math::Vector2 Vector2; -typedef Math::Vector3 Vector3; -typedef Math::Vector4 Vector4; -typedef Math::Constants Constants; +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Vector4; +using Magnum::Constants; Matrix4Test::Matrix4Test() { addTests({&Matrix4Test::construct, diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index fb1c9f399..4f9b2db15 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -89,16 +89,16 @@ struct MatrixTest: TestSuite::Tester { void debug(); }; -typedef Math::Matrix2x2 Matrix2x2; -typedef Math::Matrix2x3 Matrix2x3; -typedef Math::Matrix3x3 Matrix3x3; -typedef Math::Matrix4x4 Matrix4x4; +using Magnum::Matrix2x2; +using Magnum::Matrix2x3; +using Magnum::Matrix3x3; +using Magnum::Matrix4x4; typedef Math::Matrix4x4 Matrix4x4i; typedef Math::Vector<2, Float> Vector2; typedef Math::Vector<3, Float> Vector3; typedef Math::Vector<4, Float> Vector4; typedef Math::Vector<4, Int> Vector4i; -typedef Math::Constants Constants; +using Magnum::Constants; MatrixTest::MatrixTest() { addTests({&MatrixTest::construct, diff --git a/src/Magnum/Math/Test/PackingBatchTest.cpp b/src/Magnum/Math/Test/PackingBatchTest.cpp index 6c5398077..9bb07eeaa 100644 --- a/src/Magnum/Math/Test/PackingBatchTest.cpp +++ b/src/Magnum/Math/Test/PackingBatchTest.cpp @@ -155,17 +155,10 @@ PackingBatchTest::PackingBatchTest() { &PackingBatchTest::assertionsCast}); } -typedef Math::Constants Constants; -typedef Math::Vector2 Vector2ub; -typedef Math::Vector2 Vector2us; -typedef Math::Vector2 Vector2b; -typedef Math::Vector2 Vector2s; -typedef Math::Vector2 Vector2; -typedef Math::Vector2 Vector2ui; -typedef Math::Vector2 Vector2i; -typedef Math::Vector3 Vector3; -typedef Math::Vector4 Vector4us; -typedef Math::Vector4 Vector4; +using Magnum::Constants; +using Magnum::Vector2; +using Magnum::Vector3; +using Magnum::Vector4; void PackingBatchTest::unpackUnsignedByte() { /* Test data adapted from PackingTest */ diff --git a/src/Magnum/Math/Test/PackingTest.cpp b/src/Magnum/Math/Test/PackingTest.cpp index 437253b60..cb340d94a 100644 --- a/src/Magnum/Math/Test/PackingTest.cpp +++ b/src/Magnum/Math/Test/PackingTest.cpp @@ -53,10 +53,8 @@ struct PackingTest: TestSuite::Tester { using namespace Literals; -typedef Math::Rad Rad; -typedef Math::Vector3 Vector3; -typedef Math::Vector3 Vector3ub; -typedef Math::Vector3 Vector3b; +using Magnum::Rad; +using Magnum::Vector3; PackingTest::PackingTest() { addTests({&PackingTest::bitMax, diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp index ee2938a75..793de30de 100644 --- a/src/Magnum/Math/Test/QuaternionTest.cpp +++ b/src/Magnum/Math/Test/QuaternionTest.cpp @@ -129,13 +129,13 @@ struct QuaternionTest: TestSuite::Tester { void debug(); }; -typedef Math::Deg Deg; -typedef Math::Rad Rad; -typedef Math::Matrix<3, Float> Matrix3x3; -typedef Math::Matrix4 Matrix4; -typedef Math::Quaternion Quaternion; -typedef Math::Vector3 Vector3; -typedef Math::Vector4 Vector4; +using Magnum::Deg; +using Magnum::Rad; +using Magnum::Matrix3x3; +using Magnum::Matrix4; +using Magnum::Quaternion; +using Magnum::Vector3; +using Magnum::Vector4; using namespace Math::Literals; diff --git a/src/Magnum/Math/Test/RangeTest.cpp b/src/Magnum/Math/Test/RangeTest.cpp index 76e4bd3b2..820d990fc 100644 --- a/src/Magnum/Math/Test/RangeTest.cpp +++ b/src/Magnum/Math/Test/RangeTest.cpp @@ -146,14 +146,9 @@ struct RangeTest: TestSuite::Tester { void debug(); }; -typedef Math::Range1D Range1D; -typedef Math::Range2D Range2D; -typedef Math::Range3D Range3D; -typedef Math::Range1D Range1Di; -typedef Math::Range2D Range2Di; -typedef Math::Range3D Range3Di; -typedef Vector2 Vector2i; -typedef Vector3 Vector3i; +using Magnum::Range1D; +using Magnum::Range2D; +using Magnum::Range3D; RangeTest::RangeTest() { addTests({&RangeTest::construct, diff --git a/src/Magnum/Math/Test/UnitTest.cpp b/src/Magnum/Math/Test/UnitTest.cpp index a60bdf5a7..630abbed9 100644 --- a/src/Magnum/Math/Test/UnitTest.cpp +++ b/src/Magnum/Math/Test/UnitTest.cpp @@ -67,7 +67,7 @@ UnitTest::UnitTest() { template struct Sec_; typedef Unit Sec; typedef Unit Seci; -typedef Constants Constants; +using Magnum::Constants; inline Debug& operator<<(Debug& debug, Sec value) { return debug << Float(value); diff --git a/src/Magnum/Math/Test/Vector2Test.cpp b/src/Magnum/Math/Test/Vector2Test.cpp index ac07fd9ca..823c97eeb 100644 --- a/src/Magnum/Math/Test/Vector2Test.cpp +++ b/src/Magnum/Math/Test/Vector2Test.cpp @@ -77,9 +77,7 @@ struct Vector2Test: TestSuite::Tester { void debug(); }; -typedef Math::Vector3 Vector3i; -typedef Math::Vector2 Vector2; -typedef Math::Vector2 Vector2i; +using Magnum::Vector2; Vector2Test::Vector2Test() { addTests({&Vector2Test::construct, diff --git a/src/Magnum/Math/Test/Vector3Test.cpp b/src/Magnum/Math/Test/Vector3Test.cpp index 4bd94cb5f..0e297e742 100644 --- a/src/Magnum/Math/Test/Vector3Test.cpp +++ b/src/Magnum/Math/Test/Vector3Test.cpp @@ -77,9 +77,8 @@ struct Vector3Test: TestSuite::Tester { void debug(); }; -typedef Math::Vector3 Vector3; -typedef Math::Vector3 Vector3i; -typedef Math::Vector2 Vector2; +using Magnum::Vector3; +using Magnum::Vector2; Vector3Test::Vector3Test() { addTests({&Vector3Test::construct, diff --git a/src/Magnum/Math/Test/Vector4Test.cpp b/src/Magnum/Math/Test/Vector4Test.cpp index 2f98c4fd9..309ef4bc0 100644 --- a/src/Magnum/Math/Test/Vector4Test.cpp +++ b/src/Magnum/Math/Test/Vector4Test.cpp @@ -79,10 +79,9 @@ struct Vector4Test: TestSuite::Tester { void debug(); }; -typedef Math::Vector4 Vector4; -typedef Math::Vector4 Vector4i; -typedef Math::Vector3 Vector3; -typedef Math::Vector2 Vector2; +using Magnum::Vector4; +using Magnum::Vector3; +using Magnum::Vector2; Vector4Test::Vector4Test() { addTests({&Vector4Test::construct, diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index 8eb942058..695353ab0 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -120,8 +120,8 @@ struct VectorTest: TestSuite::Tester { void debugPacked(); }; -typedef Math::Constants Constants; -typedef Math::Rad Rad; +using Magnum::Constants; +using Magnum::Rad; typedef Vector<2, Float> Vector2; typedef Vector<2, Half> Vector2h; typedef Vector<3, Float> Vector3;