Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-30 01:55:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Transition style now also affects launch transition.

Browse source 
"Fade" only does a fade. "Slide" does the old move camera + fade effect.
This commit is contained in:
Aloshi 2014-04-30 12:40:25 -05:00
parent a9514843b4
commit b33a03fe83
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/views/ViewController.cpp
View file

@ -112,14 +112,32 @@ void ViewController::launch(FileData* game, Eigen::Vector3f center)
center += mCurrentView->getPosition(); center += mCurrentView->getPosition();
stopAnimation(1); // make sure the fade in isn't still playing stopAnimation(1); // make sure the fade in isn't still playing
mLockInput = true; mLockInput = true;
setAnimation(new LaunchAnimation(mCamera, mFadeOpacity, center, 1500), 0, [this, origCamera, center, game]
if(Settings::getInstance()->getString("TransitionStyle") == "fade")
{ {
game->getSystem()->launchGame(mWindow, game); // fade out, launch game, fade back in
mCamera = origCamera; auto fadeFunc = [this](float t) {
mLockInput = false; t -= 1;
setAnimation(new LaunchAnimation(mCamera, mFadeOpacity, center, 600), 0, nullptr, true); mFadeOpacity = lerp<float>(0.0f, 1.0f, t*t*t + 1);
this->onFileChanged(game, FILE_METADATA_CHANGED); };
}); setAnimation(new LambdaAnimation(fadeFunc, 1500), 0, [this, game, fadeFunc]
{
game->getSystem()->launchGame(mWindow, game);
mLockInput = false;
setAnimation(new LambdaAnimation(fadeFunc, 1500), 0, nullptr, true);
this->onFileChanged(game, FILE_METADATA_CHANGED);
});
}else{
// 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]
{
game->getSystem()->launchGame(mWindow, game);
mCamera = origCamera;
mLockInput = false;
setAnimation(new LaunchAnimation(mCamera, mFadeOpacity, center, 600), 0, nullptr, true);
this->onFileChanged(game, FILE_METADATA_CHANGED);
});
}
} }
std::shared_ptr<IGameListView> ViewController::getGameListView(SystemData* system) std::shared_ptr<IGameListView> ViewController::getGameListView(SystemData* system)