funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-04-02 10:16:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored Attract Mode into its own class.

Browse Source
This commit is contained in:
emb
2015-01-01 17:26:02 -06:00
parent 1a9fdabd63
commit b3ed451e4f
5 changed files with 78 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/RetroFE.cpp
View File

@@ -27,8 +27,6 @@ RetroFE::RetroFE(CollectionDatabase &db, Configuration &c)
, CollectionDB(db)
, Input(Config)
, KeyInputDisable(0)
, InactiveKeyTime(0)
, AttractMode(false)
, CurrentTime(0)
, VideoInst(NULL)
{
@@ -159,7 +157,6 @@ void RetroFE::Run()
bool running = true;
Item *nextPageItem = NULL;
bool adminMode = false;
float attractModeRandomTime = 0;
bool selectActive = false;
float frameCount = 0;
float fpsStartTime = 0;
@@ -168,6 +165,7 @@ void RetroFE::Run()
Config.GetProperty("attractModeTime", attractModeTime);
Config.GetProperty("firstCollection", firstCollection);
Attract.SetIdleTime(static_cast<float>(attractModeTime));
LoadPage(firstCollection);
while (running)
@@ -287,26 +285,7 @@ void RetroFE::Run()
frameCount = 0;
}
InactiveKeyTime += deltaTime;
if(!AttractMode && InactiveKeyTime > attractModeTime && attractModeTime > 0)
{
AttractMode = true;
InactiveKeyTime = 0;
attractModeRandomTime = ((float)((1000+rand()) % 5000)) / 1000;
}
if(AttractMode)
{
page->SetScrolling(Page::ScrollDirectionForward);
if(InactiveKeyTime > attractModeRandomTime)
{
InactiveKeyTime = 0;
AttractMode = false;
page->SetScrolling(Page::ScrollDirectionIdle);
}
}
Attract.Update(deltaTime, *page);
page->Update(deltaTime);
Render();
@@ -353,8 +332,7 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
{
const Uint8 *keys = SDL_GetKeyboardState(NULL);
InactiveKeyTime = 0;
AttractMode = false;
Attract.Reset();
if (keys[Input.GetScancode(UserInput::KeyCodePreviousItem)])
{