From ac3552ff9153e82ea67dda6bb811581883ccf519 Mon Sep 17 00:00:00 2001 From: emb <> Date: Mon, 12 Jan 2015 23:56:19 -0600 Subject: [PATCH] Added background-alpha tweening. --- RetroFE/Source/Graphics/Animate/Tween.cpp | 1 + RetroFE/Source/Graphics/Animate/TweenTypes.h | 3 ++- RetroFE/Source/Graphics/Component/Component.cpp | 4 ++++ RetroFE/Source/Graphics/Component/ScrollingList.cpp | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/RetroFE/Source/Graphics/Animate/Tween.cpp b/RetroFE/Source/Graphics/Animate/Tween.cpp index 0cff078..6f3e52f 100644 --- a/RetroFE/Source/Graphics/Animate/Tween.cpp +++ b/RetroFE/Source/Graphics/Animate/Tween.cpp @@ -55,6 +55,7 @@ bool Tween::GetTweenProperty(std::string name, TweenProperty &property) TweenPropertyMap["xoffset"] = TWEEN_PROPERTY_X_OFFSET; TweenPropertyMap["yoffset"] = TWEEN_PROPERTY_Y_OFFSET; TweenPropertyMap["fontSize"] = TWEEN_PROPERTY_FONT_SIZE; + TweenPropertyMap["backgroundalpha"] = TWEEN_PROPERTY_BACKGROUND_ALPHA; } std::transform(name.begin(), name.end(), name.begin(), ::tolower); diff --git a/RetroFE/Source/Graphics/Animate/TweenTypes.h b/RetroFE/Source/Graphics/Animate/TweenTypes.h index 074543a..87f0360 100644 --- a/RetroFE/Source/Graphics/Animate/TweenTypes.h +++ b/RetroFE/Source/Graphics/Animate/TweenTypes.h @@ -41,5 +41,6 @@ enum TweenProperty TWEEN_PROPERTY_Y_ORIGIN, TWEEN_PROPERTY_X_OFFSET, TWEEN_PROPERTY_Y_OFFSET, - TWEEN_PROPERTY_FONT_SIZE + TWEEN_PROPERTY_FONT_SIZE, + TWEEN_PROPERTY_BACKGROUND_ALPHA, }; diff --git a/RetroFE/Source/Graphics/Component/Component.cpp b/RetroFE/Source/Graphics/Component/Component.cpp index dfd3637..879cdbe 100644 --- a/RetroFE/Source/Graphics/Component/Component.cpp +++ b/RetroFE/Source/Graphics/Component/Component.cpp @@ -314,6 +314,10 @@ bool Component::Animate(bool loop) case TWEEN_PROPERTY_FONT_SIZE: GetBaseViewInfo()->SetFontSize(value); break; + + case TWEEN_PROPERTY_BACKGROUND_ALPHA: + GetBaseViewInfo()->SetBackgroundAlpha(value); + break; } } diff --git a/RetroFE/Source/Graphics/Component/ScrollingList.cpp b/RetroFE/Source/Graphics/Component/ScrollingList.cpp index 2d4110a..24e27fe 100644 --- a/RetroFE/Source/Graphics/Component/ScrollingList.cpp +++ b/RetroFE/Source/Graphics/Component/ScrollingList.cpp @@ -334,6 +334,7 @@ void ScrollingList::Update(float dt) currentViewInfo->SetImageWidth(c->GetBaseViewInfo()->GetImageWidth()); nextViewInfo->SetImageHeight(c->GetBaseViewInfo()->GetImageHeight()); nextViewInfo->SetImageWidth(c->GetBaseViewInfo()->GetImageWidth()); + nextViewInfo->SetBackgroundAlpha(c->GetBaseViewInfo()->GetBackgroundAlpha()); //todo: 30 is a magic number 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->SetAngle(Tween::AnimateSingle(LINEAR, currentViewInfo->GetAngle(), nextViewInfo->GetAngle(), 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); }