Browse Source

MeshTools: the assert is saying what?!

pull/617/head
Vladimír Vondruš 3 years ago
parent
commit
26e209ebb1
  1. 4
      src/Magnum/MeshTools/GenerateLines.cpp
  2. 6
      src/Magnum/MeshTools/Test/GenerateLinesTest.cpp

4
src/Magnum/MeshTools/GenerateLines.cpp

@ -44,7 +44,7 @@ Trade::MeshData generateLines(const Trade::MeshData& lineMesh) {
CORRADE_ASSERT(lineMesh.primitive() == MeshPrimitive::Lines ||
lineMesh.primitive() == MeshPrimitive::LineStrip ||
lineMesh.primitive() == MeshPrimitive::LineLoop,
"Trade::MeshTools::generateLines(): expected a line primitive, got" << lineMesh.primitive(), (Trade::MeshData{MeshPrimitive::Triangles, 0}));
"MeshTools::generateLines(): expected a line primitive, got" << lineMesh.primitive(), (Trade::MeshData{MeshPrimitive::Triangles, 0}));
/** @todo this will assert if the count in MeshData is wrong, check here
already */
@ -86,7 +86,7 @@ Trade::MeshData generateLines(const Trade::MeshData& lineMesh) {
/* Position is required, everything else is optional */
const Containers::Optional<UnsignedInt> positionAttributeId = lineMesh.findAttributeId(Trade::MeshAttribute::Position);
CORRADE_ASSERT(positionAttributeId,
"Trade::MeshTools::generateLines(): the mesh has no positions", (Trade::MeshData{MeshPrimitive::Triangles, 0}));
"MeshTools::generateLines(): the mesh has no positions", (Trade::MeshData{MeshPrimitive::Triangles, 0}));
/* Duplicate the input mesh to have each input line segment turned into
four vertices for a quad. Allocate space for the additional attributes

6
src/Magnum/MeshTools/Test/GenerateLinesTest.cpp

@ -640,7 +640,7 @@ void GenerateLinesTest::notLines() {
generateLines(Trade::MeshData{MeshPrimitive::TriangleFan, {}, positions, {
Trade::MeshAttributeData{Trade::MeshAttribute::Position, Containers::stridedArrayView(positions)}
}});
CORRADE_COMPARE(out.str(), "Trade::MeshTools::generateLines(): expected a line primitive, got MeshPrimitive::TriangleFan\n");
CORRADE_COMPARE(out.str(), "MeshTools::generateLines(): expected a line primitive, got MeshPrimitive::TriangleFan\n");
}
void GenerateLinesTest::noAttributes() {
@ -649,7 +649,7 @@ void GenerateLinesTest::noAttributes() {
std::ostringstream out;
Error redirectError{&out};
generateLines(Trade::MeshData{MeshPrimitive::Lines, 12});
CORRADE_COMPARE(out.str(), "Trade::MeshTools::generateLines(): the mesh has no positions\n");
CORRADE_COMPARE(out.str(), "MeshTools::generateLines(): the mesh has no positions\n");
}
void GenerateLinesTest::noPositionAttribute() {
@ -662,7 +662,7 @@ void GenerateLinesTest::noPositionAttribute() {
generateLines(Trade::MeshData{MeshPrimitive::Lines, {}, colors, {
Trade::MeshAttributeData{Trade::MeshAttribute::Color, Containers::stridedArrayView(colors)}
}});
CORRADE_COMPARE(out.str(), "Trade::MeshTools::generateLines(): the mesh has no positions\n");
CORRADE_COMPARE(out.str(), "MeshTools::generateLines(): the mesh has no positions\n");
}
}}}}

Loading…
Cancel
Save