Fixed some weird camera movements when using the slide transition style.

NEWS.md

@@ -85,6 +85,7 @@ Many bugs have been fixed, and numerous features that were only partially implem
 * The scraper didn't handle error conditions correctly
 * Fixed a massive memory leak related to SVG images
 * Toggling the screensaver didn't work as expected
+* Wrapping around the first and last game systems generated strange camera movements when using the slide transition style
 * The setting to enable or disable audio for the video screensaver only worked on Raspberry Pi
 * The screensaver random function did not consider the previously selected game and could potentially show the same image or video over and over again
 * The random system selection did not consider the currently selected system

es-app/src/guis/GuiSettings.cpp

@@ -79,7 +79,7 @@ void GuiSettings::save()
         ViewController::get()->goToStart();
 
     if (mNeedsGoToSystemView)
-        ViewController::get()->goToSystemView(mGoToSystem);
+        ViewController::get()->goToSystemView(mGoToSystem, false);
 
     if (mNeedsSaving || mNeedsCollectionsUpdate || mNeedsReloading || mNeedsSorting ||
             mNeedsGoToStart || mNeedsGoToSystemView)

es-app/src/views/ViewController.cpp

@@ -49,7 +49,9 @@ ViewController::ViewController(
         Window* window)
         : GuiComponent(window),
         mCurrentView(nullptr),
+        mPreviousView(nullptr),
         mCamera(Transform4x4f::Identity()),
+        mWrappedViews(false),
         mFadeOpacity(0),
         mLockInput(false)
 {
@@ -102,7 +104,7 @@ void ViewController::goToStart()
         Settings::getInstance()->setString("StartupSystem", "");
     }
     // Get the first system entry.
-    goToSystemView(getSystemListView()->getFirst());
+    goToSystemView(getSystemListView()->getFirst(), false);
 }
 
 void ViewController::ReloadAndGoToStart()
@@ -124,7 +126,7 @@ bool ViewController::isCameraMoving()
 
 void ViewController::resetMovingCamera()
 {
-    if (isCameraMoving()) {
+    if (Settings::getInstance()->getString("TransitionStyle") == "slide" && isCameraMoving()) {
         mCamera.r3().x() = -mCurrentView->getPosition().x();
         mCamera.r3().y() = -mCurrentView->getPosition().y();
         stopAllAnimations();
@@ -146,8 +148,25 @@ int ViewController::getSystemId(SystemData* system)
     return static_cast<int>(std::find(sysVec.cbegin(), sysVec.cend(), system) - sysVec.cbegin());
 }
 
-void ViewController::goToSystemView(SystemData* system)
+void ViewController::restoreViewPosition()
 {
+    if (mPreviousView) {
+        Vector3f restorePosition = mPreviousView->getPosition();
+        restorePosition.x() = mWrapPreviousPositionX;
+        mPreviousView->setPosition(restorePosition);
+        mWrapPreviousPositionX = 0;
+        mPreviousView.reset();
+        mPreviousView = nullptr;
+        mWrappedViews = false;
+    }
+}
+
+void ViewController::goToSystemView(SystemData* system, bool playTransition)
+{
+    // Restore the X position for the view, if it was previously moved.
+    if (mWrappedViews)
+        restoreViewPosition();
+
     // Tell any current view it's about to be hidden and stop its rendering.
     if (mCurrentView) {
         mCurrentView->onHide();
@@ -170,7 +189,11 @@ void ViewController::goToSystemView(SystemData* system)
     mCurrentView->setRenderView(true);
     PowerSaver::setState(true);
 
+    if (playTransition)
         playViewTransition();
+    else
+        playViewTransition(true);
+
 }
 
 void ViewController::goToNextGameList()
@@ -193,6 +216,28 @@ void ViewController::goToPrevGameList()
 
 void ViewController::goToGameList(SystemData* system)
 {
+    bool wrapFirstToLast = false;
+    bool wrapLastToFirst = false;
+
+    // Restore the X position for the view, if it was previously moved.
+    if (mWrappedViews)
+        restoreViewPosition();
+
+    // Find if we're wrapping around the first and last systems, which requires the gamelist
+    // to be moved in order to avoid weird camera movements. This is only needed for the
+    // slide transition style though.
+    if (mState.viewing == GAME_LIST &&
+            Settings::getInstance()->getString("TransitionStyle") == "slide") {
+        if (SystemData::sSystemVector.front() == mState.getSystem()) {
+            if (SystemData::sSystemVector.back() == system)
+                wrapFirstToLast = true;
+        }
+        else if (SystemData::sSystemVector.back() == mState.getSystem()) {
+            if (SystemData::sSystemVector.front() == system)
+                wrapLastToFirst = true;
+        }
+    }
+
     // Stop any scrolling, animations and camera movements.
     if (mState.viewing == SYSTEM_SELECT) {
         mSystemListView->stopScrolling();
@@ -211,13 +256,40 @@ void ViewController::goToGameList(SystemData* system)
     if (mState.viewing == SYSTEM_SELECT) {
         // Move system list.
         auto sysList = getSystemListView();
-        float offX = sysList->getPosition().x();
+        float offsetX = sysList->getPosition().x();
         int sysId = getSystemId(system);
 
-        sysList->setPosition(sysId * static_cast<float>(Renderer::getScreenWidth()),
+        sysList->setPosition(sysId* static_cast<float>(Renderer::getScreenWidth()),
                 sysList->getPosition().y());
-        offX = sysList->getPosition().x() - offX;
-        mCamera.translation().x() -= offX;
+        offsetX = sysList->getPosition().x() - offsetX;
+        mCamera.translation().x() -= offsetX;
+    }
+
+    // If we are wrapping around, either from the first to last system, or the other way
+    // around, we need to temporarily move the gamelist view location so that the camera
+    // movements will be correct. This is accomplished by simply offsetting the X position
+    // with the position of the first or last system plus the screen width.
+    if (wrapFirstToLast) {
+        Vector3f currentPosition = mCurrentView->getPosition();
+        mWrapPreviousPositionX = currentPosition.x();
+        float offsetX = getGameListView(system)->getPosition().x();
+        offsetX += Renderer::getScreenWidth();
+        currentPosition.x() = offsetX;
+        mCurrentView->setPosition(currentPosition);
+        mCamera.translation().x() -= offsetX;
+        mPreviousView = mCurrentView;
+        mWrappedViews = true;
+    }
+    else if (wrapLastToFirst) {
+        Vector3f currentPosition = mCurrentView->getPosition();
+        mWrapPreviousPositionX = currentPosition.x();
+        float offsetX = getGameListView(system)->getPosition().x();
+        offsetX -= Renderer::getScreenWidth();
+        currentPosition.x() = offsetX;
+        mCurrentView->setPosition(currentPosition);
+        mCamera.translation().x() = -offsetX;
+        mPreviousView = mCurrentView;
+        mWrappedViews = true;
     }
 
     mState.viewing = GAME_LIST;
@@ -235,7 +307,7 @@ void ViewController::goToGameList(SystemData* system)
     playViewTransition();
 }
 
-void ViewController::playViewTransition()
+void ViewController::playViewTransition(bool instant)
 {
     Vector3f target(Vector3f::Zero());
     if (mCurrentView)
@@ -248,8 +320,12 @@ void ViewController::playViewTransition()
 
     std::string transition_style = Settings::getInstance()->getString("TransitionStyle");
 
-    if (transition_style == "fade") {
-        // Fade.
+    if (instant || transition_style == "instant") {
+        setAnimation(new LambdaAnimation([this, target](float /*t*/) {
+                    this->mCamera.translation() = -target; }, 1));
+        updateHelpPrompts();
+    }
+    else if (transition_style == "fade") {
         // Stop whatever's currently playing, leaving mFadeOpacity wherever it is.
         cancelAnimation(0);
 
@@ -281,12 +357,6 @@ void ViewController::playViewTransition()
         setAnimation(new MoveCameraAnimation(mCamera, target));
         updateHelpPrompts(); // Update help prompts immediately.
     }
-    else {
-        // Instant.
-        setAnimation(new LambdaAnimation([this, target](float /*t*/) {
-                    this->mCamera.translation() = -target; }, 1));
-        updateHelpPrompts();
-    }
 }
 
 void ViewController::onFileChanged(FileData* file, bool reloadGameList)
@@ -632,12 +702,12 @@ void ViewController::reloadAll()
     }
     else if (mState.viewing == SYSTEM_SELECT) {
         SystemData* system = mState.getSystem();
-        goToSystemView(SystemData::sSystemVector.front());
+        goToSystemView(SystemData::sSystemVector.front(), false);
         mSystemListView->goToSystem(system, false);
         mCurrentView = mSystemListView;
     }
     else {
-        goToSystemView(SystemData::sSystemVector.front());
+        goToSystemView(SystemData::sSystemVector.front(), false);
     }
 
     // Load navigation sounds.

es-app/src/views/ViewController.h

@@ -49,7 +49,7 @@ public:
     void goToNextGameList();
     void goToPrevGameList();
     void goToGameList(SystemData* system);
-    void goToSystemView(SystemData* system);
+    void goToSystemView(SystemData* system, bool playTransition);
     void goToStart();
     void ReloadAndGoToStart();
 
@@ -109,14 +109,19 @@ private:
     ViewController(Window* window);
     static ViewController* sInstance;
 
-    void playViewTransition();
+    void playViewTransition(bool instant = false);
     int getSystemId(SystemData* system);
+    // Restore view position if it was moved during wrap around.
+    void restoreViewPosition();
 
     std::shared_ptr<GuiComponent> mCurrentView;
+    std::shared_ptr<GuiComponent> mPreviousView;
     std::map<SystemData*, std::shared_ptr<IGameListView>> mGameListViews;
     std::shared_ptr<SystemView> mSystemListView;
 
     Transform4x4f mCamera;
+    bool mWrappedViews;
+    float mWrapPreviousPositionX;
     float mFadeOpacity;
     bool mLockInput;
 

es-app/src/views/gamelist/ISimpleGameListView.cpp

@@ -141,9 +141,9 @@ bool ISimpleGameListView::input(InputConfig* config, Input input)
                 if (systemToView->isCustomCollection() &&
                         systemToView->getRootFolder()->getParent())
                     ViewController::get()->goToSystemView(
-                            systemToView->getRootFolder()->getParent()->getSystem());
+                            systemToView->getRootFolder()->getParent()->getSystem(), true);
                 else
-                    ViewController::get()->goToSystemView(systemToView);
+                    ViewController::get()->goToSystemView(systemToView, true);
             }
 
             return true;