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

Added background-alpha tweening.

Browse Source
This commit is contained in:
emb
2015-01-12 23:56:19 -06:00
parent f823d497a9
commit ac3552ff91
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RetroFE/Source/Graphics/Animate/Tween.cpp
View File

@@ -55,6 +55,7 @@ bool Tween::GetTweenProperty(std::string name, TweenProperty &property)
TweenPropertyMap["xoffset"] = TWEEN_PROPERTY_X_OFFSET; TweenPropertyMap["xoffset"] = TWEEN_PROPERTY_X_OFFSET;
TweenPropertyMap["yoffset"] = TWEEN_PROPERTY_Y_OFFSET; TweenPropertyMap["yoffset"] = TWEEN_PROPERTY_Y_OFFSET;
TweenPropertyMap["fontSize"] = TWEEN_PROPERTY_FONT_SIZE; TweenPropertyMap["fontSize"] = TWEEN_PROPERTY_FONT_SIZE;
TweenPropertyMap["backgroundalpha"] = TWEEN_PROPERTY_BACKGROUND_ALPHA;
} }
std::transform(name.begin(), name.end(), name.begin(), ::tolower); std::transform(name.begin(), name.end(), name.begin(), ::tolower);

3
RetroFE/Source/Graphics/Animate/TweenTypes.h
View File

@@ -41,5 +41,6 @@ enum TweenProperty
TWEEN_PROPERTY_Y_ORIGIN, TWEEN_PROPERTY_Y_ORIGIN,
TWEEN_PROPERTY_X_OFFSET, TWEEN_PROPERTY_X_OFFSET,
TWEEN_PROPERTY_Y_OFFSET, TWEEN_PROPERTY_Y_OFFSET,
TWEEN_PROPERTY_FONT_SIZE TWEEN_PROPERTY_FONT_SIZE,
TWEEN_PROPERTY_BACKGROUND_ALPHA,
}; };

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

@@ -314,6 +314,10 @@ bool Component::Animate(bool loop)
case TWEEN_PROPERTY_FONT_SIZE: case TWEEN_PROPERTY_FONT_SIZE:
GetBaseViewInfo()->SetFontSize(value); GetBaseViewInfo()->SetFontSize(value);
break; break;
case TWEEN_PROPERTY_BACKGROUND_ALPHA:
GetBaseViewInfo()->SetBackgroundAlpha(value);
break;
} }
} }

2
RetroFE/Source/Graphics/Component/ScrollingList.cpp
View File

@@ -334,6 +334,7 @@ void ScrollingList::Update(float dt)
currentViewInfo->SetImageWidth(c->GetBaseViewInfo()->GetImageWidth()); currentViewInfo->SetImageWidth(c->GetBaseViewInfo()->GetImageWidth());
nextViewInfo->SetImageHeight(c->GetBaseViewInfo()->GetImageHeight()); nextViewInfo->SetImageHeight(c->GetBaseViewInfo()->GetImageHeight());
nextViewInfo->SetImageWidth(c->GetBaseViewInfo()->GetImageWidth()); nextViewInfo->SetImageWidth(c->GetBaseViewInfo()->GetImageWidth());
nextViewInfo->SetBackgroundAlpha(c->GetBaseViewInfo()->GetBackgroundAlpha());
//todo: 30 is a magic number //todo: 30 is a magic number
ViewInfo *spriteViewInfo = c->GetBaseViewInfo(); ViewInfo *spriteViewInfo = c->GetBaseViewInfo();
@@ -349,6 +350,7 @@ void ScrollingList::Update(float dt)
spriteViewInfo->SetAlpha(Tween::AnimateSingle(LINEAR, currentViewInfo->GetAlpha(), nextViewInfo->GetAlpha(), scrollPeriod, CurrentAnimateTime)); spriteViewInfo->SetAlpha(Tween::AnimateSingle(LINEAR, currentViewInfo->GetAlpha(), nextViewInfo->GetAlpha(), scrollPeriod, CurrentAnimateTime));
spriteViewInfo->SetAngle(Tween::AnimateSingle(LINEAR, currentViewInfo->GetAngle(), nextViewInfo->GetAngle(), scrollPeriod, CurrentAnimateTime)); spriteViewInfo->SetAngle(Tween::AnimateSingle(LINEAR, currentViewInfo->GetAngle(), nextViewInfo->GetAngle(), scrollPeriod, CurrentAnimateTime));
spriteViewInfo->SetFontSize(Tween::AnimateSingle(LINEAR, currentViewInfo->GetFontSize(), nextViewInfo->GetFontSize(), scrollPeriod, CurrentAnimateTime)); spriteViewInfo->SetFontSize(Tween::AnimateSingle(LINEAR, currentViewInfo->GetFontSize(), nextViewInfo->GetFontSize(), scrollPeriod, CurrentAnimateTime));
spriteViewInfo->SetBackgroundAlpha(Tween::AnimateSingle(LINEAR, currentViewInfo->GetBackgroundAlpha(), nextViewInfo->GetBackgroundAlpha(), scrollPeriod, CurrentAnimateTime));
c->Update(dt); c->Update(dt);
} }