diff --git a/doc/snippets/MagnumTrade.cpp b/doc/snippets/MagnumTrade.cpp index a5318d486..96ca2a00b 100644 --- a/doc/snippets/MagnumTrade.cpp +++ b/doc/snippets/MagnumTrade.cpp @@ -152,10 +152,10 @@ Containers::Optional data = importer->animation(id); Animation::Player player; Containers::Array positions; /* Translations for all objects */ for(UnsignedInt i = 0; i != data->trackCount(); ++i) { - if(data->trackTarget(i) == Trade::AnimationTrackTarget::Translation3D) { + if(data->trackTargetType(i) == Trade::AnimationTrackTargetType::Translation3D) { CORRADE_INTERNAL_ASSERT(data->trackType(i) == Trade::AnimationTrackType::Vector3); - player.add(data->track(i), positions[data->trackTargetId(i)]); + player.add(data->track(i), positions[data->trackTarget(i)]); } // similarly for rotation / scaling ... diff --git a/src/Magnum/Trade/AnimationData.cpp b/src/Magnum/Trade/AnimationData.cpp index fd0b1ed11..54824e1db 100644 --- a/src/Magnum/Trade/AnimationData.cpp +++ b/src/Magnum/Trade/AnimationData.cpp @@ -60,14 +60,14 @@ AnimationTrackType AnimationData::trackResultType(UnsignedInt id) const { return _tracks[id]._resultType; } -AnimationTrackTarget AnimationData::trackTarget(UnsignedInt id) const { - CORRADE_ASSERT(id < _tracks.size(), "Trade::AnimationData::trackTarget(): index out of range", {}); - return _tracks[id]._target; +AnimationTrackTargetType AnimationData::trackTargetType(UnsignedInt id) const { + CORRADE_ASSERT(id < _tracks.size(), "Trade::AnimationData::trackTargetType(): index out of range", {}); + return _tracks[id]._targetType; } -UnsignedInt AnimationData::trackTargetId(UnsignedInt id) const { - CORRADE_ASSERT(id < _tracks.size(), "Trade::AnimationData::trackTargetId(): index out of range", {}); - return _tracks[id]._targetId; +UnsignedInt AnimationData::trackTarget(UnsignedInt id) const { + CORRADE_ASSERT(id < _tracks.size(), "Trade::AnimationData::trackTarget(): index out of range", {}); + return _tracks[id]._target; } const Animation::TrackViewStorage& AnimationData::track(UnsignedInt id) const { @@ -140,13 +140,13 @@ Debug& operator<<(Debug& debug, const AnimationTrackType value) { return debug << "Trade::AnimationTrackType(" << Debug::nospace << reinterpret_cast(UnsignedByte(value)) << Debug::nospace << ")"; } -Debug& operator<<(Debug& debug, const AnimationTrackTarget value) { - if(UnsignedByte(value) >= UnsignedByte(AnimationTrackTarget::Custom)) - return debug << "Trade::AnimationTrackTarget::Custom(" << Debug::nospace << UnsignedByte(value) << Debug::nospace << ")"; +Debug& operator<<(Debug& debug, const AnimationTrackTargetType value) { + if(UnsignedByte(value) >= UnsignedByte(AnimationTrackTargetType::Custom)) + return debug << "Trade::AnimationTrackTargetType::Custom(" << Debug::nospace << UnsignedByte(value) << Debug::nospace << ")"; switch(value) { /* LCOV_EXCL_START */ - #define _c(value) case AnimationTrackTarget::value: return debug << "Trade::AnimationTrackTarget::" #value; + #define _c(value) case AnimationTrackTargetType::value: return debug << "Trade::AnimationTrackTargetType::" #value; _c(Translation2D) _c(Translation3D) _c(Rotation2D) @@ -157,10 +157,10 @@ Debug& operator<<(Debug& debug, const AnimationTrackTarget value) { /* LCOV_EXCL_STOP */ /* To silence compiler warning about unhandled values */ - case AnimationTrackTarget::Custom: CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ + case AnimationTrackTargetType::Custom: CORRADE_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */ } - return debug << "Trade::AnimationTrackTarget(" << Debug::nospace << reinterpret_cast(UnsignedByte(value)) << Debug::nospace << ")"; + return debug << "Trade::AnimationTrackTargetType(" << Debug::nospace << reinterpret_cast(UnsignedByte(value)) << Debug::nospace << ")"; } #endif diff --git a/src/Magnum/Trade/AnimationData.h b/src/Magnum/Trade/AnimationData.h index 2f8dab041..0f1ee6317 100644 --- a/src/Magnum/Trade/AnimationData.h +++ b/src/Magnum/Trade/AnimationData.h @@ -26,7 +26,7 @@ */ /** @file - * @brief Class @ref Magnum::Trade::AnimationTrackData, @ref Magnum::Trade::AnimationData, enum @ref Magnum::Trade::AnimationTrackType, @ref Magnum::Trade::AnimationTrackTarget, function @ref Magnum::Trade::animationInterpolatorFor() + * @brief Class @ref Magnum::Trade::AnimationTrackData, @ref Magnum::Trade::AnimationData, enum @ref Magnum::Trade::AnimationTrackType, @ref Magnum::Trade::AnimationTrackTargetType, function @ref Magnum::Trade::animationInterpolatorFor() */ #include "Magnum/Magnum.h" @@ -54,8 +54,8 @@ enum class AnimationTrackType: UnsignedByte { /** * @ref Magnum::Vector2 "Vector2". Usually used for - * @ref AnimationTrackTarget::Translation2D and - * @ref AnimationTrackTarget::Scaling2D. + * @ref AnimationTrackTargetType::Translation2D and + * @ref AnimationTrackTargetType::Scaling2D. */ Vector2, @@ -77,13 +77,13 @@ enum class AnimationTrackType: UnsignedByte { /** * @ref Magnum::Complex "Complex". Usually used for - * @ref AnimationTrackTarget::Rotation2D. + * @ref AnimationTrackTargetType::Rotation2D. */ Complex, /** * @ref Magnum::Quaternion "Quaternion". Usually used for - * @ref AnimationTrackTarget::Rotation3D. + * @ref AnimationTrackTargetType::Rotation3D. */ Quaternion, @@ -92,27 +92,27 @@ enum class AnimationTrackType: UnsignedByte { /** * @ref Magnum::CubicHermite2D "CubicHermite2D". Usually used for - * spline-interpolated @ref AnimationTrackTarget::Translation2D and - * @ref AnimationTrackTarget::Scaling2D. + * spline-interpolated @ref AnimationTrackTargetType::Translation2D and + * @ref AnimationTrackTargetType::Scaling2D. */ CubicHermite2D, /** * @ref Magnum::CubicHermite3D "CubicHermite3D". Usually used for - * spline-interpolated @ref AnimationTrackTarget::Translation3D and - * @ref AnimationTrackTarget::Scaling3D. + * spline-interpolated @ref AnimationTrackTargetType::Translation3D and + * @ref AnimationTrackTargetType::Scaling3D. */ CubicHermite3D, /** * @ref Magnum::CubicHermiteComplex "CubicHermiteComplex". Usually used for - * spline-interpolated @ref AnimationTrackTarget::Rotation2D. + * spline-interpolated @ref AnimationTrackTargetType::Rotation2D. */ CubicHermiteComplex, /** * @ref Magnum::CubicHermiteQuaternion "CubicHermiteQuaternion". Usually - * used for spline-interpolated @ref AnimationTrackTarget::Rotation3D. + * used for spline-interpolated @ref AnimationTrackTargetType::Rotation3D. */ CubicHermiteQuaternion }; @@ -126,7 +126,7 @@ MAGNUM_TRADE_EXPORT Debug& operator<<(Debug& debug, AnimationTrackType value); @see @ref AnimationData @experimental */ -enum class AnimationTrackTarget: UnsignedByte { +enum class AnimationTrackTargetType: UnsignedByte { /** * Modifies 2D object translation. Type is usually * @ref Magnum::Vector2 "Vector2" or @@ -201,15 +201,15 @@ enum class AnimationTrackTarget: UnsignedByte { /** * This and all higher values are for importer-specific targets. Can be of - * any type, @ref AnimationData::trackTargetId() might or might not point - * to an existing object. See documentation of particular importer for + * any type, @ref AnimationData::trackTarget() might or might not point to + * an existing object. See documentation of particular importer for * details. */ Custom = 128 }; -/** @debugoperatorenum{AnimationTrackTarget} */ -MAGNUM_TRADE_EXPORT Debug& operator<<(Debug& debug, AnimationTrackTarget value); +/** @debugoperatorenum{AnimationTrackTargetType} */ +MAGNUM_TRADE_EXPORT Debug& operator<<(Debug& debug, AnimationTrackTargetType value); /** @brief Animation track data @@ -227,31 +227,31 @@ class AnimationTrackData { * initialization of @ref AnimationData structure, expected to be * replaced with concrete values later. */ - /*implicit*/ AnimationTrackData() noexcept: _type{}, _resultType{}, _target{}, _targetId{}, _view{} {} + /*implicit*/ AnimationTrackData() noexcept: _type{}, _resultType{}, _targetType{}, _target{}, _view{} {} /** * @brief Constructor * @param type Value type * @param resultType Result type + * @param targetType Track target type * @param target Track target - * @param targetId Track target ID * @param view Type-erased @ref Animation::TrackView instance */ - /*implicit*/ AnimationTrackData(AnimationTrackType type, AnimationTrackType resultType, AnimationTrackTarget target, UnsignedInt targetId, Animation::TrackViewStorage view) noexcept: _type{type}, _resultType{resultType}, _target{target}, _targetId{targetId}, _view{view} {} + /*implicit*/ AnimationTrackData(AnimationTrackType type, AnimationTrackType resultType, AnimationTrackTargetType targetType, UnsignedInt target, Animation::TrackViewStorage view) noexcept: _type{type}, _resultType{resultType}, _targetType{targetType}, _target{target}, _view{view} {} /** @overload * * Equivalent to the above with @p type used as both value type and * result type. */ - /*implicit*/ AnimationTrackData(AnimationTrackType type, AnimationTrackTarget target, UnsignedInt targetId, Animation::TrackViewStorage view) noexcept: _type{type}, _resultType{type}, _target{target}, _targetId{targetId}, _view{view} {} + /*implicit*/ AnimationTrackData(AnimationTrackType type, AnimationTrackTargetType targetType, UnsignedInt target, Animation::TrackViewStorage view) noexcept: _type{type}, _resultType{type}, _targetType{targetType}, _target{target}, _view{view} {} private: friend AnimationData; AnimationTrackType _type, _resultType; - AnimationTrackTarget _target; - UnsignedInt _targetId; + AnimationTrackTargetType _targetType; + UnsignedInt _target; Animation::TrackViewStorage _view; }; @@ -357,8 +357,9 @@ class MAGNUM_TRADE_EXPORT AnimationData { * @brief Track value type * @param id Track index * - * Data types are usually closely related to @ref trackTarget(), see - * @ref AnimationTrackTarget documentation for more information. + * Data types are usually closely related to @ref trackTargetType(), + * see @ref AnimationTrackTargetType documentation for more + * information. * @see @ref trackCount() */ AnimationTrackType trackType(UnsignedInt id) const; @@ -369,38 +370,39 @@ class MAGNUM_TRADE_EXPORT AnimationData { * * In case track values are packed, track result type is different from * @ref trackType(). Data types are usually closely related to - * @ref trackTarget(), see @ref AnimationTrackTarget documentation for - * more information. + * @ref trackTargetType(), see @ref AnimationTrackTargetType + * documentation for more information. * @see @ref trackCount() */ AnimationTrackType trackResultType(UnsignedInt id) const; /** - * @brief Track target + * @brief Track target type * @param id Track index * * Particular animation targets usually correspond to a common - * @ref trackType(), see @ref AnimationTrackTarget documentation for - * more information. + * @ref trackType(), see @ref AnimationTrackTargetType documentation + * for more information. * @see @ref trackCount() */ - AnimationTrackTarget trackTarget(UnsignedInt id) const; + AnimationTrackTargetType trackTargetType(UnsignedInt id) const; /** - * @brief Track target index + * @brief Track target * @param id Track index * - * For @ref trackTarget() with @ref AnimationTrackTarget::Translation2D, - * @ref AnimationTrackTarget::Translation3D, - * @ref AnimationTrackTarget::Rotation2D, - * @ref AnimationTrackTarget::Rotation3D, - * @ref AnimationTrackTarget::Scaling2D, - * @ref AnimationTrackTarget::Scaling3D specifies object which property - * is modified. + * For @ref trackTargetType() with + * @ref AnimationTrackTargetType::Translation2D, + * @ref AnimationTrackTargetType::Translation3D, + * @ref AnimationTrackTargetType::Rotation2D, + * @ref AnimationTrackTargetType::Rotation3D, + * @ref AnimationTrackTargetType::Scaling2D, + * @ref AnimationTrackTargetType::Scaling3D specifies object which + * property is modified. * @see @ref trackCount(), @ref AbstractImporter::object2D(), * @ref AbstractImporter::object3D() */ - UnsignedInt trackTargetId(UnsignedInt id) const; + UnsignedInt trackTarget(UnsignedInt id) const; /** * @brief Track data storage diff --git a/src/Magnum/Trade/Test/AnimationDataTest.cpp b/src/Magnum/Trade/Test/AnimationDataTest.cpp index 006ae5b38..1281de48a 100644 --- a/src/Magnum/Trade/Test/AnimationDataTest.cpp +++ b/src/Magnum/Trade/Test/AnimationDataTest.cpp @@ -49,7 +49,7 @@ struct AnimationDataTest: TestSuite::Tester { void trackWrongResultType(); void debugAnimationTrackType(); - void debugAnimationTrackTarget(); + void debugAnimationTrackTargetType(); }; AnimationDataTest::AnimationDataTest() { @@ -68,7 +68,7 @@ AnimationDataTest::AnimationDataTest() { &AnimationDataTest::trackWrongResultType, &AnimationDataTest::debugAnimationTrackType, - &AnimationDataTest::debugAnimationTrackTarget}); + &AnimationDataTest::debugAnimationTrackTargetType}); } using namespace Math::Literals; @@ -90,14 +90,14 @@ void AnimationDataTest::construct() { const int state = 5; AnimationData data{std::move(buffer), Containers::Array{Containers::InPlaceInit, { {AnimationTrackType::Vector3, - AnimationTrackTarget::Translation3D, 42, + AnimationTrackTargetType::Translation3D, 42, Animation::TrackView{ {&view[0].time, view.size(), sizeof(Data)}, {&view[0].position, view.size(), sizeof(Data)}, Animation::Interpolation::Constant, animationInterpolatorFor(Animation::Interpolation::Constant)}}, {AnimationTrackType::Quaternion, - AnimationTrackTarget::Rotation3D, 1337, + AnimationTrackTargetType::Rotation3D, 1337, Animation::TrackView{ {&view[0].time, view.size(), sizeof(Data)}, {&view[0].rotation, view.size(), sizeof(Data)}, @@ -113,8 +113,8 @@ void AnimationDataTest::construct() { { CORRADE_COMPARE(data.trackType(0), AnimationTrackType::Vector3); CORRADE_COMPARE(data.trackResultType(0), AnimationTrackType::Vector3); - CORRADE_COMPARE(data.trackTarget(0), AnimationTrackTarget::Translation3D); - CORRADE_COMPARE(data.trackTargetId(0), 42); + CORRADE_COMPARE(data.trackTargetType(0), AnimationTrackTargetType::Translation3D); + CORRADE_COMPARE(data.trackTarget(0), 42); Animation::TrackView track = data.track(0); CORRADE_COMPARE(track.keys().size(), 3); @@ -124,8 +124,8 @@ void AnimationDataTest::construct() { } { CORRADE_COMPARE(data.trackType(1), AnimationTrackType::Quaternion); CORRADE_COMPARE(data.trackResultType(1), AnimationTrackType::Quaternion); - CORRADE_COMPARE(data.trackTarget(1), AnimationTrackTarget::Rotation3D); - CORRADE_COMPARE(data.trackTargetId(1), 1337); + CORRADE_COMPARE(data.trackTargetType(1), AnimationTrackTargetType::Rotation3D); + CORRADE_COMPARE(data.trackTarget(1), 1337); Animation::TrackView track = data.track(1); CORRADE_COMPARE(track.keys().size(), 3); @@ -152,13 +152,13 @@ void AnimationDataTest::constructImplicitDuration() { const int state = 5; AnimationData data{std::move(buffer), Containers::Array{Containers::InPlaceInit, { {AnimationTrackType::Bool, - AnimationTrackTarget(129), 0, + AnimationTrackTargetType(129), 0, Animation::TrackView{ {&view[0].time, 2, sizeof(Data)}, {&view[0].value, 2, sizeof(Data)}, Animation::Interpolation::Constant}}, {AnimationTrackType::Bool, - AnimationTrackTarget(130), 1, + AnimationTrackTargetType(130), 1, Animation::TrackView{ {&view[2].time, 2, sizeof(Data)}, {&view[2].value, 2, sizeof(Data)}, @@ -171,8 +171,8 @@ void AnimationDataTest::constructImplicitDuration() { { CORRADE_COMPARE(data.trackType(0), AnimationTrackType::Bool); CORRADE_COMPARE(data.trackResultType(0), AnimationTrackType::Bool); - CORRADE_COMPARE(data.trackTarget(0), AnimationTrackTarget(129)); - CORRADE_COMPARE(data.trackTargetId(0), 0); + CORRADE_COMPARE(data.trackTargetType(0), AnimationTrackTargetType(129)); + CORRADE_COMPARE(data.trackTarget(0), 0); Animation::TrackView track = data.track(0); CORRADE_COMPARE(track.duration(), (Range1D{1.0f, 5.0f})); @@ -183,8 +183,8 @@ void AnimationDataTest::constructImplicitDuration() { } { CORRADE_COMPARE(data.trackType(1), AnimationTrackType::Bool); CORRADE_COMPARE(data.trackResultType(1), AnimationTrackType::Bool); - CORRADE_COMPARE(data.trackTarget(1), AnimationTrackTarget(130)); - CORRADE_COMPARE(data.trackTargetId(1), 1); + CORRADE_COMPARE(data.trackTargetType(1), AnimationTrackTargetType(130)); + CORRADE_COMPARE(data.trackTarget(1), 1); Animation::TrackView track = data.track(1); CORRADE_COMPARE(track.duration(), (Range1D{3.0f, 7.0f})); @@ -221,14 +221,14 @@ void AnimationDataTest::constructMove() { const int state = 5; AnimationData a{std::move(buffer), Containers::Array{Containers::InPlaceInit, { {AnimationTrackType::Vector3, - AnimationTrackTarget::Translation3D, 42, + AnimationTrackTargetType::Translation3D, 42, Animation::TrackView{ {&view[0].time, view.size(), sizeof(Data)}, {&view[0].position, view.size(), sizeof(Data)}, Animation::Interpolation::Constant, animationInterpolatorFor(Animation::Interpolation::Constant)}}, {AnimationTrackType::Quaternion, - AnimationTrackTarget::Rotation3D, 1337, + AnimationTrackTargetType::Rotation3D, 1337, Animation::TrackView{ {&view[0].time, view.size(), sizeof(Data)}, {&view[0].rotation, view.size(), sizeof(Data)}, @@ -246,8 +246,8 @@ void AnimationDataTest::constructMove() { { CORRADE_COMPARE(b.trackType(0), AnimationTrackType::Vector3); CORRADE_COMPARE(b.trackResultType(0), AnimationTrackType::Vector3); - CORRADE_COMPARE(b.trackTarget(0), AnimationTrackTarget::Translation3D); - CORRADE_COMPARE(b.trackTargetId(0), 42); + CORRADE_COMPARE(b.trackTargetType(0), AnimationTrackTargetType::Translation3D); + CORRADE_COMPARE(b.trackTarget(0), 42); Animation::TrackView track = b.track(0); CORRADE_COMPARE(track.keys().size(), 3); @@ -257,8 +257,8 @@ void AnimationDataTest::constructMove() { } { CORRADE_COMPARE(b.trackType(1), AnimationTrackType::Quaternion); CORRADE_COMPARE(b.trackResultType(1), AnimationTrackType::Quaternion); - CORRADE_COMPARE(b.trackTarget(1), AnimationTrackTarget::Rotation3D); - CORRADE_COMPARE(b.trackTargetId(1), 1337); + CORRADE_COMPARE(b.trackTargetType(1), AnimationTrackTargetType::Rotation3D); + CORRADE_COMPARE(b.trackTarget(1), 1337); Animation::TrackView track = b.track(1); CORRADE_COMPARE(track.keys().size(), 3); @@ -279,8 +279,8 @@ void AnimationDataTest::constructMove() { { CORRADE_COMPARE(c.trackType(0), AnimationTrackType::Vector3); CORRADE_COMPARE(c.trackResultType(0), AnimationTrackType::Vector3); - CORRADE_COMPARE(c.trackTarget(0), AnimationTrackTarget::Translation3D); - CORRADE_COMPARE(c.trackTargetId(0), 42); + CORRADE_COMPARE(c.trackTargetType(0), AnimationTrackTargetType::Translation3D); + CORRADE_COMPARE(c.trackTarget(0), 42); Animation::TrackView track = c.track(0); CORRADE_COMPARE(track.keys().size(), 3); @@ -290,8 +290,8 @@ void AnimationDataTest::constructMove() { } { CORRADE_COMPARE(c.trackType(1), AnimationTrackType::Quaternion); CORRADE_COMPARE(c.trackResultType(1), AnimationTrackType::Quaternion); - CORRADE_COMPARE(c.trackTarget(1), AnimationTrackTarget::Rotation3D); - CORRADE_COMPARE(c.trackTargetId(1), 1337); + CORRADE_COMPARE(c.trackTargetType(1), AnimationTrackTargetType::Rotation3D); + CORRADE_COMPARE(c.trackTarget(1), 1337); Animation::TrackView track = c.track(1); CORRADE_COMPARE(track.keys().size(), 3); @@ -321,7 +321,7 @@ void AnimationDataTest::trackCustomResultType() { AnimationData data{std::move(buffer), Containers::Array{Containers::InPlaceInit, { {AnimationTrackType::Vector3i, AnimationTrackType::Vector3, - AnimationTrackTarget::Scaling3D, 0, + AnimationTrackTargetType::Scaling3D, 0, Animation::TrackView{ {&view[0].time, view.size(), sizeof(Data)}, {&view[0].position, view.size(), sizeof(Data)}, @@ -340,15 +340,15 @@ void AnimationDataTest::trackWrongIndex() { AnimationData data{nullptr, nullptr}; data.trackType(0); data.trackResultType(0); + data.trackTargetType(0); data.trackTarget(0); - data.trackTargetId(0); data.track(0); CORRADE_COMPARE(out.str(), "Trade::AnimationData::trackType(): index out of range\n" "Trade::AnimationData::trackResultType(): index out of range\n" + "Trade::AnimationData::trackTargetType(): index out of range\n" "Trade::AnimationData::trackTarget(): index out of range\n" - "Trade::AnimationData::trackTargetId(): index out of range\n" "Trade::AnimationData::track(): index out of range\n"); } @@ -359,7 +359,7 @@ void AnimationDataTest::trackWrongType() { AnimationData data{nullptr, Containers::Array{Containers::InPlaceInit, { {AnimationTrackType::Vector3i, AnimationTrackType::Vector3, - AnimationTrackTarget::Scaling3D, 0, {}} + AnimationTrackTargetType::Scaling3D, 0, {}} }}}; data.track(0); @@ -374,7 +374,7 @@ void AnimationDataTest::trackWrongResultType() { AnimationData data{nullptr, Containers::Array{Containers::InPlaceInit, { {AnimationTrackType::Vector3i, AnimationTrackType::Vector3, - AnimationTrackTarget::Scaling3D, 0, {}} + AnimationTrackTargetType::Scaling3D, 0, {}} }}}; data.track(0); @@ -389,11 +389,11 @@ void AnimationDataTest::debugAnimationTrackType() { CORRADE_COMPARE(out.str(), "Trade::AnimationTrackType::DualQuaternion Trade::AnimationTrackType(0xde)\n"); } -void AnimationDataTest::debugAnimationTrackTarget() { +void AnimationDataTest::debugAnimationTrackTargetType() { std::ostringstream out; - Debug{&out} << AnimationTrackTarget::Rotation3D << AnimationTrackTarget(135) << AnimationTrackTarget(0x42); - CORRADE_COMPARE(out.str(), "Trade::AnimationTrackTarget::Rotation3D Trade::AnimationTrackTarget::Custom(135) Trade::AnimationTrackTarget(0x42)\n"); + Debug{&out} << AnimationTrackTargetType::Rotation3D << AnimationTrackTargetType(135) << AnimationTrackTargetType(0x42); + CORRADE_COMPARE(out.str(), "Trade::AnimationTrackTargetType::Rotation3D Trade::AnimationTrackTargetType::Custom(135) Trade::AnimationTrackTargetType(0x42)\n"); } }}} diff --git a/src/Magnum/Trade/Trade.h b/src/Magnum/Trade/Trade.h index 793717ab1..b01ab69db 100644 --- a/src/Magnum/Trade/Trade.h +++ b/src/Magnum/Trade/Trade.h @@ -43,7 +43,7 @@ enum class MaterialType: UnsignedByte; enum class MaterialAlphaMode: UnsignedByte; class AbstractMaterialData; -enum class AnimationTrackTarget: UnsignedByte; +enum class AnimationTrackTargetType: UnsignedByte; enum class AnimationTrackType: UnsignedByte; class AnimationTrackData; class AnimationData;