funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 09:48:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added onMenuIdle animation type, which will continuously be activated while

Browse Source 
the menu isn't scrolling.
This commit is contained in:
Pieter Hulshoff 2017-06-21 15:52:48 +02:00
parent f6ba968925
commit 05f26e9d06
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ Component::Component(const Component &copy)
backgroundTexture_ = NULL; backgroundTexture_ = NULL;
freeGraphicsMemory(); freeGraphicsMemory();
if(copy.tweens_) if ( copy.tweens_ )
{ {
AnimationEvents *tweens = new AnimationEvents(*copy.tweens_); AnimationEvents *tweens = new AnimationEvents(*copy.tweens_);
setTweens(tweens); setTweens(tweens);
@ -63,7 +63,7 @@ void Component::freeGraphicsMemory()
currentTweenComplete_ = true; currentTweenComplete_ = true;
elapsedTweenTime_ = 0; elapsedTweenTime_ = 0;
if(backgroundTexture_) if ( backgroundTexture_ )
{ {
SDL_LockMutex(SDL::getMutex()); SDL_LockMutex(SDL::getMutex());
SDL_DestroyTexture(backgroundTexture_); SDL_DestroyTexture(backgroundTexture_);
@ -74,7 +74,7 @@ void Component::freeGraphicsMemory()
} }
void Component::allocateGraphicsMemory() void Component::allocateGraphicsMemory()
{ {
if(!backgroundTexture_) if ( !backgroundTexture_ )
{ {
// make a 4x4 pixel wide surface to be stretched during rendering, make it a white background so we can use // make a 4x4 pixel wide surface to be stretched during rendering, make it a white background so we can use
// color later // color later
@ -109,7 +109,7 @@ void Component::setNewItemSelected()
bool Component::isIdle() bool Component::isIdle()
{ {
return (currentTweenComplete_ || animationType_ == "idle"); return (currentTweenComplete_ || animationType_ == "idle" || animationType_ == "menuIdle");
} }
bool Component::isMenuScrolling() bool Component::isMenuScrolling()
@ -126,15 +126,15 @@ void Component::update(float dt)
{ {
elapsedTweenTime_ += dt; elapsedTweenTime_ += dt;
if(animationRequested_ && animationRequestedType_ != "") if ( animationRequested_ && animationRequestedType_ != "" )
{ {
Animation *newTweens; Animation *newTweens;
// Check if this component is part of an active scrolling list // Check if this component is part of an active scrolling list
if(menuIndex_ >= MENU_INDEX_HIGH) if ( menuIndex_ >= MENU_INDEX_HIGH )
{ {
// Check for animation at index i // Check for animation at index i
newTweens = tweens_->getAnimation( animationRequestedType_, MENU_INDEX_HIGH ); newTweens = tweens_->getAnimation( animationRequestedType_, MENU_INDEX_HIGH );
if(!(newTweens && newTweens->size() > 0)) if ( !(newTweens && newTweens->size() > 0) )
{ {
// Check for animation at the current menuIndex // Check for animation at the current menuIndex
newTweens = tweens_->getAnimation( animationRequestedType_, menuIndex_ - MENU_INDEX_HIGH); newTweens = tweens_->getAnimation( animationRequestedType_, menuIndex_ - MENU_INDEX_HIGH);
@ -160,6 +160,14 @@ void Component::update(float dt)
{ {
animationType_ = "idle"; animationType_ = "idle";
currentTweens_ = tweens_->getAnimation( "idle", menuIndex_ ); currentTweens_ = tweens_->getAnimation( "idle", menuIndex_ );
if ( currentTweens_ && currentTweens_->size( ) == 0 && !page.isMenuScrolling( ) )
{
currentTweens_ = tweens_->getAnimation( "menuIdle", menuIndex_ );
if ( currentTweens_ && currentTweens_->size( ) > 0 )
{
currentTweens_ = currentTweens_;
}
}
currentTweenIndex_ = 0; currentTweenIndex_ = 0;
elapsedTweenTime_ = 0; elapsedTweenTime_ = 0;
storeViewInfo_ = baseViewInfo; storeViewInfo_ = baseViewInfo;
@ -168,7 +176,7 @@ void Component::update(float dt)
} }
currentTweenComplete_ = animate(); currentTweenComplete_ = animate();
if(currentTweenComplete_) if ( currentTweenComplete_ )
{ {
currentTweens_ = NULL; currentTweens_ = NULL;
currentTweenIndex_ = 0; currentTweenIndex_ = 0;
@ -178,7 +186,7 @@ void Component::update(float dt)
void Component::draw() void Component::draw()
{ {
if(backgroundTexture_) if ( backgroundTexture_ )
{ {
SDL_Rect rect; SDL_Rect rect;
rect.h = static_cast<int>(baseViewInfo.ScaledHeight()); rect.h = static_cast<int>(baseViewInfo.ScaledHeight());
@ -199,11 +207,11 @@ void Component::draw()
bool Component::animate() bool Component::animate()
{ {
bool completeDone = false; bool completeDone = false;
if(!currentTweens_ || currentTweenIndex_ >= currentTweens_->size()) if ( !currentTweens_ || currentTweenIndex_ >= currentTweens_->size() )
{ {
completeDone = true; completeDone = true;
} }
else if(currentTweens_) else if ( currentTweens_ )
{ {
bool currentDone = true; bool currentDone = true;
TweenSet *tweens = currentTweens_->tweenSet(currentTweenIndex_); TweenSet *tweens = currentTweens_->tweenSet(currentTweenIndex_);
@ -214,7 +222,7 @@ bool Component::animate()
double elapsedTime = elapsedTweenTime_; double elapsedTime = elapsedTweenTime_;
//todo: too many levels of nesting //todo: too many levels of nesting
if(elapsedTime < tween->duration) if ( elapsedTime < tween->duration )
currentDone = false; currentDone = false;
else else
elapsedTime = static_cast<float>(tween->duration); elapsedTime = static_cast<float>(tween->duration);
@ -359,7 +367,7 @@ bool Component::animate()
} }
} }
if(currentDone) if ( currentDone )
{ {
currentTweenIndex_++; currentTweenIndex_++;
elapsedTweenTime_ = 0; elapsedTweenTime_ = 0;
@ -367,7 +375,7 @@ bool Component::animate()
} }
} }
if(!currentTweens_ || currentTweenIndex_ >= currentTweens_->tweenSets()->size()) if ( !currentTweens_ || currentTweenIndex_ >= currentTweens_->tweenSets()->size() )
{ {
completeDone = true; completeDone = true;
} }

19
RetroFE/Source/Graphics/PageBuilder.cpp
View File

@ -723,16 +723,17 @@ AnimationEvents *PageBuilder::createTweenInstance(xml_node<> *componentXml)
{ {
AnimationEvents *tweens = new AnimationEvents(); AnimationEvents *tweens = new AnimationEvents();
buildTweenSet(tweens, componentXml, "onEnter", "enter"); buildTweenSet(tweens, componentXml, "onEnter", "enter");
buildTweenSet(tweens, componentXml, "onExit", "exit"); buildTweenSet(tweens, componentXml, "onExit", "exit");
buildTweenSet(tweens, componentXml, "onIdle", "idle"); buildTweenSet(tweens, componentXml, "onIdle", "idle");
buildTweenSet(tweens, componentXml, "onMenuScroll", "menuScroll"); buildTweenSet(tweens, componentXml, "onMenuIdle", "menuIdle");
buildTweenSet(tweens, componentXml, "onMenuScroll", "menuScroll");
buildTweenSet(tweens, componentXml, "onHighlightEnter", "highlightEnter"); buildTweenSet(tweens, componentXml, "onHighlightEnter", "highlightEnter");
buildTweenSet(tweens, componentXml, "onHighlightExit", "highlightExit"); buildTweenSet(tweens, componentXml, "onHighlightExit", "highlightExit");
buildTweenSet(tweens, componentXml, "onMenuEnter", "menuEnter"); buildTweenSet(tweens, componentXml, "onMenuEnter", "menuEnter");
buildTweenSet(tweens, componentXml, "onMenuExit", "menuExit"); buildTweenSet(tweens, componentXml, "onMenuExit", "menuExit");
buildTweenSet(tweens, componentXml, "onGameEnter", "gameEnter"); buildTweenSet(tweens, componentXml, "onGameEnter", "gameEnter");
buildTweenSet(tweens, componentXml, "onGameExit", "gameExit"); buildTweenSet(tweens, componentXml, "onGameExit", "gameExit");
return tweens; return tweens;
} }

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 = "8"; std::string retrofe_version_build = "9";
std::string Version::getString( ) std::string Version::getString( )