funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-06-03 17:36:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added menuenter and menuexit tween order based on if entering or exiting menu.

Browse Source
This commit is contained in:
emb
2015-02-03 18:17:15 -06:00
parent 9376668581
commit 6601457a8d
2 changed files with 297 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RetroFE/Source/Graphics/Component/Component.cpp
View File

@@ -201,17 +201,18 @@ void Component::Update(float dt)
EnterRequested = false;
NewItemSelected = false;
}
else if(MenuExitRequested)
else if(MenuExitRequested && (!MenuEnterRequested || MenuExitRequested <= MenuEnterRequested))
{
MenuExitRequested = false;
CurrentTweens = Tweens->GetTween("menuExit", MenuExitIndex);
CurrentAnimationState = MENU_EXIT;
MenuExitRequested = false;
}
else if(MenuEnterRequested)
else if(MenuEnterRequested && (!MenuExitRequested || MenuExitRequested > MenuEnterRequested))
{
MenuEnterRequested = false;
CurrentTweens = Tweens->GetTween("menuEnter", MenuEnterIndex);
CurrentAnimationState = MENU_ENTER;
MenuEnterRequested = false;
}
else if(MenuScrollRequested)
{
@@ -274,13 +275,14 @@ void Component::Update(float dt)
CurrentTweens = Tweens->GetTween("enter", MenuEnterIndex);
CurrentAnimationState = ENTER;
}
else if(MenuExitRequested)
else if(MenuExitRequested && (!MenuEnterRequested || MenuExitRequested <= MenuEnterRequested))
{
CurrentTweens = Tweens->GetTween("menuExit", MenuExitIndex);
CurrentAnimationState = MENU_EXIT;
MenuExitRequested = false;
}
else if(MenuEnterRequested)
else if(MenuEnterRequested && (!MenuExitRequested || MenuExitRequested > MenuEnterRequested))
{
CurrentTweens = Tweens->GetTween("menuEnter", MenuEnterIndex);
CurrentAnimationState = MENU_ENTER;