From c61ed94a5f0cf139b4e53a52b3d7753c2dfdcbe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 18 Sep 2021 11:43:45 +0200 Subject: [PATCH] Trade: SceneData TRS components can each have different type, test that. --- src/Magnum/Trade/Test/SceneDataTest.cpp | 56 ++++++++++++------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/Magnum/Trade/Test/SceneDataTest.cpp b/src/Magnum/Trade/Test/SceneDataTest.cpp index 3f3f16d47..d3cf758b4 100644 --- a/src/Magnum/Trade/Test/SceneDataTest.cpp +++ b/src/Magnum/Trade/Test/SceneDataTest.cpp @@ -112,14 +112,14 @@ struct SceneDataTest: TestSuite::Tester { void parentsIntoArray(); void parentsIntoArrayInvalidSizeOrOffset(); template void transformations2DAsArray(); - template void transformations2DAsArrayTRS(); + template void transformations2DAsArrayTRS(); template void transformations2DAsArrayBut3DType(); template void transformations2DAsArrayBut3DTypeTRS(); void transformations2DIntoArray(); void transformations2DIntoArrayTRS(); void transformations2DIntoArrayInvalidSizeOrOffset(); template void transformations3DAsArray(); - template void transformations3DAsArrayTRS(); + template void transformations3DAsArrayTRS(); template void transformations3DAsArrayBut2DType(); template void transformations3DAsArrayBut2DTypeTRS(); void transformations3DIntoArray(); @@ -261,8 +261,8 @@ SceneDataTest::SceneDataTest() { &SceneDataTest::transformations2DAsArray, &SceneDataTest::transformations2DAsArray, &SceneDataTest::transformations2DAsArray, - &SceneDataTest::transformations2DAsArrayTRS, - &SceneDataTest::transformations2DAsArrayTRS, + &SceneDataTest::transformations2DAsArrayTRS, + &SceneDataTest::transformations2DAsArrayTRS, &SceneDataTest::transformations2DAsArrayBut3DType, &SceneDataTest::transformations2DAsArrayBut3DType, &SceneDataTest::transformations2DAsArrayBut3DType, @@ -279,8 +279,8 @@ SceneDataTest::SceneDataTest() { &SceneDataTest::transformations3DAsArray, &SceneDataTest::transformations3DAsArray, &SceneDataTest::transformations3DAsArray, - &SceneDataTest::transformations3DAsArrayTRS, - &SceneDataTest::transformations3DAsArrayTRS, + &SceneDataTest::transformations3DAsArrayTRS, + &SceneDataTest::transformations3DAsArrayTRS, &SceneDataTest::transformations3DAsArrayBut2DType, &SceneDataTest::transformations3DAsArrayBut2DType, &SceneDataTest::transformations3DAsArrayBut2DType, @@ -2097,30 +2097,30 @@ template void SceneDataTest::transformations2DAsArray() { }), TestSuite::Compare::Container); } -template void SceneDataTest::transformations2DAsArrayTRS() { - setTestCaseTemplateName(NameTraits::name()); +template void SceneDataTest::transformations2DAsArrayTRS() { + setTestCaseTemplateName({NameTraits::name(), NameTraits::name(), NameTraits::name()}); struct Field { UnsignedInt object; Math::Vector2 translation; - Math::Complex rotation; - Math::Vector2 scaling; + Math::Complex rotation; + Math::Vector2 scaling; } fields[]{ {1, {T(3.0), T(2.0)}, {}, - {T(1.0), T(1.0)}}, + {V(1.0), V(1.0)}}, {0, {}, - Math::Complex::rotation(Math::Deg{T(35.0)}), - {T(1.0), T(1.0)}}, + Math::Complex::rotation(Math::Deg{U(35.0)}), + {V(1.0), V(1.0)}}, {2, {}, /* Identity transformation here */ {}, - {T(1.0), T(1.0)}}, + {V(1.0), V(1.0)}}, {4, {}, {}, - {T(2.0), T(1.0)}}, + {V(2.0), V(1.0)}}, {7, {T(1.5), T(2.5)}, - Math::Complex::rotation(Math::Deg{T(-15.0)}), - {T(-0.5), T(4.0)}}, + Math::Complex::rotation(Math::Deg{U(-15.0)}), + {V(-0.5), V(4.0)}}, }; Containers::StridedArrayView1D view = fields; @@ -2470,30 +2470,30 @@ template void SceneDataTest::transformations3DAsArray() { }), TestSuite::Compare::Container); } -template void SceneDataTest::transformations3DAsArrayTRS() { - setTestCaseTemplateName(NameTraits::name()); +template void SceneDataTest::transformations3DAsArrayTRS() { + setTestCaseTemplateName({NameTraits::name(), NameTraits::name(), NameTraits::name()}); struct Field { UnsignedInt object; Math::Vector3 translation; - Math::Quaternion rotation; - Math::Vector3 scaling; + Math::Quaternion rotation; + Math::Vector3 scaling; } fields[]{ {1, {T(3.0), T(2.0), T(1.0)}, {}, - {T(1.0), T(1.0), T(1.0)}}, + {V(1.0), V(1.0), V(1.0)}}, {0, {}, - Math::Quaternion::rotation(Math::Deg{T(35.0)}, Math::Vector3::yAxis()), - {T(1.0), T(1.0), T(1.0)}}, + Math::Quaternion::rotation(Math::Deg{U(35.0)}, Math::Vector3::yAxis()), + {V(1.0), V(1.0), V(1.0)}}, {2, {}, /* Identity transformation here */ {}, - {T(1.0), T(1.0), T(1.0)}}, + {V(1.0), V(1.0), V(1.0)}}, {4, {}, {}, - {T(2.0), T(1.0), T(0.0)}}, + {V(2.0), V(1.0), V(0.0)}}, {7, {T(1.5), T(2.5), T(3.5)}, - Math::Quaternion::rotation(Math::Deg{T(-15.0)}, Math::Vector3::xAxis()), - {T(-0.5), T(4.0), T(-16.0)}}, + Math::Quaternion::rotation(Math::Deg{U(-15.0)}, Math::Vector3::xAxis()), + {V(-0.5), V(4.0), V(-16.0)}}, }; Containers::StridedArrayView1D view = fields;