Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 15:15:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed additional transitions

Browse source 
- instant -> simple slide
- none    -> instant
This commit is contained in:
hex007 2017-05-31 09:54:11 -07:00
parent 2ec037de2f
commit 1da0c780b2
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/guis/GuiMenu.cpp
View file

@ -127,8 +127,8 @@ GuiMenu::GuiMenu(Window* window) : GuiComponent(window), mMenu(window, "MAIN MEN
std::vector<std::string> transitions; std::vector<std::string> transitions;
transitions.push_back("fade"); transitions.push_back("fade");
transitions.push_back("slide"); transitions.push_back("slide");
transitions.push_back("simple slide");
transitions.push_back("instant"); transitions.push_back("instant");
transitions.push_back("none");
for(auto it = transitions.begin(); it != transitions.end(); it++) for(auto it = transitions.begin(); it != transitions.end(); it++)
transition_style->add(*it, *it, Settings::getInstance()->getString("TransitionStyle") == *it); transition_style->add(*it, *it, Settings::getInstance()->getString("TransitionStyle") == *it);
s->addWithLabel("TRANSITION STYLE", transition_style); s->addWithLabel("TRANSITION STYLE", transition_style);

6
es-app/src/views/SystemView.cpp
View file

@ -280,8 +280,8 @@ void SystemView::onCursorChanged(const CursorState& state)
this->mCamOffset = f; this->mCamOffset = f;
this->mExtrasCamOffset = f; this->mExtrasCamOffset = f;
}, 500); }, 500);
} else if (transition_style == "instant") { } else if (transition_style == "simple slide") {
// instant // simple slide
anim = new LambdaAnimation( anim = new LambdaAnimation(
[this, startPos, endPos, posMax](float t) [this, startPos, endPos, posMax](float t)
{ {
@ -296,7 +296,7 @@ void SystemView::onCursorChanged(const CursorState& state)
this->mExtrasCamOffset = endPos; this->mExtrasCamOffset = endPos;
}, 500); }, 500);
} else { } else {
// None // instant
anim = new LambdaAnimation( anim = new LambdaAnimation(
[this, endPos](float t) [this, endPos](float t)
{ {

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

@ -189,12 +189,12 @@ void ViewController::playViewTransition()
}else{ }else{
advanceAnimation(0, (int)(mFadeOpacity * FADE_DURATION)); advanceAnimation(0, (int)(mFadeOpacity * FADE_DURATION));
} }
} else if (transition_style == "slide" || transition_style == "instant"){ } else if (transition_style == "slide" || transition_style == "simple slide"){
// slide // slide or simple slide
setAnimation(new MoveCameraAnimation(mCamera, target)); setAnimation(new MoveCameraAnimation(mCamera, target));
updateHelpPrompts(); // update help prompts immediately updateHelpPrompts(); // update help prompts immediately
} else { } else {
// none // instant
setAnimation(new LambdaAnimation( setAnimation(new LambdaAnimation(
[this, target](float t) [this, target](float t)
{ {
@ -246,7 +246,7 @@ void ViewController::launch(FileData* game, Eigen::Vector3f center)
setAnimation(new LambdaAnimation(fadeFunc, 800), 0, nullptr, true); setAnimation(new LambdaAnimation(fadeFunc, 800), 0, nullptr, true);
this->onFileChanged(game, FILE_METADATA_CHANGED); 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 // 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] setAnimation(new LaunchAnimation(mCamera, mFadeOpacity, center, 1500), 0, [this, origCamera, center, game]
{ {