move ScreenOptions frame animation to a metric
This commit is contained in:
@@ -2821,6 +2821,8 @@ ColorNotSelected=0.5,0.5,0.5,1 // grayed
|
||||
NumShownItems=10
|
||||
ShowScrollBar=0
|
||||
ShowBpmInSpeedTitle=0
|
||||
FrameOnCommand=addx,-640;decelerate,0.3;addx,+640
|
||||
FrameOffCommand=accelerate,0.3;addx,+640
|
||||
|
||||
[ScreenMapControllers]
|
||||
EvenLineIn=addx,-640;decelerate,0.5;addx,640;
|
||||
|
||||
@@ -52,6 +52,8 @@ const float ITEM_X[NUM_PLAYERS] = { 260, 420 };
|
||||
#define COLOR_NOT_SELECTED THEME->GetMetricC("ScreenOptions","ColorNotSelected")
|
||||
#define NUM_SHOWN_ITEMS THEME->GetMetricI("ScreenOptions","NumShownItems")
|
||||
#define SHOW_BPM_IN_SPEED_TITLE THEME->GetMetricB("ScreenOptions","ShowBpmInSpeedTitle")
|
||||
#define FRAME_ON_COMMAND THEME->GetMetric ("ScreenOptions","FrameOnCommand")
|
||||
#define FRAME_OFF_COMMAND THEME->GetMetric ("ScreenOptions","FrameOffCommand")
|
||||
|
||||
ScreenOptions::ScreenOptions( CString sClassName ) : Screen(sClassName)
|
||||
{
|
||||
@@ -76,9 +78,8 @@ ScreenOptions::ScreenOptions( CString sClassName ) : Screen(sClassName)
|
||||
m_iSelectedOption[p][l] = 0;
|
||||
}
|
||||
|
||||
m_framePage.SetX( SCREEN_LEFT-SCREEN_WIDTH );
|
||||
m_framePage.BeginTweening( 0.3f, Actor::TWEEN_DECELERATE );
|
||||
m_framePage.SetX( 0 );
|
||||
m_framePage.Command( FRAME_ON_COMMAND );
|
||||
|
||||
memset(&m_bRowIsLong, 0, sizeof(m_bRowIsLong));
|
||||
}
|
||||
|
||||
@@ -692,8 +693,7 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
|
||||
|
||||
m_SoundStart.Play();
|
||||
|
||||
m_framePage.BeginTweening( 0.3f, Actor::TWEEN_ACCELERATE );
|
||||
m_framePage.SetX( SCREEN_RIGHT );
|
||||
m_framePage.Command( FRAME_OFF_COMMAND );
|
||||
break;
|
||||
case SM_GainFocus:
|
||||
INPUTFILTER->SetRepeatRate( 0.25f, 12, 0.25f, 12 );
|
||||
|
||||
Reference in New Issue
Block a user