diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index e3233ba4ce..2aa5e15d7c 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -113,7 +113,6 @@ void WheelItem::SetDiffuseColor( D3DXCOLOR c ) m_Banner.SetDiffuseColor( colorTempTint ); m_sprSectionBackground.SetDiffuseColor( colorTempTint ); - D3DXCOLOR colorTempLetter = COLOR_SECTION_LETTER; colorTempLetter.a = c.a; colorTempLetter.r *= c.r; @@ -122,6 +121,11 @@ void WheelItem::SetDiffuseColor( D3DXCOLOR c ) m_textSectionName.SetDiffuseColor( colorTempLetter ); + D3DXCOLOR colorTempDisplay = D3DXCOLOR( 1, 1 ,1, c.a); + + m_MusicStatusDisplay.SetDiffuseColor( colorTempDisplay ); + + }; void WheelItem::Update( float fDeltaTime ) @@ -682,3 +686,28 @@ bool MusicWheel::Select() } } +void MusicWheel::TweenOnScreen() { + m_WheelState = STATE_TWEENING_ON_SCREEN; + m_fTimeLeftInState = FADE_TIME; + + float fOriginalZoomY = m_sprSelectionBackground.GetZoomY(); + m_sprSelectionBackground.SetZoomY( 0 ); + m_sprSelectionBackground.BeginTweening( FADE_TIME ); + m_sprSelectionBackground.SetTweenZoomY( fOriginalZoomY ); + + m_sprSelectionOverlay.SetZoomY( 0 ); + m_sprSelectionOverlay.BeginTweening( FADE_TIME ); + m_sprSelectionOverlay.SetTweenZoomY( fOriginalZoomY ); + +} + + +void MusicWheel::TweenOffScreen(){ + m_WheelState = STATE_TWEENING_OFF_SCREEN; + m_fTimeLeftInState = FADE_TIME; + + m_sprSelectionBackground.BeginTweening( FADE_TIME ); + m_sprSelectionBackground.SetTweenZoomY( 0 ); + m_sprSelectionOverlay.BeginTweening( FADE_TIME ); + m_sprSelectionOverlay.SetTweenZoomY( 0 ); +} \ No newline at end of file diff --git a/stepmania/src/MusicWheel.h b/stepmania/src/MusicWheel.h index 62ce9bdd42..2fdb8be989 100644 --- a/stepmania/src/MusicWheel.h +++ b/stepmania/src/MusicWheel.h @@ -84,8 +84,8 @@ public: virtual void Update( float fDeltaTime ); virtual void RenderPrimitives(); - virtual void TweenOnScreen() { m_WheelState = STATE_TWEENING_ON_SCREEN; m_fTimeLeftInState = FADE_TIME; }; - virtual void TweenOffScreen() { m_WheelState = STATE_TWEENING_OFF_SCREEN; m_fTimeLeftInState = FADE_TIME; }; + virtual void TweenOnScreen(); + virtual void TweenOffScreen(); void PrevMusic(); void NextMusic();