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

Added attractModeNextTime setting to allow different times for Attract Mode first start and consecutive starts.

Browse Source
This commit is contained in:
Pieter Hulshoff
2019-04-15 15:04:27 +02:00
parent f326d9223a
commit 54c1c2d7e9
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RetroFE/Source/Execute/AttractMode.cpp
View File

@@ -20,7 +20,9 @@
AttractMode::AttractMode() AttractMode::AttractMode()
: idleTime(0) : idleTime(0)
, idleNextTime(0)
, isActive_(false) , isActive_(false)
, isSet_(false)
, elapsedTime_(0) , elapsedTime_(0)
, activeTime_(0) , activeTime_(0)
{ {
@@ -29,8 +31,9 @@ AttractMode::AttractMode()
void AttractMode::reset() void AttractMode::reset()
{ {
elapsedTime_ = 0; elapsedTime_ = 0;
isActive_ = false; isActive_ = false;
activeTime_ = 0; isSet_ = false;
activeTime_ = 0;
} }
void AttractMode::update(float dt, Page &page) void AttractMode::update(float dt, Page &page)
@@ -38,11 +41,12 @@ void AttractMode::update(float dt, Page &page)
elapsedTime_ += dt; elapsedTime_ += dt;
// enable attract mode when idling for the expected time. Disable if idle time is set to 0. // enable attract mode when idling for the expected time. Disable if idle time is set to 0.
if(!isActive_ && elapsedTime_ > idleTime && idleTime > 0) if(!isActive_ && ((elapsedTime_ > idleTime && idleTime > 0) || (isSet_ && elapsedTime_ > idleNextTime && idleNextTime > 0)))
{ {
isActive_ = true; isActive_ = true;
isSet_ = true;
elapsedTime_ = 0; elapsedTime_ = 0;
activeTime_ = ((float)((1000+rand()) % 5000)) / 1000; activeTime_ = ((float)((1000+rand()) % 5000)) / 1000;
} }
if(isActive_) if(isActive_)

2
RetroFE/Source/Execute/AttractMode.h
View File

@@ -24,10 +24,12 @@ public:
void reset(); void reset();
void update(float dt, Page &page); void update(float dt, Page &page);
float idleTime; float idleTime;
float idleNextTime;
bool isActive(); bool isActive();
private: private:
bool isActive_; bool isActive_;
bool isSet_;
float elapsedTime_; float elapsedTime_;
float activeTime_; float activeTime_;

5
RetroFE/Source/RetroFE.cpp
View File

@@ -302,14 +302,17 @@ void RetroFE::run( )
} }
int attractModeTime = 0; int attractModeTime = 0;
int attractModeNextTime = 0;
std::string firstCollection = "Main"; std::string firstCollection = "Main";
bool running = true; bool running = true;
RETROFE_STATE state = RETROFE_NEW; RETROFE_STATE state = RETROFE_NEW;
config_.getProperty( "attractModeTime", attractModeTime ); config_.getProperty( "attractModeTime", attractModeTime );
config_.getProperty( "attractModeNextTime", attractModeNextTime );
config_.getProperty( "firstCollection", firstCollection ); config_.getProperty( "firstCollection", firstCollection );
attract_.idleTime = static_cast<float>(attractModeTime); attract_.idleTime = static_cast<float>(attractModeTime);
attract_.idleNextTime = static_cast<float>(attractModeNextTime);
int initializeStatus = 0; int initializeStatus = 0;

2
RetroFE/Source/Version.cpp
View File

@@ -21,7 +21,7 @@
std::string retrofe_version_major = "0"; std::string retrofe_version_major = "0";
std::string retrofe_version_minor = "8"; std::string retrofe_version_minor = "8";
std::string retrofe_version_build = "26"; std::string retrofe_version_build = "27";
std::string Version::getString( ) std::string Version::getString( )