Browse Source

SceneTools: consistently use "mapping" instead of "objects" in tests too.

Forgot this in 97d283a75d.
pull/617/head
Vladimír Vondruš 3 years ago
parent
commit
440f1b2ee6
  1. 18
      src/Magnum/SceneTools/Test/CombineTest.cpp

18
src/Magnum/SceneTools/Test/CombineTest.cpp

@ -38,9 +38,9 @@ struct CombineTest: TestSuite::Tester {
void test(); void test();
void alignment(); void alignment();
void objectsShared(); void mappingShared();
void objectsPlaceholderFieldPlaceholder(); void mappingPlaceholderFieldPlaceholder();
void objectSharedFieldPlaceholder(); void mappingSharedFieldPlaceholder();
}; };
struct { struct {
@ -58,9 +58,9 @@ CombineTest::CombineTest() {
Containers::arraySize(TestData)); Containers::arraySize(TestData));
addTests({&CombineTest::alignment, addTests({&CombineTest::alignment,
&CombineTest::objectsShared, &CombineTest::mappingShared,
&CombineTest::objectsPlaceholderFieldPlaceholder, &CombineTest::mappingPlaceholderFieldPlaceholder,
&CombineTest::objectSharedFieldPlaceholder}); &CombineTest::mappingSharedFieldPlaceholder});
} }
using namespace Math::Literals; using namespace Math::Literals;
@ -204,7 +204,7 @@ void CombineTest::alignment() {
CORRADE_COMPARE(scene.field(1).stride()[0], 16); CORRADE_COMPARE(scene.field(1).stride()[0], 16);
} }
void CombineTest::objectsShared() { void CombineTest::mappingShared() {
const UnsignedShort meshMappingData[]{15, 23, 47}; const UnsignedShort meshMappingData[]{15, 23, 47};
const UnsignedByte meshFieldData[]{0, 1, 2}; const UnsignedByte meshFieldData[]{0, 1, 2};
const Int meshMaterialFieldData[]{72, -1, 23}; const Int meshMaterialFieldData[]{72, -1, 23};
@ -237,7 +237,7 @@ void CombineTest::objectsShared() {
CORRADE_COMPARE(scene.mapping(Trade::SceneField::Translation).data(), scene.mapping(Trade::SceneField::Rotation).data()); CORRADE_COMPARE(scene.mapping(Trade::SceneField::Translation).data(), scene.mapping(Trade::SceneField::Rotation).data());
} }
void CombineTest::objectsPlaceholderFieldPlaceholder() { void CombineTest::mappingPlaceholderFieldPlaceholder() {
const UnsignedShort meshMappingData[]{15, 23, 47}; const UnsignedShort meshMappingData[]{15, 23, 47};
const UnsignedByte meshFieldData[]{0, 1, 2}; const UnsignedByte meshFieldData[]{0, 1, 2};
@ -290,7 +290,7 @@ void CombineTest::objectsPlaceholderFieldPlaceholder() {
CORRADE_COMPARE(scene.field(Trade::sceneFieldCustom(15)).stride()[0], 4*2); CORRADE_COMPARE(scene.field(Trade::sceneFieldCustom(15)).stride()[0], 4*2);
} }
void CombineTest::objectSharedFieldPlaceholder() { void CombineTest::mappingSharedFieldPlaceholder() {
const UnsignedInt meshMappingData[]{15, 23, 47}; const UnsignedInt meshMappingData[]{15, 23, 47};
const UnsignedByte meshFieldData[]{0, 1, 2}; const UnsignedByte meshFieldData[]{0, 1, 2};

Loading…
Cancel
Save