actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change color metrics to commands

Browse Source
This commit is contained in:
Chris Danford
2008-02-15 09:32:40 +00:00
parent 95dad9ff4b
commit e9518eca6a
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BPMDisplay.cpp
+10 -9
View File
@@ -24,14 +24,15 @@ BPMDisplay::BPMDisplay()
void BPMDisplay::Load() void BPMDisplay::Load()
{ {
NORMAL_COLOR.Load( m_sName, "NormalColor"); SET_NO_BPM_COMMAND.Load( m_sName, "SetNoBpmCommand");
CHANGE_COLOR.Load( m_sName, "ChangeColor" ); SET_NORMAL_COMMAND.Load( m_sName, "SetNormalCommand");
EXTRA_COLOR.Load( m_sName, "ExtraColor" ); SET_CHANGING_COMMAND.Load( m_sName, "SetChangeCommand" );
SET_EXTRA_COMMAND.Load( m_sName, "SetExtraCommand" );
CYCLE.Load( m_sName, "Cycle" ); CYCLE.Load( m_sName, "Cycle" );
SEPARATOR.Load( m_sName, "Separator" ); SEPARATOR.Load( m_sName, "Separator" );
NO_BPM_TEXT.Load( m_sName, "NoBPMText" ); NO_BPM_TEXT.Load( m_sName, "NoBpmText" );
SetDiffuse( NORMAL_COLOR ); RunCommands( SET_NORMAL_COMMAND );
} }
void BPMDisplay::LoadFromNode( const XNode *pNode ) void BPMDisplay::LoadFromNode( const XNode *pNode )
@@ -135,11 +136,11 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
} }
if( GAMESTATE->IsAnExtraStage() ) if( GAMESTATE->IsAnExtraStage() )
SetDiffuse( EXTRA_COLOR ); RunCommands( SET_EXTRA_COMMAND );
else if( !AllIdentical ) else if( !AllIdentical )
SetDiffuse( CHANGE_COLOR ); RunCommands( SET_CHANGING_COMMAND );
else else
SetDiffuse( NORMAL_COLOR ); RunCommands( SET_NORMAL_COMMAND );
} }
void BPMDisplay::CycleRandomly() void BPMDisplay::CycleRandomly()
@@ -155,7 +156,7 @@ void BPMDisplay::NoBPM()
{ {
m_BPMS.clear(); m_BPMS.clear();
SetText( NO_BPM_TEXT ); SetText( NO_BPM_TEXT );
SetDiffuse( NORMAL_COLOR ); RunCommands( SET_NO_BPM_COMMAND );
} }
void BPMDisplay::SetBpmFromSong( const Song* pSong ) void BPMDisplay::SetBpmFromSong( const Song* pSong )
stepmania/src/BPMDisplay.h
+4 -3
View File
@@ -35,9 +35,10 @@ protected:
float GetActiveBPM() const; float GetActiveBPM() const;
void SetBPMRange( const DisplayBpms &bpms ); void SetBPMRange( const DisplayBpms &bpms );
ThemeMetric<RageColor> NORMAL_COLOR; ThemeMetric<apActorCommands> SET_NO_BPM_COMMAND;
ThemeMetric<RageColor> CHANGE_COLOR; ThemeMetric<apActorCommands> SET_NORMAL_COMMAND;
ThemeMetric<RageColor> EXTRA_COLOR; ThemeMetric<apActorCommands> SET_CHANGING_COMMAND;
ThemeMetric<apActorCommands> SET_EXTRA_COMMAND;
ThemeMetric<bool> CYCLE; ThemeMetric<bool> CYCLE;
ThemeMetric<RString> SEPARATOR; ThemeMetric<RString> SEPARATOR;
ThemeMetric<RString> NO_BPM_TEXT; ThemeMetric<RString> NO_BPM_TEXT;