ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
10436 Commits
21 Branches
19 Tags
70 MiB
Tree: cc0db3dd08
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cc0db3dd08'
${ noResults }
magnum/src/Magnum/SceneTools/Test/CombineTest.cpp

598 lines
27 KiB
Raw Normal View History Unescape

Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
Updated copyright year.
4 years ago
2020, 2021, 2022 Vladimír Vondruš <mosra@centrum.cz>
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
#include <sstream>
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
#include <Corrade/Containers/StridedBitArrayView.h>
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
#include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Container.h>
#include <Corrade/TestSuite/Compare/Numeric.h>
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
#include <Corrade/Utility/DebugStl.h>
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
#include "Magnum/Math/Complex.h"
#include "Magnum/Math/Vector2.h"
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
#include "Magnum/SceneTools/Combine.h"
#include "Magnum/Trade/SceneData.h"
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
namespace Magnum { namespace SceneTools { namespace Test { namespace {
struct CombineTest: TestSuite::Tester {
explicit CombineTest();
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
void fields();
void fieldsAlignment();
void fieldsMappingShared();
void fieldsMappingSharedPartial();
void fieldsMappingPlaceholderFieldPlaceholder();
void fieldsMappingSharedFieldPlaceholder();
void fieldsOffsetOnly();
void fieldsFromDataOffsetOnly();
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
};
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
const struct {
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
const char* name;
Trade::SceneMappingType objectType;
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
} FieldsData[]{
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
{"UnsignedByte output", Trade::SceneMappingType::UnsignedByte},
{"UnsignedShort output", Trade::SceneMappingType::UnsignedShort},
{"UnsignedInt output", Trade::SceneMappingType::UnsignedInt},
{"UnsignedLong output", Trade::SceneMappingType::UnsignedLong},
};
CombineTest::CombineTest() {
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
addInstancedTests({&CombineTest::fields},
Containers::arraySize(FieldsData));
addTests({&CombineTest::fieldsAlignment,
&CombineTest::fieldsMappingShared,
&CombineTest::fieldsMappingSharedPartial,
&CombineTest::fieldsMappingPlaceholderFieldPlaceholder,
&CombineTest::fieldsMappingSharedFieldPlaceholder,
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
&CombineTest::fieldsOffsetOnly,
&CombineTest::fieldsFromDataOffsetOnly});
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
}
using namespace Math::Literals;
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
void CombineTest::fields() {
auto&& data = FieldsData[testCaseInstanceId()];
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
setTestCaseDescription(data.name);
/* Testing the four possible object types, it should be possible to combine
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
them. Make them all non-contiguous to catch accidents in the internal
casting / copying code.*/
const struct Mesh {
UnsignedInt mapping;
UnsignedByte mesh;
} meshData[]{
{45, 3},
{78, 5},
{23, 17}
};
auto meshes = Containers::stridedArrayView(meshData);
const struct Parent {
UnsignedShort mapping;
Short parent;
} parentData[]{
{0, -1},
{1, 0}
};
auto parents = Containers::stridedArrayView(parentData);
const struct Translation {
UnsignedByte mapping;
Vector2d translation;
} translationData[]{
{16, {1.5, -0.5}}
};
auto translations = Containers::stridedArrayView(translationData);
const struct Foo {
UnsignedLong mapping;
Int foo[2];
} fooData[]{
{15, {0, 1}},
{23, {2, 3}}
};
auto foos = Containers::stridedArrayView(fooData);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
const struct Bool {
UnsignedShort mapping;
bool bit;
} boolData[]{
{23, false},
{24, true},
{25, false},
{26, true}
};
auto bools = Containers::stridedArrayView(boolData);
const struct Bits {
UnsignedByte mapping;
UnsignedByte bits;
} bitsData[]{
{13, 1 << 3 | 1 << 4},
{25, 1 << 4},
{77, 1 << 1 | 1 << 2 | 1 << 3},
};
auto bits = Containers::stridedArrayView(bitsData);
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
Trade::SceneData scene = combineFields(data.objectType, 167, {
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
Trade::SceneFieldData{Trade::SceneField::Mesh,
meshes.slice(&Mesh::mapping),
meshes.slice(&Mesh::mesh)},
Trade::SceneFieldData{Trade::SceneField::Parent,
parents.slice(&Parent::mapping),
parents.slice(&Parent::parent),
Trade::SceneFieldFlag::ImplicitMapping},
Trade::SceneFieldData{Trade::SceneField::Translation,
translations.slice(&Translation::mapping),
translations.slice(&Translation::translation)},
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
/* Array field */
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
Trade::SceneFieldData{Trade::sceneFieldCustom(15),
foos.slice(&Foo::mapping),
Containers::arrayCast<2, const Int>(foos.slice(&Foo::foo)),
Trade::SceneFieldFlag::OrderedMapping},
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
/* Empty field */
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
Trade::SceneFieldData{Trade::SceneField::Camera, Containers::ArrayView<const UnsignedByte>{}, Containers::ArrayView<const UnsignedShort>{}},
/* Bit field */
Trade::SceneFieldData{Trade::sceneFieldCustom(16),
bools.slice(&Bool::mapping),
bools.slice(&Bool::bit).sliceBit(0),
Trade::SceneFieldFlag::ImplicitMapping},
/* Bit array field */
Trade::SceneFieldData{Trade::sceneFieldCustom(17),
bits.slice(&Bits::mapping),
Containers::StridedBitArrayView2D{Containers::BitArrayView{bitsData}, &bitsData[0].bits, 1, {3, 4}, {sizeof(Bits)*8, 1}},
Trade::SceneFieldFlag::OrderedMapping},
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
});
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.dataFlags(), Trade::DataFlag::Owned|Trade::DataFlag::Mutable);
CORRADE_COMPARE(scene.mappingType(), data.objectType);
CORRADE_COMPARE(scene.mappingBound(), 167);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.fieldCount(), 7);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.fieldName(0), Trade::SceneField::Mesh);
CORRADE_COMPARE(scene.fieldFlags(0), Trade::SceneFieldFlags{});
CORRADE_COMPARE(scene.fieldType(0), Trade::SceneFieldType::UnsignedByte);
CORRADE_COMPARE(scene.fieldArraySize(0), 0);
CORRADE_COMPARE_AS(scene.mappingAsArray(0), Containers::arrayView<UnsignedInt>({
45, 78, 23
}), TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<UnsignedByte>(0),
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
meshes.slice(&Mesh::mesh),
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.fieldName(1), Trade::SceneField::Parent);
CORRADE_COMPARE(scene.fieldFlags(1), Trade::SceneFieldFlag::ImplicitMapping);
CORRADE_COMPARE(scene.fieldType(1), Trade::SceneFieldType::Short);
CORRADE_COMPARE(scene.fieldArraySize(1), 0);
CORRADE_COMPARE_AS(scene.mappingAsArray(1), Containers::arrayView<UnsignedInt>({
0, 1
}), TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<Short>(1),
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
parents.slice(&Parent::parent),
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.fieldName(2), Trade::SceneField::Translation);
CORRADE_COMPARE(scene.fieldFlags(2), Trade::SceneFieldFlags{});
CORRADE_COMPARE(scene.fieldType(2), Trade::SceneFieldType::Vector2d);
CORRADE_COMPARE(scene.fieldArraySize(2), 0);
CORRADE_COMPARE_AS(scene.mappingAsArray(2),
Containers::arrayView<UnsignedInt>({16}),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<Vector2d>(2),
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
translations.slice(&Translation::translation),
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.fieldName(3), Trade::sceneFieldCustom(15));
CORRADE_COMPARE(scene.fieldFlags(3), Trade::SceneFieldFlag::OrderedMapping);
CORRADE_COMPARE(scene.fieldType(3), Trade::SceneFieldType::Int);
CORRADE_COMPARE(scene.fieldArraySize(3), 2);
CORRADE_COMPARE_AS(scene.mappingAsArray(3),
Containers::arrayView<UnsignedInt>({15, 23}),
TestSuite::Compare::Container);
/** @todo clean up once it's possible to compare multidimensional
containers */
CORRADE_COMPARE_AS(scene.field<Int[]>(3)[0],
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
(Containers::arrayCast<2, const Int>(foos.slice(&Foo::foo)))[0],
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<Int[]>(3)[1],
SceneTools: test non-contiguous mapping views in combine(). To ensure nothing gets assumed by accident in the type conversion / copying code.
3 years ago
(Containers::arrayCast<2, const Int>(foos.slice(&Foo::foo)))[1],
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.fieldName(4), Trade::SceneField::Camera);
CORRADE_COMPARE(scene.fieldFlags(4), Trade::SceneFieldFlags{});
CORRADE_COMPARE(scene.fieldType(4), Trade::SceneFieldType::UnsignedShort);
CORRADE_COMPARE(scene.fieldSize(4), 0);
CORRADE_COMPARE(scene.fieldArraySize(4), 0);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.fieldName(5), Trade::sceneFieldCustom(16));
CORRADE_COMPARE(scene.fieldFlags(5), Trade::SceneFieldFlag::ImplicitMapping);
CORRADE_COMPARE(scene.fieldType(5), Trade::SceneFieldType::Bit);
CORRADE_COMPARE(scene.fieldArraySize(5), 0);
CORRADE_COMPARE_AS(scene.mappingAsArray(5),
Containers::arrayView({23u, 24u, 25u, 26u}),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.fieldBits(5),
Containers::stridedArrayView({false, true, false, true}).sliceBit(0),
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.fieldName(6), Trade::sceneFieldCustom(17));
CORRADE_COMPARE(scene.fieldFlags(6), Trade::SceneFieldFlag::OrderedMapping);
CORRADE_COMPARE(scene.fieldType(6), Trade::SceneFieldType::Bit);
CORRADE_COMPARE(scene.fieldArraySize(6), 4);
CORRADE_COMPARE_AS(scene.mappingAsArray(6),
Containers::arrayView({13u, 25u, 77u}),
TestSuite::Compare::Container);
/** @todo clean up once it's possible to compare multidimensional
containers */
CORRADE_COMPARE_AS(scene.fieldBitArrays(6)[0],
Containers::stridedArrayView({false, false, true, true}).sliceBit(0),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.fieldBitArrays(6)[1],
Containers::stridedArrayView({false, false, false, true}).sliceBit(0),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.fieldBitArrays(6)[2],
Containers::stridedArrayView({true, true, true, false}).sliceBit(0),
TestSuite::Compare::Container);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
}
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
void CombineTest::fieldsAlignment() {
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
const UnsignedShort meshMappingData[]{15, 23, 47};
const UnsignedByte meshFieldData[]{0, 1, 2};
const UnsignedShort translationMappingData[]{5}; /* 1 byte padding before */
const Vector2d translationFieldData[]{{1.5, 3.0}}; /* 4 byte padding before */
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
Trade::SceneData scene = combineFields(Trade::SceneMappingType::UnsignedShort, 167, {
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
Trade::SceneFieldData{Trade::SceneField::Mesh,
Containers::arrayView(meshMappingData),
Containers::arrayView(meshFieldData)},
Trade::SceneFieldData{Trade::SceneField::Translation,
Containers::arrayView(translationMappingData),
Containers::arrayView(translationFieldData)}
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
});
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.dataFlags(), Trade::DataFlag::Owned|Trade::DataFlag::Mutable);
CORRADE_COMPARE(scene.mappingType(), Trade::SceneMappingType::UnsignedShort);
CORRADE_COMPARE(scene.mappingBound(), 167);
CORRADE_COMPARE(scene.fieldCount(), 2);
CORRADE_COMPARE(scene.fieldName(0), Trade::SceneField::Mesh);
CORRADE_COMPARE(scene.fieldType(0), Trade::SceneFieldType::UnsignedByte);
CORRADE_COMPARE(scene.fieldArraySize(0), 0);
CORRADE_COMPARE_AS(scene.mapping<UnsignedShort>(0),
Containers::arrayView(meshMappingData),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<UnsignedByte>(0),
Containers::arrayView(meshFieldData),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(reinterpret_cast<std::ptrdiff_t>(scene.mapping(0).data()), 2, TestSuite::Compare::Divisible);
CORRADE_COMPARE(scene.mapping(0).data(), scene.data());
CORRADE_COMPARE(scene.mapping(0).stride()[0], 2);
CORRADE_COMPARE_AS(reinterpret_cast<std::ptrdiff_t>(scene.field(0).data()), 1, TestSuite::Compare::Divisible);
CORRADE_COMPARE(scene.field(0).data(), scene.data() + 3*2);
CORRADE_COMPARE(scene.field(0).stride()[0], 1);
CORRADE_COMPARE(scene.fieldName(1), Trade::SceneField::Translation);
CORRADE_COMPARE(scene.fieldType(1), Trade::SceneFieldType::Vector2d);
CORRADE_COMPARE(scene.fieldArraySize(1), 0);
CORRADE_COMPARE_AS(scene.mapping<UnsignedShort>(1),
Containers::arrayView(translationMappingData),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<Vector2d>(1),
Containers::arrayView(translationFieldData),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(reinterpret_cast<std::ptrdiff_t>(scene.mapping(1).data()), 2, TestSuite::Compare::Divisible);
CORRADE_COMPARE(scene.mapping(1).data(), scene.data() + 3*2 + 3 + 1);
CORRADE_COMPARE(scene.mapping(1).stride()[0], 2);
CORRADE_COMPARE_AS(reinterpret_cast<std::ptrdiff_t>(scene.field(1).data()), 8, TestSuite::Compare::Divisible);
CORRADE_COMPARE(scene.field(1).data(), scene.data() + 3*2 + 3 + 1 + 2 + 4);
CORRADE_COMPARE(scene.field(1).stride()[0], 16);
}
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
void CombineTest::fieldsMappingShared() {
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
const UnsignedShort meshMappingData[3]{};
const UnsignedByte meshFieldData[3]{};
const Int meshMaterialFieldData[3]{};
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
const UnsignedShort translationRotationMappingData[2]{};
const Vector2 translationFieldData[2]{};
const Complex rotationFieldData[2]{};
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
Trade::SceneData scene = combineFields(Trade::SceneMappingType::UnsignedInt, 173, {
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
/* Deliberately in an arbitrary order to avoid false assumptions like
fields sharing the same object mapping always being after each
other */
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
Trade::SceneFieldData{Trade::SceneField::Mesh,
Containers::arrayView(meshMappingData),
Containers::arrayView(meshFieldData)},
Trade::SceneFieldData{Trade::SceneField::Translation,
Containers::arrayView(translationRotationMappingData),
Containers::arrayView(translationFieldData)},
Trade::SceneFieldData{Trade::SceneField::MeshMaterial,
Containers::arrayView(meshMappingData),
Containers::arrayView(meshMaterialFieldData)},
Trade::SceneFieldData{Trade::SceneField::Rotation,
Containers::arrayView(translationRotationMappingData),
Containers::arrayView(rotationFieldData)}
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
});
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.dataFlags(), Trade::DataFlag::Owned|Trade::DataFlag::Mutable);
CORRADE_COMPARE(scene.mappingType(), Trade::SceneMappingType::UnsignedInt);
CORRADE_COMPARE(scene.mappingBound(), 173);
CORRADE_COMPARE(scene.fieldCount(), 4);
CORRADE_COMPARE(scene.fieldSize(Trade::SceneField::Mesh), 3);
CORRADE_COMPARE(scene.fieldSize(Trade::SceneField::MeshMaterial), 3);
CORRADE_COMPARE(scene.mapping(Trade::SceneField::Mesh).data(), scene.mapping(Trade::SceneField::MeshMaterial).data());
CORRADE_COMPARE(scene.fieldSize(Trade::SceneField::Translation), 2);
CORRADE_COMPARE(scene.fieldSize(Trade::SceneField::Rotation), 2);
CORRADE_COMPARE(scene.mapping(Trade::SceneField::Translation).data(), scene.mapping(Trade::SceneField::Rotation).data());
}
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
void CombineTest::fieldsMappingSharedPartial() {
const UnsignedShort mappingData[]{15, 23, 47, 26, 3};
/* Field data don't have any special treatment so their values aren't
tested */
const UnsignedByte meshData[3]{};
const UnsignedShort lightData[2]{};
const Int parentData[3]{};
Trade::SceneData scene = combineFields(Trade::SceneMappingType::UnsignedInt, 173, {
Trade::SceneFieldData{Trade::SceneField::Mesh,
Containers::arrayView(mappingData).prefix(3),
Containers::arrayView(meshData)},
Trade::SceneFieldData{Trade::SceneField::Light,
Containers::arrayView(mappingData).prefix(2),
Containers::arrayView(lightData)},
Trade::SceneFieldData{Trade::SceneField::Parent,
Containers::stridedArrayView(mappingData).every(2),
Containers::arrayView(parentData)},
});
CORRADE_COMPARE(scene.dataFlags(), Trade::DataFlag::Owned|Trade::DataFlag::Mutable);
CORRADE_COMPARE(scene.mappingType(), Trade::SceneMappingType::UnsignedInt);
CORRADE_COMPARE(scene.mappingBound(), 173);
CORRADE_COMPARE(scene.fieldCount(), 3);
CORRADE_COMPARE_AS(scene.mapping<UnsignedInt>(Trade::SceneField::Mesh),
Containers::arrayView({15u, 23u, 47u}),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.mapping<UnsignedInt>(Trade::SceneField::Light),
Containers::arrayView({15u, 23u}),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.mapping<UnsignedInt>(Trade::SceneField::Parent),
Containers::arrayView({15u, 47u, 3u}),
TestSuite::Compare::Container);
/* All mappings should be deinterleaved */
for(UnsignedInt i = 0; i != scene.fieldCount(); ++i) {
CORRADE_ITERATION(scene.fieldName(i));
CORRADE_COMPARE(scene.mapping<UnsignedInt>(i).stride(), sizeof(UnsignedInt));
}
}
void CombineTest::fieldsMappingPlaceholderFieldPlaceholder() {
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
const UnsignedShort meshMappingData[]{15, 23, 47};
const UnsignedByte meshFieldData[]{0, 1, 2};
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
Trade::SceneData scene = combineFields(Trade::SceneMappingType::UnsignedShort, 173, {
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
Trade::SceneFieldData{Trade::SceneField::Camera,
Containers::ArrayView<UnsignedByte>{nullptr, 1},
Containers::ArrayView<UnsignedShort>{nullptr, 1}},
Trade::SceneFieldData{Trade::SceneField::Mesh,
Containers::arrayView(meshMappingData),
Containers::arrayView(meshFieldData)},
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
/* Looks like sharing object mapping with the Camera field, but
actually both are placeholders */
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
Trade::SceneFieldData{Trade::SceneField::Light,
Containers::ArrayView<UnsignedShort>{nullptr, 2},
Containers::ArrayView<UnsignedInt>{nullptr, 2}},
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
/* Array field */
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
Trade::SceneFieldData{Trade::sceneFieldCustom(15),
Containers::ArrayView<UnsignedShort>{nullptr, 2},
Containers::StridedArrayView2D<Short>{{nullptr, 16}, {2, 4}}},
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
/* Bit array field */
Trade::SceneFieldData{Trade::sceneFieldCustom(16),
Containers::ArrayView<UnsignedLong>{nullptr, 3},
Containers::StridedBitArrayView2D{{nullptr, 1, 8}, {3, 2}}},
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
});
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.dataFlags(), Trade::DataFlag::Owned|Trade::DataFlag::Mutable);
CORRADE_COMPARE(scene.mappingType(), Trade::SceneMappingType::UnsignedShort);
CORRADE_COMPARE(scene.mappingBound(), 173);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.fieldCount(), 5);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.fieldType(Trade::SceneField::Camera), Trade::SceneFieldType::UnsignedShort);
CORRADE_COMPARE(scene.fieldSize(Trade::SceneField::Camera), 1);
CORRADE_COMPARE(scene.fieldArraySize(Trade::SceneField::Camera), 0);
CORRADE_COMPARE(scene.mapping(Trade::SceneField::Camera).data(), scene.data());
CORRADE_COMPARE(scene.mapping(Trade::SceneField::Camera).stride()[0], 2);
CORRADE_COMPARE(scene.field(Trade::SceneField::Camera).data(), scene.data() + 2);
CORRADE_COMPARE(scene.field(Trade::SceneField::Camera).stride()[0], 2);
CORRADE_COMPARE(scene.fieldType(Trade::SceneField::Mesh), Trade::SceneFieldType::UnsignedByte);
CORRADE_COMPARE(scene.fieldArraySize(Trade::SceneField::Mesh), 0);
CORRADE_COMPARE_AS(scene.mapping<UnsignedShort>(Trade::SceneField::Mesh),
Containers::arrayView(meshMappingData),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<UnsignedByte>(Trade::SceneField::Mesh),
Containers::arrayView(meshFieldData),
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.fieldType(Trade::SceneField::Light), Trade::SceneFieldType::UnsignedInt);
CORRADE_COMPARE(scene.fieldSize(Trade::SceneField::Light), 2);
CORRADE_COMPARE(scene.fieldArraySize(Trade::SceneField::Light), 0);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.mapping(Trade::SceneField::Light).data(),
scene.data() + 2 + 2 + 3*2 + 3 + 1);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.mapping(Trade::SceneField::Light).stride()[0], 2);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.field(Trade::SceneField::Light).data(),
scene.data() + 2 + 2 + 3*2 + 3 + 1 + 2*2 + 2);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.field(Trade::SceneField::Light).stride()[0], 4);
CORRADE_COMPARE(scene.fieldType(Trade::sceneFieldCustom(15)), Trade::SceneFieldType::Short);
CORRADE_COMPARE(scene.fieldSize(Trade::sceneFieldCustom(15)), 2);
CORRADE_COMPARE(scene.fieldArraySize(Trade::sceneFieldCustom(15)), 4);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.mapping(Trade::sceneFieldCustom(15)).data(),
scene.data() + 2 + 2 + 3*2 + 3 + 1 + 2*2 + 2 + 2*4);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.mapping(Trade::sceneFieldCustom(15)).stride()[0], 2);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.field(Trade::sceneFieldCustom(15)).data(),
scene.data() + 2 + 2 + 3*2 + 3 + 1 + 2*2 + 2 + 2*4 + 2*2);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.field(Trade::sceneFieldCustom(15)).stride()[0], 4*2);
SceneTools: support SceneFieldType::Bit in combineFields(). I'm (again) postponing implementation of a robust & optimized Utility::copy() for bit array views. Attempted something, but it got out of hand very quickly. Since the particular use case here isn't going to be a perf bottleneck I think, it's fine to do it with just a dumb loop for now.
3 years ago
CORRADE_COMPARE(scene.fieldType(Trade::sceneFieldCustom(16)), Trade::SceneFieldType::Bit);
CORRADE_COMPARE(scene.fieldSize(Trade::sceneFieldCustom(16)), 3);
CORRADE_COMPARE(scene.fieldArraySize(Trade::sceneFieldCustom(16)), 2);
CORRADE_COMPARE(scene.mapping(Trade::sceneFieldCustom(16)).data(),
scene.data() + 2 + 2 + 3*2 + 3 + 1 + 2*2 + 2 + 2*4 + 2*2 + 2*8);
CORRADE_COMPARE(scene.mapping(Trade::sceneFieldCustom(16)).stride()[0], 2);
CORRADE_COMPARE(scene.fieldBitArrays(Trade::sceneFieldCustom(16)).data(),
scene.data() + 2 + 2 + 3*2 + 3 + 1 + 2*2 + 2 + 2*4 + 2*2 + 2*8 + 3*2);
CORRADE_COMPARE(scene.fieldBitArrays(Trade::sceneFieldCustom(16)).offset(), 0);
CORRADE_COMPARE(scene.fieldBitArrays(Trade::sceneFieldCustom(16)).stride()[0], 2);
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
}
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
void CombineTest::fieldsMappingSharedFieldPlaceholder() {
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
const UnsignedInt meshMappingData[]{15, 23, 47};
const UnsignedByte meshFieldData[]{0, 1, 2};
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
Trade::SceneData scene = combineFields(Trade::SceneMappingType::UnsignedInt, 173, {
SceneTools: minor cleanup in the tests. Something an automated formatter couldn't do, adapting code formatting rules based on how given API use evolved to be most readable.
3 years ago
Trade::SceneFieldData{Trade::SceneField::Mesh,
Containers::arrayView(meshMappingData),
Containers::arrayView(meshFieldData)},
Trade::SceneFieldData{Trade::SceneField::MeshMaterial,
Containers::arrayView(meshMappingData),
Containers::ArrayView<Int>{nullptr, 3}},
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
});
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
CORRADE_COMPARE(scene.dataFlags(), Trade::DataFlag::Owned|Trade::DataFlag::Mutable);
CORRADE_COMPARE(scene.mappingType(), Trade::SceneMappingType::UnsignedInt);
CORRADE_COMPARE(scene.mappingBound(), 173);
CORRADE_COMPARE(scene.fieldCount(), 2);
CORRADE_COMPARE(scene.fieldType(Trade::SceneField::Mesh), Trade::SceneFieldType::UnsignedByte);
CORRADE_COMPARE(scene.fieldArraySize(Trade::SceneField::Mesh), 0);
CORRADE_COMPARE_AS(scene.mapping<UnsignedInt>(0),
Containers::arrayView(meshMappingData),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(scene.field<UnsignedByte>(0),
Containers::arrayView(meshFieldData),
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.fieldType(Trade::SceneField::MeshMaterial), Trade::SceneFieldType::Int);
CORRADE_COMPARE(scene.fieldSize(Trade::SceneField::MeshMaterial), 3);
CORRADE_COMPARE(scene.fieldArraySize(Trade::SceneField::MeshMaterial), 0);
CORRADE_COMPARE(scene.mapping(Trade::SceneField::MeshMaterial).data(), scene.mapping(Trade::SceneField::Mesh).data());
CORRADE_COMPARE_AS(scene.mapping<UnsignedInt>(Trade::SceneField::MeshMaterial),
Containers::arrayView(meshMappingData),
TestSuite::Compare::Container);
CORRADE_COMPARE(scene.field(Trade::SceneField::MeshMaterial).data(), scene.data() + 3*4 + 3 + 1);
CORRADE_COMPARE(scene.field(Trade::SceneField::MeshMaterial).stride()[0], 4);
}
SceneTools: tighten up & publish combineFields(). It'll be soon needed by other tools and library users as well. The main difference compared to the original internal API is that the detection for shared mapping views now takes also sizes and strides into account, without relying on just the data pointer. Some additional robustness checks are needed regarding fields that have mapping sharing enforced (as otherwise it'll fail in the SceneData constructor which isn't nice), that'll be done in subsequent commits.
3 years ago
void CombineTest::fieldsOffsetOnly() {
CORRADE_SKIP_IF_NO_ASSERT();
const struct Field {
UnsignedInt mapping;
UnsignedByte mesh;
UnsignedShort light;
} data[]{
{1, 3, 5},
{4, 6, 8},
};
auto view = Containers::stridedArrayView(data);
std::ostringstream out;
Error redirectError{&out};
combineFields(Trade::SceneMappingType::UnsignedInt, 173, {
Trade::SceneFieldData{Trade::SceneField::Mesh,
view.slice(&Field::mapping),
view.slice(&Field::mesh)},
Trade::SceneFieldData{Trade::SceneField::Light, 2,
Trade::SceneMappingType::UnsignedInt, offsetof(Field, mapping), sizeof(Field),
Trade::SceneFieldType::UnsignedShort, offsetof(Field, light), sizeof(Field)}
});
CORRADE_COMPARE(out.str(), "SceneTools::combineFields(): field 1 is offset-only\n");
}
void CombineTest::fieldsFromDataOffsetOnly() {
/* Same as fieldFromData(), but wrapped in a Scene first, which makes it
work */
const struct Field {
UnsignedInt mapping;
UnsignedByte mesh;
UnsignedShort light;
} data[]{
{1, 3, 5},
{4, 6, 8},
};
auto view = Containers::stridedArrayView(data);
Trade::SceneData scene{Trade::SceneMappingType::UnsignedInt, 22, {}, data, {
Trade::SceneFieldData{Trade::SceneField::Mesh,
view.slice(&Field::mapping),
view.slice(&Field::mesh)},
Trade::SceneFieldData{Trade::SceneField::Light, 2,
Trade::SceneMappingType::UnsignedInt, offsetof(Field, mapping), sizeof(Field),
Trade::SceneFieldType::UnsignedShort, offsetof(Field, light), sizeof(Field)}
}};
Trade::SceneData combined = combineFields(scene);
/* Since it's tightly packed, it's less data now */
CORRADE_COMPARE(combined.data().size(), 2*4 + 2*1 + 2*2);
CORRADE_COMPARE_AS(combined.data().size(), sizeof(data),
TestSuite::Compare::Less);
/* The two mappings are shared */
CORRADE_COMPARE_AS(combined.mapping<UnsignedInt>(Trade::SceneField::Mesh),
Containers::arrayView({1u, 4u}),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(combined.mapping<UnsignedInt>(Trade::SceneField::Light),
Containers::arrayView({1u, 4u}),
TestSuite::Compare::Container);
CORRADE_COMPARE(combined.mapping(Trade::SceneField::Light).data(), combined.mapping(Trade::SceneField::Mesh).data());
CORRADE_COMPARE_AS(combined.field<UnsignedByte>(Trade::SceneField::Mesh),
Containers::arrayView<UnsignedByte>({3, 6}),
TestSuite::Compare::Container);
CORRADE_COMPARE_AS(combined.field<UnsignedShort>(Trade::SceneField::Light),
Containers::arrayView<UnsignedShort>({5, 8}),
TestSuite::Compare::Container);
}
Trade: move the internal scene conversion tools to SceneTools. No functional change, just splitting them to two separate headers and two separate tests. These will eventually become public SceneTools APIs... once I figure out better naming.
4 years ago
}}}}
CORRADE_TEST_MAIN(Magnum::SceneTools::Test::CombineTest)