Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved the animation interpolation in CarouselComponent and TextListComponent.

Browse source 
Also eliminated an unnecessary cursor stop function call.
This commit is contained in:
Leon Styhre 2022-11-11 18:16:51 +01:00
parent 74ac8393e3
commit 12f2142c03
2 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
es-core/src/components/primary/CarouselComponent.h
View file

@ -527,7 +527,8 @@ template <typename T> bool CarouselComponent<T>::input(InputConfig* config, Inpu
config->isMappedLike("rightshoulder", input) || config->isMappedLike("rightshoulder", input) ||
config->isMappedLike("lefttrigger", input) || config->isMappedLike("lefttrigger", input) ||
config->isMappedLike("righttrigger", input)) { config->isMappedLike("righttrigger", input)) {
onCursorChanged(CursorState::CURSOR_STOPPED); if (isScrolling())
onCursorChanged(CursorState::CURSOR_STOPPED);
List::listInput(0); List::listInput(0);
mTriggerJump = false; mTriggerJump = false;
} }
@ -1326,11 +1327,24 @@ template <typename T> void CarouselComponent<T>::onCursorChanged(const CursorSta
mPositiveDirection = false; mPositiveDirection = false;
mEntryCamTarget = endPos; mEntryCamTarget = endPos;
float animTime {380};
float timeDiff {1.0f};
// If startPos is inbetween two positions then reduce the time slightly as the distance will
// be shorter meaning the animation would play for too long if not compensated for.
if (mScrollVelocity == 1)
timeDiff = endPos - startPos;
else if (mScrollVelocity == -1)
timeDiff = startPos - endPos;
if (timeDiff != 1.0f)
animTime = glm::clamp(std::fabs(glm::mix(0.0f, 380.0f, timeDiff * 1.5f)), 200.0f, 380.0f);
Animation* anim {new LambdaAnimation( Animation* anim {new LambdaAnimation(
[this, startPos, endPos, posMax](float t) { [this, startPos, endPos, posMax](float t) {
t -= 1; // Non-linear interpolation.
float f {glm::mix(startPos, endPos, t * t * t + 1)}; t = 1.0f - (1.0f - t) * (1.0f - t);
float f {(endPos * t) + (startPos * (1.0f - t))};
if (f < 0) if (f < 0)
f += posMax; f += posMax;
if (f >= posMax) if (f >= posMax)
@ -1338,7 +1352,7 @@ template <typename T> void CarouselComponent<T>::onCursorChanged(const CursorSta
mEntryCamOffset = f; mEntryCamOffset = f;
}, },
500)}; static_cast<int>(animTime))};
GuiComponent::setAnimation(anim, 0, nullptr, false, 0); GuiComponent::setAnimation(anim, 0, nullptr, false, 0);

25
es-core/src/components/primary/TextListComponent.h
View file

@ -241,7 +241,9 @@ template <typename T> bool TextListComponent<T>::input(InputConfig* config, Inpu
List::listInput(0); List::listInput(0);
} }
else { else {
List::stopScrolling(); if (isScrolling())
onCursorChanged(CursorState::CURSOR_STOPPED);
List::listInput(0);
} }
} }
} }
@ -703,10 +705,25 @@ template <typename T> void TextListComponent<T>::onCursorChanged(const CursorSta
float posMax {static_cast<float>(mEntries.size())}; float posMax {static_cast<float>(mEntries.size())};
float endPos {static_cast<float>(mCursor)}; float endPos {static_cast<float>(mCursor)};
float animTime {380};
float timeDiff {1.0f};
// If startPos is inbetween two positions then reduce the time slightly as the distance will
// be shorter meaning the animation would play for too long if not compensated for.
if (mScrollVelocity == 1)
timeDiff = endPos - startPos;
else if (mScrollVelocity == -1)
timeDiff = startPos - endPos;
if (timeDiff != 1.0f)
animTime =
glm::clamp(std::fabs(glm::mix(0.0f, 380.0f, timeDiff * 1.5f)), 200.0f, 380.0f);
Animation* anim {new LambdaAnimation( Animation* anim {new LambdaAnimation(
[this, startPos, endPos, posMax](float t) { [this, startPos, endPos, posMax](float t) {
t -= 1; // Non-linear interpolation.
float f {glm::mix(startPos, endPos, t * t * t + 1)}; t = 1.0f - (1.0f - t) * (1.0f - t);
float f {(endPos * t) + (startPos * (1.0f - t))};
if (f < 0) if (f < 0)
f += posMax; f += posMax;
if (f >= posMax) if (f >= posMax)
@ -714,7 +731,7 @@ template <typename T> void TextListComponent<T>::onCursorChanged(const CursorSta
mCamOffset = f; mCamOffset = f;
}, },
500)}; static_cast<int>(animTime))};
GuiComponent::setAnimation(anim, 0, nullptr, false, 0); GuiComponent::setAnimation(anim, 0, nullptr, false, 0);
} }