From 9a35125ca6c9b502af86bc1ef2e7d04c6fb83367 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 9 May 2005 04:26:57 +0000 Subject: [PATCH] fix up tweens (should be themable but too low-priority a screen at the moment) --- stepmania/src/ScreenSetTime.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index 1910230b97..136a062732 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/stepmania/src/ScreenSetTime.cpp @@ -62,10 +62,18 @@ void ScreenSetTime::Init() title.SetXY( GetTitleX(s), GetTitleY(s) ); this->AddChild( &title ); + title.SetDiffuse( RageColor(1,1,1,0) ); + title.BeginTweening( 0.3f, TWEEN_LINEAR ); + title.SetDiffuse( RageColor(1,1,1,1) ); + value.LoadFromFont( THEME->GetPathF("Common","normal") ); value.SetDiffuse( RageColor(1,1,1,1) ); value.SetXY( GetValueX(s), GetValueY(s) ); this->AddChild( &value ); + + value.SetDiffuse( RageColor(1,1,1,0) ); + value.BeginTweening( 0.3f, TWEEN_LINEAR ); + value.SetDiffuse( RageColor(1,1,1,1) ); } m_TimeOffset = 0; @@ -166,7 +174,9 @@ void ScreenSetTime::ChangeSelection( int iDirection ) return; // can't move any more m_textValue[OldSelection].SetEffectNone(); - m_textValue[m_Selection].SetEffectDiffuseShift(); + m_textValue[m_Selection].SetEffectDiffuseShift( 1.f, + RageColor(0.3f,0.3f,0.3f,1), + RageColor(1,1,1,1) ); if( iDirection != 0 ) SOUND->PlayOnce( THEME->GetPathS("ScreenSetTime","ChangeSelection") ); @@ -215,6 +225,17 @@ void ScreenSetTime::MenuStart( PlayerNumber pn ) * set the new time; don't over-adjust visually. */ m_TimeOffset = 0; + FOREACH_SetTimeSelection( s ) + { + BitmapText &title = m_textTitle[s]; + title.BeginTweening( 0.3f, TWEEN_LINEAR ); + title.SetDiffuse( RageColor(1,1,1,0) ); + + BitmapText &value = m_textValue[s]; + value.BeginTweening( 0.3f, TWEEN_LINEAR ); + value.SetDiffuse( RageColor(1,1,1,0) ); + } + SOUND->PlayOnce( THEME->GetPathS("Common","start") ); StartTransitioning( SM_GoToNextScreen ); }