rename: ActorCommand -> Command
Make Command smaller and more generic. Parse arguments on use, not in Command::Load.
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
#include "GameState.h"
|
||||
#include "ThemeMetric.h"
|
||||
|
||||
static ThemeMetric<ActorCommands> IN_COMMAND ("LyricDisplay","InCommand");
|
||||
static ThemeMetric<ActorCommands> OUT_COMMAND ("LyricDisplay","OutCommand");
|
||||
static ThemeMetric<Commands> IN_COMMAND ("LyricDisplay","InCommand");
|
||||
static ThemeMetric<Commands> OUT_COMMAND ("LyricDisplay","OutCommand");
|
||||
static ThemeMetric<RageColor> WIPE_DIM_FACTOR ("LyricDisplay","WipeDimFactor");
|
||||
|
||||
static float g_TweenInTime, g_TweenOutTime;
|
||||
@@ -112,14 +112,14 @@ void LyricDisplay::Update( float fDeltaTime )
|
||||
m_textLyrics[i].SetCropLeft(0);
|
||||
if( i==1 )
|
||||
m_textLyrics[i].SetCropRight(1);
|
||||
m_textLyrics[i].Command(IN_COMMAND);
|
||||
m_textLyrics[i].RunCommands(IN_COMMAND);
|
||||
m_textLyrics[i].BeginTweening( fShowLength * 0.75f ); /* sleep */
|
||||
if( i==0 )
|
||||
m_textLyrics[i].SetCropLeft(1);
|
||||
if( i==1 )
|
||||
m_textLyrics[i].SetCropRight(0);
|
||||
m_textLyrics[i].BeginTweening( fShowLength * 0.25f ); /* sleep */
|
||||
m_textLyrics[i].Command(OUT_COMMAND);
|
||||
m_textLyrics[i].RunCommands(OUT_COMMAND);
|
||||
}
|
||||
|
||||
m_iCurLyricNumber++;
|
||||
|
||||
Reference in New Issue
Block a user