From 1da0c780b29b80aef9ecf868da75837d73319c54 Mon Sep 17 00:00:00 2001 From: hex007 Date: Wed, 31 May 2017 09:54:11 -0700 Subject: [PATCH] Renamed additional transitions - instant -> simple slide - none -> instant --- es-app/src/guis/GuiMenu.cpp | 2 +- es-app/src/views/SystemView.cpp | 6 +++--- es-app/src/views/ViewController.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index 6298cf936..6c8dbe7c6 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -127,8 +127,8 @@ GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MEN std::vector transitions; transitions.push_back("fade"); transitions.push_back("slide"); + transitions.push_back("simple slide"); transitions.push_back("instant"); - transitions.push_back("none"); for(auto it = transitions.begin(); it != transitions.end(); it++) transition_style->add(*it, *it, Settings::getInstance()->getString("TransitionStyle") == *it); s->addWithLabel("TRANSITION STYLE", transition_style); diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp index 1103470f6..b04996607 100644 --- a/es-app/src/views/SystemView.cpp +++ b/es-app/src/views/SystemView.cpp @@ -280,8 +280,8 @@ void SystemView::onCursorChanged(const CursorState& state) this->mCamOffset = f; this->mExtrasCamOffset = f; }, 500); - } else if (transition_style == "instant") { - // instant + } else if (transition_style == "simple slide") { + // simple slide anim = new LambdaAnimation( [this, startPos, endPos, posMax](float t) { @@ -296,7 +296,7 @@ void SystemView::onCursorChanged(const CursorState& state) this->mExtrasCamOffset = endPos; }, 500); } else { - // None + // instant anim = new LambdaAnimation( [this, endPos](float t) { diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp index e0836e12f..7e3c242b6 100644 --- a/es-app/src/views/ViewController.cpp +++ b/es-app/src/views/ViewController.cpp @@ -189,12 +189,12 @@ void ViewController::playViewTransition() }else{ advanceAnimation(0, (int)(mFadeOpacity * FADE_DURATION)); } - } else if (transition_style == "slide" || transition_style == "instant"){ - // slide + } else if (transition_style == "slide" || transition_style == "simple slide"){ + // slide or simple slide setAnimation(new MoveCameraAnimation(mCamera, target)); updateHelpPrompts(); // update help prompts immediately } else { - // none + // instant setAnimation(new LambdaAnimation( [this, target](float t) { @@ -246,7 +246,7 @@ void ViewController::launch(FileData* game, Eigen::Vector3f center) setAnimation(new LambdaAnimation(fadeFunc, 800), 0, nullptr, true); this->onFileChanged(game, FILE_METADATA_CHANGED); }); - } else if (transition_style == "slide" || transition_style == "instant"){ + } else if (transition_style == "slide" || transition_style == "simple slide"){ // move camera to zoom in on center + fade out, launch game, come back in setAnimation(new LaunchAnimation(mCamera, mFadeOpacity, center, 1500), 0, [this, origCamera, center, game] {