From b180dd7bf065722f1c1063d85356c68a26dfbb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 14 May 2020 18:10:32 +0200 Subject: [PATCH] MeshTools: various cleanup. --- src/Magnum/MeshTools/Test/FlipNormalsTest.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp index 8ed8efe30..8dab2091d 100644 --- a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp +++ b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp @@ -67,8 +67,7 @@ FlipNormalsTest::FlipNormalsTest() { &FlipNormalsTest::flipNormalsFaceWinding, &FlipNormalsTest::flipNormalsFaceWindingErased, &FlipNormalsTest::flipNormalsFaceWindingErased, - &FlipNormalsTest::flipNormalsFaceWindingErased, - }); + &FlipNormalsTest::flipNormalsFaceWindingErased}); } void FlipNormalsTest::wrongIndexCount() { @@ -80,7 +79,7 @@ void FlipNormalsTest::wrongIndexCount() { Error redirectError{&ss}; UnsignedByte indices[2]; - MeshTools::flipFaceWindingInPlace(Containers::stridedArrayView(indices)); + flipFaceWindingInPlace(Containers::stridedArrayView(indices)); CORRADE_COMPARE(ss.str(), "MeshTools::flipNormals(): index count is not divisible by 3!\n"); } @@ -89,7 +88,7 @@ template void FlipNormalsTest::flipFaceWinding() { setTestCaseTemplateName(Math::TypeTraits::name()); T indices[]{0, 1, 2, 3, 4, 5}; - MeshTools::flipFaceWindingInPlace(indices); + flipFaceWindingInPlace(indices); CORRADE_COMPARE_AS(Containers::arrayView(indices), Containers::arrayView({0, 2, 1, 3, 5, 4}), @@ -100,7 +99,7 @@ template void FlipNormalsTest::flipFaceWindingErased() { setTestCaseTemplateName(Math::TypeTraits::name()); T indices[]{0, 1, 2, 3, 4, 5}; - MeshTools::flipFaceWindingInPlace(indices); + flipFaceWindingInPlace(indices); CORRADE_COMPARE_AS(Containers::arrayView(indices), Containers::arrayView({0, 2, 1, 3, 5, 4}), @@ -137,7 +136,7 @@ void FlipNormalsTest::flipFaceWindingErasedWrongIndexSize() { void FlipNormalsTest::flipNormals() { Vector3 normals[]{Vector3::xAxis(), Vector3::yAxis(), Vector3::zAxis()}; - MeshTools::flipNormalsInPlace(normals); + flipNormalsInPlace(normals); CORRADE_COMPARE_AS(Containers::arrayView(normals), Containers::arrayView({ @@ -150,7 +149,7 @@ template void FlipNormalsTest::flipNormalsFaceWinding() { T indices[]{0, 1, 2, 3, 4, 5}; Vector3 normals[]{Vector3::xAxis(), Vector3::yAxis(), Vector3::zAxis()}; - MeshTools::flipNormalsInPlace(indices, normals); + flipNormalsInPlace(indices, normals); CORRADE_COMPARE_AS(Containers::arrayView(indices), Containers::arrayView({0, 2, 1, 3, 5, 4}), @@ -166,7 +165,7 @@ template void FlipNormalsTest::flipNormalsFaceWindingErased() { T indices[]{0, 1, 2, 3, 4, 5}; Vector3 normals[]{Vector3::xAxis(), Vector3::yAxis(), Vector3::zAxis()}; - MeshTools::flipNormalsInPlace( + flipNormalsInPlace( Containers::arrayCast<2, char>(Containers::stridedArrayView(indices)), normals);