ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Trade: add getters for AnimationTrackData. 

Mainly for testing purposes, to not have to create a whole AnimationData
just to verify the type got constructed.
pull/617/head
Vladimír Vondruš 3 years ago
parent
d3ee6b2b93
commit
dbd3b52b3c
2 changed files with 60 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/Magnum/Trade/AnimationData.h
  2. 54
      src/Magnum/Trade/Test/AnimationDataTest.cpp

30
src/Magnum/Trade/AnimationData.h
Unescape View File

@ -381,6 +381,36 @@ class AnimationTrackData {
*/
template<class V, class R> explicit AnimationTrackData(AnimationTrackTarget targetName, UnsignedLong target, Animation::TrackView<const Float, const V, R> view) noexcept;
/**
* @brief Value type
* @m_since_latest
*/
AnimationTrackType type() const { return _type; }
/**
* @brief Result type
* @m_since_latest
*/
AnimationTrackType resultType() const { return _resultType; }
/**
* @brief Track target name
* @m_since_latest
*/
AnimationTrackTarget targetName() const { return _targetName; }
/**
* @brief Track target ID
* @m_since_latest
*/
UnsignedLong target() const { return _target; }
/**
* @brief Type-erased @ref Animation::TrackView instance
* @m_since_latest
*/
Animation::TrackViewStorage<const Float> track() const { return _view; }
private:
friend AnimationData;

54
src/Magnum/Trade/Test/AnimationDataTest.cpp
Unescape View File

@ -189,23 +189,22 @@ void AnimationDataTest::debugTrackTargetPacked() {
}
void AnimationDataTest::constructTrack() {
AnimationTrackData trackData{
AnimationTrackData data{
AnimationTrackType::Vector3,
AnimationTrackTarget::Translation3D, 42,
Animation::TrackView<const Float, const Vector3>{
nullptr,
Animation::Interpolation::Linear,
animationInterpolatorFor<Vector3>(Animation::Interpolation::Linear)}};
AnimationData data{nullptr, Containers::Array<AnimationTrackData>{InPlaceInit, {trackData}}};
CORRADE_COMPARE(data.trackType(0), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.trackResultType(0), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.trackTargetName(0), AnimationTrackTarget::Translation3D);
CORRADE_COMPARE(data.trackTarget(0), 42);
CORRADE_COMPARE(data.track(0).interpolation(), Animation::Interpolation::Linear);
CORRADE_COMPARE(data.type(), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.resultType(), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.targetName(), AnimationTrackTarget::Translation3D);
CORRADE_COMPARE(data.target(), 42);
CORRADE_COMPARE(data.track().interpolation(), Animation::Interpolation::Linear);
}
void AnimationDataTest::constructTrackResultType() {
AnimationTrackData trackData{
AnimationTrackData data{
AnimationTrackType::CubicHermite3D,
AnimationTrackType::Vector3,
AnimationTrackTarget::Translation3D, 42,
@ -213,34 +212,41 @@ void AnimationDataTest::constructTrackResultType() {
nullptr,
Animation::Interpolation::Linear,
animationInterpolatorFor<CubicHermite3D>(Animation::Interpolation::Linear)}};
AnimationData data{nullptr, Containers::Array<AnimationTrackData>{InPlaceInit, {trackData}}};
CORRADE_COMPARE(data.trackType(0), AnimationTrackType::CubicHermite3D);
CORRADE_COMPARE(data.trackResultType(0), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.trackTargetName(0), AnimationTrackTarget::Translation3D);
CORRADE_COMPARE(data.trackTarget(0), 42);
CORRADE_COMPARE(data.track(0).interpolation(), Animation::Interpolation::Linear);
CORRADE_COMPARE(data.type(), AnimationTrackType::CubicHermite3D);
CORRADE_COMPARE(data.resultType(), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.targetName(), AnimationTrackTarget::Translation3D);
CORRADE_COMPARE(data.target(), 42);
CORRADE_COMPARE(data.track().interpolation(), Animation::Interpolation::Linear);
}
void AnimationDataTest::constructTrackTemplate() {
AnimationTrackData trackData{
AnimationTrackData data{
AnimationTrackTarget::Translation3D, 42,
Animation::TrackView<const Float, const CubicHermite3D>{
nullptr,
Animation::Interpolation::Linear,
animationInterpolatorFor<CubicHermite3D>(Animation::Interpolation::Linear)}};
AnimationData data{nullptr, Containers::Array<AnimationTrackData>{InPlaceInit, {trackData}}};
CORRADE_COMPARE(data.trackType(0), AnimationTrackType::CubicHermite3D);
CORRADE_COMPARE(data.trackResultType(0), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.trackTargetName(0), AnimationTrackTarget::Translation3D);
CORRADE_COMPARE(data.trackTarget(0), 42);
CORRADE_COMPARE(data.track(0).interpolation(), Animation::Interpolation::Linear);
CORRADE_COMPARE(data.type(), AnimationTrackType::CubicHermite3D);
CORRADE_COMPARE(data.resultType(), AnimationTrackType::Vector3);
CORRADE_COMPARE(data.targetName(), AnimationTrackTarget::Translation3D);
CORRADE_COMPARE(data.target(), 42);
CORRADE_COMPARE(data.track().interpolation(), Animation::Interpolation::Linear);
}
void AnimationDataTest::constructTrackDefault() {
AnimationTrackData data;
/* no public accessors here, so nothing to check -- and such a track
shouldn't get added to AnimationData anyway */
CORRADE_VERIFY(true);
CORRADE_COMPARE(data.type(), AnimationTrackType{});
CORRADE_COMPARE(data.resultType(), AnimationTrackType{});
CORRADE_COMPARE(data.targetName(), AnimationTrackTarget{});
CORRADE_COMPARE(data.target(), 0);
CORRADE_COMPARE(data.track().interpolation(), Animation::Interpolation::Constant);
CORRADE_COMPARE(data.track().before(), Animation::Extrapolation::Extrapolated);
CORRADE_COMPARE(data.track().after(), Animation::Extrapolation::Extrapolated);
CORRADE_COMPARE(data.track().size(), 0);
CORRADE_COMPARE(data.track().interpolator(), nullptr);
CORRADE_COMPARE(data.track().keys().data(), nullptr);
CORRADE_COMPARE(data.track().values().data(), nullptr);
}
void AnimationDataTest::construct() {

Write Preview
Loading…
Cancel
Save