diff --git a/src/Magnum/Trade/SceneData.cpp b/src/Magnum/Trade/SceneData.cpp index 4beb7b022..bb2fdea7b 100644 --- a/src/Magnum/Trade/SceneData.cpp +++ b/src/Magnum/Trade/SceneData.cpp @@ -1312,7 +1312,7 @@ template void applyScaling(const Containers::St } -UnsignedInt SceneData::findTransformFields(UnsignedInt& transformationFieldId, UnsignedInt& translationFieldId, UnsignedInt& rotationFieldId, UnsignedInt& scalingFieldId) const { +UnsignedInt SceneData::findTransformationFields(UnsignedInt& transformationFieldId, UnsignedInt& translationFieldId, UnsignedInt& rotationFieldId, UnsignedInt& scalingFieldId) const { UnsignedInt fieldWithObjectMapping = ~UnsignedInt{}; transformationFieldId = ~UnsignedInt{}; translationFieldId = ~UnsignedInt{}; @@ -1432,7 +1432,7 @@ void SceneData::transformations2DIntoInternal(const UnsignedInt transformationFi void SceneData::transformations2DInto(const Containers::StridedArrayView1D& mappingDestination, const Containers::StridedArrayView1D& fieldDestination) const { UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const UnsignedInt fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const UnsignedInt fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); CORRADE_ASSERT(fieldWithObjectMapping != ~UnsignedInt{}, "Trade::SceneData::transformations2DInto(): no transformation-related field found", ); CORRADE_ASSERT(!mappingDestination || mappingDestination.size() == _fields[fieldWithObjectMapping]._size, @@ -1445,7 +1445,7 @@ void SceneData::transformations2DInto(const Containers::StridedArrayView1D& mappingDestination, const Containers::StridedArrayView1D& fieldDestination) const { UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const UnsignedInt fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const UnsignedInt fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); CORRADE_ASSERT(fieldWithObjectMapping != ~UnsignedInt{}, "Trade::SceneData::transformations2DInto(): no transformation-related field found", {}); const std::size_t fieldSize = _fields[fieldWithObjectMapping]._size; @@ -1461,7 +1461,7 @@ std::size_t SceneData::transformations2DInto(const std::size_t offset, const Con Containers::Array> SceneData::transformations2DAsArray() const { UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const UnsignedInt fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const UnsignedInt fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); CORRADE_ASSERT(fieldWithObjectMapping != ~UnsignedInt{}, /* Using the same message as in Into() to avoid too many redundant strings in the binary */ @@ -1678,7 +1678,7 @@ void SceneData::transformations3DIntoInternal(const UnsignedInt transformationFi void SceneData::transformations3DInto(const Containers::StridedArrayView1D& mappingDestination, const Containers::StridedArrayView1D& fieldDestination) const { UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const std::size_t fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const std::size_t fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); CORRADE_ASSERT(fieldWithObjectMapping != ~UnsignedInt{}, "Trade::SceneData::transformations3DInto(): no transformation-related field found", ); CORRADE_ASSERT(!mappingDestination || mappingDestination.size() == _fields[fieldWithObjectMapping]._size, @@ -1691,7 +1691,7 @@ void SceneData::transformations3DInto(const Containers::StridedArrayView1D& mappingDestination, const Containers::StridedArrayView1D& fieldDestination) const { UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const UnsignedInt fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const UnsignedInt fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); CORRADE_ASSERT(fieldWithObjectMapping != ~UnsignedInt{}, "Trade::SceneData::transformations3DInto(): no transformation-related field found", {}); const std::size_t fieldSize = _fields[fieldWithObjectMapping]._size; @@ -1707,7 +1707,7 @@ std::size_t SceneData::transformations3DInto(const std::size_t offset, const Con Containers::Array> SceneData::transformations3DAsArray() const { UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const UnsignedInt fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const UnsignedInt fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); CORRADE_ASSERT(fieldWithObjectMapping != ~UnsignedInt{}, /* Using the same message as in Into() to avoid too many redundant strings in the binary */ @@ -2175,7 +2175,7 @@ Containers::Optional SceneData::transformation2DFor(const UnsignedLong "Trade::SceneData::transformation2DFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const UnsignedInt fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const UnsignedInt fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); if(fieldWithObjectMapping == ~UnsignedInt{}) return {}; /* If is2D() returned false as well, all *FieldId would be invalid, which @@ -2219,7 +2219,7 @@ Containers::Optional SceneData::transformation3DFor(const UnsignedLong "Trade::SceneData::transformation3DFor(): object" << object << "out of bounds for" << _mappingBound << "objects", {}); UnsignedInt transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId; - const UnsignedInt fieldWithObjectMapping = findTransformFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); + const UnsignedInt fieldWithObjectMapping = findTransformationFields(transformationFieldId, translationFieldId, rotationFieldId, scalingFieldId); if(fieldWithObjectMapping == ~UnsignedInt{}) return {}; /* If is3D() returned false as well, all *FieldId would be invalid, which diff --git a/src/Magnum/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h index 3a4848269..1f5c80005 100644 --- a/src/Magnum/Trade/SceneData.h +++ b/src/Magnum/Trade/SceneData.h @@ -2831,7 +2831,7 @@ class MAGNUM_TRADE_EXPORT SceneData { MAGNUM_TRADE_LOCAL void mappingIntoInternal(UnsignedInt fieldId, std::size_t offset, const Containers::StridedArrayView1D& destination) const; MAGNUM_TRADE_LOCAL void parentsIntoInternal(UnsignedInt fieldId, std::size_t offset, const Containers::StridedArrayView1D& destination) const; - MAGNUM_TRADE_LOCAL UnsignedInt findTransformFields(UnsignedInt& transformationFieldId, UnsignedInt& translationFieldId, UnsignedInt& rotationFieldId, UnsignedInt& scalingFieldId) const; + MAGNUM_TRADE_LOCAL UnsignedInt findTransformationFields(UnsignedInt& transformationFieldId, UnsignedInt& translationFieldId, UnsignedInt& rotationFieldId, UnsignedInt& scalingFieldId) const; MAGNUM_TRADE_LOCAL UnsignedInt findTranslationRotationScalingFields(UnsignedInt& translationFieldId, UnsignedInt& rotationFieldId, UnsignedInt& scalingFieldId) const; MAGNUM_TRADE_LOCAL void transformations2DIntoInternal(UnsignedInt transformationFieldId, UnsignedInt translationFieldId, UnsignedInt rotationFieldId, UnsignedInt scalingFieldId, std::size_t offset, const Containers::StridedArrayView1D& destination) const; MAGNUM_TRADE_LOCAL void translationsRotationsScalings2DIntoInternal(UnsignedInt translationFieldId, UnsignedInt rotationFieldId, UnsignedInt scalingFieldId, std::size_t offset, const Containers::StridedArrayView1D& translationDestination, const Containers::StridedArrayView1D& rotationDestination, const Containers::StridedArrayView1D& scalingDestination) const;