diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp index f63e0b63f..a35976ae1 100644 --- a/src/Magnum/Trade/AbstractImporter.cpp +++ b/src/Magnum/Trade/AbstractImporter.cpp @@ -621,7 +621,7 @@ std::string AbstractImporter::doObject2DName(const UnsignedInt id) { _cachedScenes->scenes[i]->mappingBound() <= id) continue; - if(Containers::Optional parent = _cachedScenes->scenes[i]->parentFor(id)) + if(Containers::Optional parent = _cachedScenes->scenes[i]->parentFor(id)) return doObjectName(*parent); } @@ -678,7 +678,7 @@ Containers::Pointer AbstractImporter::doObject2D(const UnsignedInt std::vector children; /* not const so we can move it */ { - Containers::Array childrenArray = scene.childrenFor(id); + Containers::Array childrenArray = scene.childrenFor(id); children = {childrenArray.begin(), childrenArray.end()}; } const Containers::Array> mesh = scene.meshesMaterialsFor(id); @@ -799,7 +799,7 @@ std::string AbstractImporter::doObject3DName(const UnsignedInt id) { _cachedScenes->scenes[i]->mappingBound() <= id) continue; - if(Containers::Optional parent = _cachedScenes->scenes[i]->parentFor(id)) + if(Containers::Optional parent = _cachedScenes->scenes[i]->parentFor(id)) return doObjectName(*parent); } @@ -856,7 +856,7 @@ Containers::Pointer AbstractImporter::doObject3D(const UnsignedInt std::vector children; /* not const so we can move it */ { - Containers::Array childrenArray = scene.childrenFor(id); + Containers::Array childrenArray = scene.childrenFor(id); children = {childrenArray.begin(), childrenArray.end()}; } const Containers::Array> mesh = scene.meshesMaterialsFor(id); diff --git a/src/Magnum/Trade/SceneData.cpp b/src/Magnum/Trade/SceneData.cpp index a2ad3a325..97294045a 100644 --- a/src/Magnum/Trade/SceneData.cpp +++ b/src/Magnum/Trade/SceneData.cpp @@ -895,7 +895,7 @@ namespace { /* The `objects` view is already adjusted for `offset`, the offset is needed only to return the correct value for ImplicitMapping */ -template std::size_t findObject(const SceneFieldFlags flags, const Containers::StridedArrayView1D& mapping, const std::size_t offset, const UnsignedInt object) { +template std::size_t findObject(const SceneFieldFlags flags, const Containers::StridedArrayView1D& mapping, const std::size_t offset, const UnsignedLong object) { const std::size_t max = mapping.size(); /* Implicit mapping, position equals object ID (if in bounds) and thus an @@ -926,7 +926,7 @@ template std::size_t findObject(const SceneFieldFlags flags, const Cont } -std::size_t SceneData::findFieldObjectOffsetInternal(const SceneFieldData& field, const UnsignedInt object, const std::size_t offset) const { +std::size_t SceneData::findFieldObjectOffsetInternal(const SceneFieldData& field, const UnsignedLong object, const std::size_t offset) const { const Containers::StridedArrayView1D mapping = fieldDataMappingViewInternal(field, offset, field._size - offset); if(field._mappingType == SceneMappingType::UnsignedInt) return offset + findObject(field._flags, mapping, offset, object); @@ -939,7 +939,7 @@ std::size_t SceneData::findFieldObjectOffsetInternal(const SceneFieldData& field else CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } -Containers::Optional SceneData::findFieldObjectOffset(const UnsignedInt fieldId, const UnsignedInt object, const std::size_t offset) const { +Containers::Optional SceneData::findFieldObjectOffset(const UnsignedInt fieldId, const UnsignedLong object, const std::size_t offset) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::findFieldObjectOffset(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); CORRADE_ASSERT(fieldId < _fields.size(), @@ -953,7 +953,7 @@ Containers::Optional SceneData::findFieldObjectOffset(const Unsigne return found == field._size ? Containers::Optional{} : found; } -Containers::Optional SceneData::findFieldObjectOffset(const SceneField fieldName, const UnsignedInt object, const std::size_t offset) const { +Containers::Optional SceneData::findFieldObjectOffset(const SceneField fieldName, const UnsignedLong object, const std::size_t offset) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::findFieldObjectOffset(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -969,7 +969,7 @@ Containers::Optional SceneData::findFieldObjectOffset(const SceneFi return found == field._size ? Containers::Optional{} : found; } -std::size_t SceneData::fieldObjectOffset(const UnsignedInt fieldId, const UnsignedInt object, const std::size_t offset) const { +std::size_t SceneData::fieldObjectOffset(const UnsignedInt fieldId, const UnsignedLong object, const std::size_t offset) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::fieldObjectOffset(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); CORRADE_ASSERT(fieldId < _fields.size(), @@ -985,7 +985,7 @@ std::size_t SceneData::fieldObjectOffset(const UnsignedInt fieldId, const Unsign return found; } -std::size_t SceneData::fieldObjectOffset(const SceneField fieldName, const UnsignedInt object, const std::size_t offset) const { +std::size_t SceneData::fieldObjectOffset(const SceneField fieldName, const UnsignedLong object, const std::size_t offset) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::fieldObjectOffset(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -1003,7 +1003,7 @@ std::size_t SceneData::fieldObjectOffset(const SceneField fieldName, const Unsig return found; } -bool SceneData::hasFieldObject(const UnsignedInt fieldId, const UnsignedInt object) const { +bool SceneData::hasFieldObject(const UnsignedInt fieldId, const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::hasFieldObject(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); CORRADE_ASSERT(fieldId < _fields.size(), @@ -1013,7 +1013,7 @@ bool SceneData::hasFieldObject(const UnsignedInt fieldId, const UnsignedInt obje return findFieldObjectOffsetInternal(field, object, 0) != field._size; } -bool SceneData::hasFieldObject(const SceneField fieldName, const UnsignedInt object) const { +bool SceneData::hasFieldObject(const SceneField fieldName, const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::hasFieldObject(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2122,7 +2122,7 @@ Containers::Array> SceneData::importe return out; } -Containers::Optional SceneData::parentFor(const UnsignedInt object) const { +Containers::Optional SceneData::parentFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::parentFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2138,7 +2138,7 @@ Containers::Optional SceneData::parentFor(const UnsignedInt object) const { return *index; } -Containers::Array SceneData::childrenFor(const Int object) const { +Containers::Array SceneData::childrenFor(const Long object) const { CORRADE_ASSERT(object >= -1 && object < Long(_mappingBound), "Trade::SceneData::childrenFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2148,11 +2148,15 @@ Containers::Array SceneData::childrenFor(const Int object) const { const SceneFieldData& parentField = _fields[parentFieldId]; /* Collect IDs of all objects that reference this object */ - Containers::Array out; + Containers::Array out; for(std::size_t offset = 0; offset != parentField.size(); ++offset) { Int parentIndex[1]; parentsIntoInternal(parentFieldId, offset, parentIndex); if(*parentIndex == object) { + /** @todo this drops the upper 64 bits, might be a problem + eventually (at this point it's more important to have an API + that won't change the return types in the future, breaking + existing code) */ UnsignedInt child[1]; /** @todo bleh slow, use the children <-> parent field proxying when implemented */ @@ -2164,7 +2168,7 @@ Containers::Array SceneData::childrenFor(const Int object) const { return out; } -Containers::Optional SceneData::transformation2DFor(const UnsignedInt object) const { +Containers::Optional SceneData::transformation2DFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::transformation2DFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2185,7 +2189,7 @@ Containers::Optional SceneData::transformation2DFor(const UnsignedInt o return *transformation; } -Containers::Optional> SceneData::translationRotationScaling2DFor(const UnsignedInt object) const { +Containers::Optional> SceneData::translationRotationScaling2DFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::translationRotationScaling2DFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2208,7 +2212,7 @@ Containers::Optional> SceneData::t return {InPlaceInit, *translation, *rotation, *scaling}; } -Containers::Optional SceneData::transformation3DFor(const UnsignedInt object) const { +Containers::Optional SceneData::transformation3DFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::transformation3DFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2229,7 +2233,7 @@ Containers::Optional SceneData::transformation3DFor(const UnsignedInt o return *transformation; } -Containers::Optional> SceneData::translationRotationScaling3DFor(const UnsignedInt object) const { +Containers::Optional> SceneData::translationRotationScaling3DFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::translationRotationScaling3DFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2252,7 +2256,7 @@ Containers::Optional> SceneData return {InPlaceInit, *translation, *rotation, *scaling}; } -Containers::Array> SceneData::meshesMaterialsFor(const UnsignedInt object) const { +Containers::Array> SceneData::meshesMaterialsFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::meshesMaterialsFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2276,7 +2280,7 @@ Containers::Array> SceneData::meshesMaterials return out; } -Containers::Array SceneData::lightsFor(const UnsignedInt object) const { +Containers::Array SceneData::lightsFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::lightsFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2299,7 +2303,7 @@ Containers::Array SceneData::lightsFor(const UnsignedInt object) co return out; } -Containers::Array SceneData::camerasFor(const UnsignedInt object) const { +Containers::Array SceneData::camerasFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::camerasFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2322,7 +2326,7 @@ Containers::Array SceneData::camerasFor(const UnsignedInt object) c return out; } -Containers::Array SceneData::skinsFor(const UnsignedInt object) const { +Containers::Array SceneData::skinsFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::skinsFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2345,7 +2349,7 @@ Containers::Array SceneData::skinsFor(const UnsignedInt object) con return out; } -Containers::Optional SceneData::importerStateFor(const UnsignedInt object) const { +Containers::Optional SceneData::importerStateFor(const UnsignedLong object) const { CORRADE_ASSERT(object < _mappingBound, "Trade::SceneData::importerStateFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); @@ -2370,7 +2374,7 @@ std::vector SceneData::children2D() const { if(!hasField(SceneField::Parent)) Warning{} << "Trade::SceneData::children2D(): no parent field present, returned array will be empty"; - const Containers::Array children = childrenFor(-1); + const Containers::Array children = childrenFor(-1); return {children.begin(), children.end()}; } @@ -2382,7 +2386,7 @@ std::vector SceneData::children3D() const { if(!hasField(SceneField::Parent)) Warning{} << "Trade::SceneData::children3D(): no parent field present, returned array will be empty"; - const Containers::Array children = childrenFor(-1); + const Containers::Array children = childrenFor(-1); return {children.begin(), children.end()}; } #endif diff --git a/src/Magnum/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h index 53feab568..bf3cd4d91 100644 --- a/src/Magnum/Trade/SceneData.h +++ b/src/Magnum/Trade/SceneData.h @@ -1510,7 +1510,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * @see @ref hasFieldObject(UnsignedInt, UnsignedInt) const, * @ref fieldObjectOffset(UnsignedInt, UnsignedInt, std::size_t) const */ - Containers::Optional findFieldObjectOffset(UnsignedInt fieldId, UnsignedInt object, std::size_t offset = 0) const; + Containers::Optional findFieldObjectOffset(UnsignedInt fieldId, UnsignedLong object, std::size_t offset = 0) const; /** * @brief Find offset of an object in given named field @@ -1532,7 +1532,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * @see @ref hasField(), @ref hasFieldObject(SceneField, UnsignedInt) const, * @ref fieldObjectOffset(SceneField, UnsignedInt, std::size_t) const */ - Containers::Optional findFieldObjectOffset(SceneField fieldName, UnsignedInt object, std::size_t offset = 0) const; + Containers::Optional findFieldObjectOffset(SceneField fieldName, UnsignedLong object, std::size_t offset = 0) const; /** * @brief Offset of an object in given field @@ -1545,7 +1545,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * You can also use @ref fieldObjectOffset(SceneField, UnsignedInt, std::size_t) const * to directly get offset of an object in given named field. */ - std::size_t fieldObjectOffset(UnsignedInt fieldId, UnsignedInt object, std::size_t offset = 0) const; + std::size_t fieldObjectOffset(UnsignedInt fieldId, UnsignedLong object, std::size_t offset = 0) const; /** * @brief Offset of an object in given named field @@ -1555,7 +1555,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * but @p object is additionally expected to be present in @p fieldName * starting at @p offset. */ - std::size_t fieldObjectOffset(SceneField fieldName, UnsignedInt object, std::size_t offset = 0) const; + std::size_t fieldObjectOffset(SceneField fieldName, UnsignedLong object, std::size_t offset = 0) const; /** * @brief Whether a scene field has given object @@ -1564,7 +1564,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * The @p fieldId is expected to be smaller than @ref fieldCount() and * @p object smaller than @ref mappingBound(). */ - bool hasFieldObject(UnsignedInt fieldId, UnsignedInt object) const; + bool hasFieldObject(UnsignedInt fieldId, UnsignedLong object) const; /** * @brief Whether a named scene field has given object @@ -1574,7 +1574,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * be smaller than @ref mappingBound(). * @see @ref hasField() */ - bool hasFieldObject(SceneField fieldName, UnsignedInt object) const; + bool hasFieldObject(SceneField fieldName, UnsignedLong object) const; /** * @brief Field flags @@ -2510,7 +2510,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * The @p object is expected to be less than @ref mappingBound(). * @see @ref childrenFor() */ - Containers::Optional parentFor(UnsignedInt object) const; + Containers::Optional parentFor(UnsignedLong object) const; /** * @brief Children for given object @@ -2531,7 +2531,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * The @p object is expected to be less than @ref mappingBound(). * @see @ref parentFor() */ - Containers::Array childrenFor(Int object) const; + Containers::Array childrenFor(Long object) const; /** * @brief 2D transformation for given object @@ -2557,7 +2557,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * The @p object is expected to be less than @ref mappingBound(). * @see @ref translationRotationScaling2DFor() */ - Containers::Optional transformation2DFor(UnsignedInt object) const; + Containers::Optional transformation2DFor(UnsignedLong object) const; /** * @brief 2D translation, rotation and scaling for given object @@ -2586,7 +2586,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * The @p object is expected to be less than @ref mappingBound(). * @see @ref transformation2DFor() */ - Containers::Optional> translationRotationScaling2DFor(UnsignedInt object) const; + Containers::Optional> translationRotationScaling2DFor(UnsignedLong object) const; /** * @brief 3D transformation for given object @@ -2612,7 +2612,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * The @p object is expected to be less than @ref mappingBound(). * @see @ref translationRotationScaling3DFor() */ - Containers::Optional transformation3DFor(UnsignedInt object) const; + Containers::Optional transformation3DFor(UnsignedLong object) const; /** * @brief 3D translation, rotation and scaling for given object @@ -2641,7 +2641,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * The @p object is expected to be less than @ref mappingBound(). * @see @ref transformation3DFor() */ - Containers::Optional> translationRotationScaling3DFor(UnsignedInt object) const; + Containers::Optional> translationRotationScaling3DFor(UnsignedLong object) const; /** * @brief Meshes and materials for given object @@ -2663,7 +2663,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * * The @p object is expected to be less than @ref mappingBound(). */ - Containers::Array> meshesMaterialsFor(UnsignedInt object) const; + Containers::Array> meshesMaterialsFor(UnsignedLong object) const; /** * @brief Lights for given object @@ -2681,7 +2681,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * * The @p object is expected to be less than @ref mappingBound(). */ - Containers::Array lightsFor(UnsignedInt object) const; + Containers::Array lightsFor(UnsignedLong object) const; /** * @brief Cameras for given object @@ -2700,7 +2700,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * * The @p object is expected to be less than @ref mappingBound(). */ - Containers::Array camerasFor(UnsignedInt object) const; + Containers::Array camerasFor(UnsignedLong object) const; /** * @brief Skins for given object @@ -2718,7 +2718,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * * The @p object is expected to be less than @ref mappingBound(). */ - Containers::Array skinsFor(UnsignedInt object) const; + Containers::Array skinsFor(UnsignedLong object) const; /** * @brief Importer state for given object @@ -2738,7 +2738,7 @@ class MAGNUM_TRADE_EXPORT SceneData { * * The @p object is expected to be less than @ref mappingBound(). */ - Containers::Optional importerStateFor(UnsignedInt object) const; + Containers::Optional importerStateFor(UnsignedLong object) const; #ifdef MAGNUM_BUILD_DEPRECATED /** @@ -2815,7 +2815,7 @@ class MAGNUM_TRADE_EXPORT SceneData { /* Returns the offset at which `object` is for field at index `id`, or the end offset if the object is not found. The returned offset can be then passed to fieldData{Mapping,Field}ViewInternal(). */ - MAGNUM_TRADE_LOCAL std::size_t findFieldObjectOffsetInternal(const SceneFieldData& field, UnsignedInt object, std::size_t offset) const; + MAGNUM_TRADE_LOCAL std::size_t findFieldObjectOffsetInternal(const SceneFieldData& field, UnsignedLong object, std::size_t offset) const; /* Like objects() / field(), but returning just a 1D view, sliced from offset to offset + size. The parameterless overloads are equal to diff --git a/src/Magnum/Trade/Test/SceneDataTest.cpp b/src/Magnum/Trade/Test/SceneDataTest.cpp index 19a7978a0..395e03330 100644 --- a/src/Magnum/Trade/Test/SceneDataTest.cpp +++ b/src/Magnum/Trade/Test/SceneDataTest.cpp @@ -4985,25 +4985,25 @@ void SceneDataTest::childrenFor() { /* Just one child */ CORRADE_COMPARE_AS(scene.childrenFor(3), - Containers::arrayView({2}), + Containers::arrayView({2}), TestSuite::Compare::Container); /* More */ CORRADE_COMPARE_AS(scene.childrenFor(-1), - Containers::arrayView({4, 0}), + Containers::arrayView({4, 0}), TestSuite::Compare::Container); CORRADE_COMPARE_AS(scene.childrenFor(4), - Containers::arrayView({3, 1, 5}), + Containers::arrayView({3, 1, 5}), TestSuite::Compare::Container); /* Object that is present in the parent array but has no children */ CORRADE_COMPARE_AS(scene.childrenFor(5), - Containers::arrayView({}), + Containers::arrayView({}), TestSuite::Compare::Container); /* Object that is not in the parent array at all */ CORRADE_COMPARE_AS(scene.childrenFor(6), - Containers::arrayView({}), + Containers::arrayView({}), TestSuite::Compare::Container); } @@ -5024,17 +5024,17 @@ void SceneDataTest::childrenForTrivialParent() { /* Trivial children */ CORRADE_COMPARE_AS(scene.childrenFor(-1), - Containers::arrayView({3, 4, 2, 4}), + Containers::arrayView({3, 4, 2, 4}), TestSuite::Compare::Container); /* Object that is present in the parent array but has no children */ CORRADE_COMPARE_AS(scene.childrenFor(4), - Containers::arrayView({}), + Containers::arrayView({}), TestSuite::Compare::Container); /* Object that is not in the parent array */ CORRADE_COMPARE_AS(scene.childrenFor(5), - Containers::arrayView({}), + Containers::arrayView({}), TestSuite::Compare::Container); } @@ -5461,7 +5461,7 @@ void SceneDataTest::fieldForFieldMissing() { CORRADE_COMPARE(scene.parentFor(6), Containers::NullOpt); CORRADE_COMPARE_AS(scene.childrenFor(6), - Containers::arrayView({}), + Containers::arrayView({}), TestSuite::Compare::Container); CORRADE_COMPARE(scene.transformation2DFor(6), Containers::NullOpt); CORRADE_COMPARE(scene.translationRotationScaling2DFor(6), Containers::NullOpt); diff --git a/src/Magnum/Trade/Test/SceneToolsTest.cpp b/src/Magnum/Trade/Test/SceneToolsTest.cpp index 807b1839e..aadad0f51 100644 --- a/src/Magnum/Trade/Test/SceneToolsTest.cpp +++ b/src/Magnum/Trade/Test/SceneToolsTest.cpp @@ -427,7 +427,7 @@ void SceneToolsTest::convertToSingleFunctionObjects() { /* Object 0 should have new children with "foo", as it has a light */ CORRADE_COMPARE_AS(scene.childrenFor(0), - Containers::arrayView({67}), + Containers::arrayView({67}), TestSuite::Compare::Container); CORRADE_COMPARE_AS(scene.lightsFor(0), Containers::arrayView({15}), @@ -435,7 +435,7 @@ void SceneToolsTest::convertToSingleFunctionObjects() { /* Object 1 should have a new child with "foo", as it has a light */ CORRADE_COMPARE_AS(scene.childrenFor(1), - Containers::arrayView({68}), + Containers::arrayView({68}), TestSuite::Compare::Container); CORRADE_COMPARE_AS(scene.lightsFor(1), Containers::arrayView({23}), @@ -444,7 +444,7 @@ void SceneToolsTest::convertToSingleFunctionObjects() { /* Object 2 should have a new child with the camera and "foo", as it has a mesh */ CORRADE_COMPARE_AS(scene.childrenFor(2), - Containers::arrayView({66, 69}), + Containers::arrayView({66, 69}), TestSuite::Compare::Container); CORRADE_COMPARE_AS(scene.meshesMaterialsFor(2), (Containers::arrayView>({{7, 2}})), @@ -458,7 +458,7 @@ void SceneToolsTest::convertToSingleFunctionObjects() { /* Object 15 should have a new child that has the second mesh */ CORRADE_COMPARE_AS(scene.childrenFor(15), - Containers::arrayView({65}), + Containers::arrayView({65}), TestSuite::Compare::Container); CORRADE_COMPARE_AS(scene.meshesMaterialsFor(15), (Containers::arrayView>({{6, 4}})), @@ -470,7 +470,7 @@ void SceneToolsTest::convertToSingleFunctionObjects() { /* Object 23 should have two new children that have the second and third mesh */ CORRADE_COMPARE_AS(scene.childrenFor(23), - Containers::arrayView({63, 64}), + Containers::arrayView({63, 64}), TestSuite::Compare::Container); CORRADE_COMPARE_AS(scene.meshesMaterialsFor(23), (Containers::arrayView>({{1, 0}})),