diff --git a/stepmania/src/GroupList.cpp b/stepmania/src/GroupList.cpp index 74754d88e3..9ebb668e64 100644 --- a/stepmania/src/GroupList.cpp +++ b/stepmania/src/GroupList.cpp @@ -194,11 +194,11 @@ void GroupList::TweenOnScreen() m_sprButtons[i]->SetX( 400 ); m_textLabels[i]->SetX( 400 ); - m_sprButtons[i]->BeginTweening( 0.1f*offset, TWEEN_BOUNCE_END ); - m_textLabels[i]->BeginTweening( 0.1f*offset, TWEEN_BOUNCE_END ); + m_sprButtons[i]->BeginTweening( 0.1f*offset, TWEEN_ACCELERATE ); + m_textLabels[i]->BeginTweening( 0.1f*offset, TWEEN_ACCELERATE ); - m_sprButtons[i]->BeginTweening( 0.2f, TWEEN_BOUNCE_END ); - m_textLabels[i]->BeginTweening( 0.2f, TWEEN_BOUNCE_END ); + m_sprButtons[i]->BeginTweening( 0.2f, TWEEN_ACCELERATE ); + m_textLabels[i]->BeginTweening( 0.2f, TWEEN_ACCELERATE ); m_sprButtons[i]->SetX( 0 ); m_textLabels[i]->SetX( 0 ); @@ -222,17 +222,17 @@ void GroupList::TweenOffScreen() const int offset = max(0, i-m_iTop); if( i == m_iSelection ) { - m_sprButtons[i]->BeginTweening( 1.0f, TWEEN_BOUNCE_BEGIN ); - m_textLabels[i]->BeginTweening( 1.0f, TWEEN_BOUNCE_BEGIN ); + m_sprButtons[i]->BeginTweening( 1.0f, TWEEN_DECELERATE ); + m_textLabels[i]->BeginTweening( 1.0f, TWEEN_DECELERATE ); } else { - m_sprButtons[i]->BeginTweening( 0.1f*offset, TWEEN_BOUNCE_BEGIN ); - m_textLabels[i]->BeginTweening( 0.1f*offset, TWEEN_BOUNCE_BEGIN ); + m_sprButtons[i]->BeginTweening( 0.1f*offset, TWEEN_DECELERATE ); + m_textLabels[i]->BeginTweening( 0.1f*offset, TWEEN_DECELERATE ); } - m_sprButtons[i]->BeginTweening( 0.2f, TWEEN_BOUNCE_BEGIN ); - m_textLabels[i]->BeginTweening( 0.2f, TWEEN_BOUNCE_BEGIN ); + m_sprButtons[i]->BeginTweening( 0.2f, TWEEN_DECELERATE ); + m_textLabels[i]->BeginTweening( 0.2f, TWEEN_DECELERATE ); m_sprButtons[i]->SetX( 400 ); m_textLabels[i]->SetX( 400 ); diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index 4eae8d9f97..1bd0aa0265 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -204,12 +204,12 @@ void ScreenEz2SelectPlayer::TweenOnScreen() fOriginalX = m_sprJoinMessage[p].GetX(); m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); - m_sprJoinMessage[p].BeginTweening( 0.5f, TWEEN_BOUNCE_END ); + m_sprJoinMessage[p].BeginTweening( 0.5f, TWEEN_ACCELERATE ); m_sprJoinMessage[p].SetX( fOriginalX ); fOriginalX = m_sprJoinFrame[p].GetX(); m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset ); - m_sprJoinFrame[p].BeginTweening( 0.5f, TWEEN_BOUNCE_END ); + m_sprJoinFrame[p].BeginTweening( 0.5f, TWEEN_ACCELERATE ); m_sprJoinFrame[p].SetX( fOriginalX ); }