|
|
|
@ -48,10 +48,6 @@ struct MeshTest: TestSuite::Tester { |
|
|
|
void drawCountNotSet(); |
|
|
|
void drawCountNotSet(); |
|
|
|
void drawViewCountNotSet(); |
|
|
|
void drawViewCountNotSet(); |
|
|
|
|
|
|
|
|
|
|
|
#ifdef MAGNUM_BUILD_DEPRECATED |
|
|
|
|
|
|
|
void indexSizeDeprecated(); |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void mapPrimitive(); |
|
|
|
void mapPrimitive(); |
|
|
|
void mapPrimitiveInvalid(); |
|
|
|
void mapPrimitiveInvalid(); |
|
|
|
void mapIndexType(); |
|
|
|
void mapIndexType(); |
|
|
|
@ -71,10 +67,6 @@ MeshTest::MeshTest() { |
|
|
|
&MeshTest::drawCountNotSet, |
|
|
|
&MeshTest::drawCountNotSet, |
|
|
|
&MeshTest::drawViewCountNotSet, |
|
|
|
&MeshTest::drawViewCountNotSet, |
|
|
|
|
|
|
|
|
|
|
|
#ifdef MAGNUM_BUILD_DEPRECATED |
|
|
|
|
|
|
|
&MeshTest::indexSizeDeprecated, |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
&MeshTest::mapPrimitive, |
|
|
|
&MeshTest::mapPrimitive, |
|
|
|
&MeshTest::mapPrimitiveInvalid, |
|
|
|
&MeshTest::mapPrimitiveInvalid, |
|
|
|
&MeshTest::mapIndexType, |
|
|
|
&MeshTest::mapIndexType, |
|
|
|
@ -152,16 +144,6 @@ void MeshTest::drawViewCountNotSet() { |
|
|
|
"GL::MeshView::draw(): setCount() was never called, probably a mistake?\n"); |
|
|
|
"GL::MeshView::draw(): setCount() was never called, probably a mistake?\n"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#ifdef MAGNUM_BUILD_DEPRECATED |
|
|
|
|
|
|
|
void MeshTest::indexSizeDeprecated() { |
|
|
|
|
|
|
|
CORRADE_IGNORE_DEPRECATED_PUSH |
|
|
|
|
|
|
|
CORRADE_COMPARE(Mesh::indexSize(Mesh::IndexType::UnsignedByte), 1); |
|
|
|
|
|
|
|
CORRADE_COMPARE(Mesh::indexSize(Mesh::IndexType::UnsignedShort), 2); |
|
|
|
|
|
|
|
CORRADE_COMPARE(Mesh::indexSize(Mesh::IndexType::UnsignedInt), 4); |
|
|
|
|
|
|
|
CORRADE_IGNORE_DEPRECATED_POP |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void MeshTest::mapPrimitive() { |
|
|
|
void MeshTest::mapPrimitive() { |
|
|
|
CORRADE_COMPARE(meshPrimitive(Magnum::MeshPrimitive::Points), MeshPrimitive::Points); |
|
|
|
CORRADE_COMPARE(meshPrimitive(Magnum::MeshPrimitive::Points), MeshPrimitive::Points); |
|
|
|
CORRADE_COMPARE(meshPrimitive(Magnum::MeshPrimitive::Lines), MeshPrimitive::Lines); |
|
|
|
CORRADE_COMPARE(meshPrimitive(Magnum::MeshPrimitive::Lines), MeshPrimitive::Lines); |
|
|
|
|