Emulation/EmulationStation-retropie
1
0
Fork 0
mirror of https://github.com/RetroPie/EmulationStation.git synced 2025-04-02 10:41:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #801 from Gemba/fix_ui_transition_style_slide_gamelistview_rollover

Browse source 
UI Slide Mode: Changes to allow rollover left/right at gamelist-view edges
This commit is contained in:
pjft 2023-02-27 20:01:05 +00:00 • committed by GitHub
commit 5a3b9074e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
es-app/src/animations/MoveCameraAnimation.h
View file

@ -7,22 +7,21 @@
class MoveCameraAnimation : public Animation class MoveCameraAnimation : public Animation
{ {
public: public:
MoveCameraAnimation(Transform4x4f& camera, const Vector3f& target) : mCameraStart(camera), mTarget(target), cameraOut(camera) {} MoveCameraAnimation(Transform4x4f& camera, const Vector3f& target) : mCameraStart(camera), mTarget(target), mCameraOut(camera) { }
int getDuration() const override { return 400; } int getDuration() const override { return 400; }
void apply(float t) override void apply(float t) override
{ {
// cubic ease out
t -= 1; t -= 1;
cameraOut.translation() = -Vector3f().lerp(-mCameraStart.translation(), mTarget, t*t*t + 1); mCameraOut.translation() = -Vector3f().lerp(-mCameraStart.translation(), mTarget, t*t*t + 1 /*cubic ease out*/);
} }
private: private:
Transform4x4f mCameraStart; Transform4x4f mCameraStart;
Vector3f mTarget; Vector3f mTarget;
Transform4x4f& cameraOut; Transform4x4f& mCameraOut;
}; };
#endif // ES_APP_ANIMATIONS_MOVE_CAMERA_ANIMATION_H #endif // ES_APP_ANIMATIONS_MOVE_CAMERA_ANIMATION_H

45
es-app/src/views/ViewController.cpp
View file

@ -193,11 +193,50 @@ void ViewController::playViewTransition()
}else{ }else{
advanceAnimation(0, (int)(mFadeOpacity * FADE_DURATION)); advanceAnimation(0, (int)(mFadeOpacity * FADE_DURATION));
} }
} else if (transition_style == "slide"){ }
else if (transition_style == "slide")
{
// slide or simple slide // slide or simple slide
setAnimation(new MoveCameraAnimation(mCamera, target)); bool inGamelistNav = -mCamera.translation().y() == target.y() // not in/out gamelist nav
&& -mCamera.translation().x() - target.x(); // left/right movement
cancelAnimation(0);
Vector3f tgt = Vector3f(target);
Vector3f positionOrig;
if (inGamelistNav) {
const float screenWidth = (float)Renderer::getScreenWidth();
if (-mCamera.translation().x() - tgt.x() >= 2 * screenWidth)
{
// right rollover
mLockInput = true;
tgt.x() = screenWidth * mGameListViews.size();
}
else if (-mCamera.translation().x() - tgt.x() <= 2 * -screenWidth)
{
// left rollover
mLockInput = true;
tgt.x() = -screenWidth;
}
// deny any further input on rollover as mCurrentView would be
// different on subsequent animations, resulting in restoring
// a unrelated mCurrentView/mCamera with the original position
if (mLockInput)
{
positionOrig = Vector3f(mCurrentView->getPosition());
mCurrentView->setPosition(tgt.x(), tgt.y());
}
}
setAnimation(new MoveCameraAnimation(mCamera, tgt), 0, [this, positionOrig] {
if (mLockInput) {
mCurrentView->setPosition(positionOrig);
mCamera.translation() = -positionOrig;
}
mLockInput = false;
});
updateHelpPrompts(); // update help prompts immediately updateHelpPrompts(); // update help prompts immediately
} else { }
else
{
// instant // instant
setAnimation(new LambdaAnimation( setAnimation(new LambdaAnimation(
[this, target](float /*t*/) [this, target](float /*t*/)