diff --git a/src/Magnum/Primitives/Test/PlaneTest.cpp b/src/Magnum/Primitives/Test/PlaneTest.cpp index 02d153b75..96f9f3196 100644 --- a/src/Magnum/Primitives/Test/PlaneTest.cpp +++ b/src/Magnum/Primitives/Test/PlaneTest.cpp @@ -36,11 +36,13 @@ struct PlaneTest: TestSuite::Tester { explicit PlaneTest(); void solid(); + void solidTextured(); void wireframe(); }; PlaneTest::PlaneTest() { addTests({&PlaneTest::solid, + &PlaneTest::solidTextured, &PlaneTest::wireframe}); } @@ -51,6 +53,18 @@ void PlaneTest::solid() { CORRADE_COMPARE(plane.primitive(), MeshPrimitive::TriangleStrip); CORRADE_COMPARE(plane.positions(0).size(), 4); CORRADE_COMPARE(plane.normals(0).size(), 4); + CORRADE_COMPARE(plane.textureCoords2DArrayCount(), 0); +} + +void PlaneTest::solidTextured() { + Trade::MeshData3D plane = Primitives::planeSolid(Primitives::PlaneTextureCoords::Generate); + + CORRADE_VERIFY(!plane.isIndexed()); + CORRADE_COMPARE(plane.primitive(), MeshPrimitive::TriangleStrip); + CORRADE_COMPARE(plane.positions(0).size(), 4); + CORRADE_COMPARE(plane.normals(0).size(), 4); + CORRADE_COMPARE(plane.textureCoords2DArrayCount(), 1); + CORRADE_COMPARE(plane.textureCoords2D(0).size(), 4); } void PlaneTest::wireframe() { diff --git a/src/Magnum/Primitives/Test/SquareTest.cpp b/src/Magnum/Primitives/Test/SquareTest.cpp index 543709259..b44672473 100644 --- a/src/Magnum/Primitives/Test/SquareTest.cpp +++ b/src/Magnum/Primitives/Test/SquareTest.cpp @@ -36,11 +36,13 @@ struct SquareTest: TestSuite::Tester { explicit SquareTest(); void solid(); + void solidTextured(); void wireframe(); }; SquareTest::SquareTest() { addTests({&SquareTest::solid, + &SquareTest::solidTextured, &SquareTest::wireframe}); } @@ -50,6 +52,17 @@ void SquareTest::solid() { CORRADE_VERIFY(!square.isIndexed()); CORRADE_COMPARE(square.primitive(), MeshPrimitive::TriangleStrip); CORRADE_COMPARE(square.positions(0).size(), 4); + CORRADE_COMPARE(square.textureCoords2DArrayCount(), 0); +} + +void SquareTest::solidTextured() { + Trade::MeshData2D square = Primitives::squareSolid(Primitives::SquareTextureCoords::Generate); + + CORRADE_VERIFY(!square.isIndexed()); + CORRADE_COMPARE(square.primitive(), MeshPrimitive::TriangleStrip); + CORRADE_COMPARE(square.positions(0).size(), 4); + CORRADE_COMPARE(square.textureCoords2DArrayCount(), 1); + CORRADE_COMPARE(square.textureCoords2D(0).size(), 4); } void SquareTest::wireframe() {