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

Arrow color -> Arrow commands

Browse Source
This commit is contained in:
Chris Danford
2006-03-30 04:05:15 +00:00
parent 77e1f83a8c
commit 1e368d63a3
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -2
View File
@@ -2118,8 +2118,8 @@ EditMode=Full
ShowGroups=1 ShowGroups=1
Arrows1X=SCREEN_CENTER_X-130 Arrows1X=SCREEN_CENTER_X-130
Arrows2X=SCREEN_CENTER_X+270 Arrows2X=SCREEN_CENTER_X+270
ArrowsEnabledColor=1,1,1,1 ArrowsEnabledCommand=diffuse,1,1,1,1;glowshift
ArrowsDisabledColor=0.2,0.2,0.2,1 ArrowsDisabledCommand=stopeffect;diffuse,0.2,0.2,0.2,1
SongBannerX=SCREEN_CENTER_X+170 SongBannerX=SCREEN_CENTER_X+170
SongBannerY=SCREEN_CENTER_Y-110 SongBannerY=SCREEN_CENTER_Y-110
SongBannerWidth=130 SongBannerWidth=130
stepmania/src/EditMenu.cpp
+9 -9
View File
@@ -102,8 +102,8 @@ void EditMenu::Load( const RString &sType )
SHOW_GROUPS.Load(sType,"ShowGroups"); SHOW_GROUPS.Load(sType,"ShowGroups");
ARROWS_X.Load(sType,ARROWS_X_NAME,NUM_ARROWS); ARROWS_X.Load(sType,ARROWS_X_NAME,NUM_ARROWS);
ARROWS_ENABLED_COLOR.Load(sType,"ArrowsEnabledColor"); ARROWS_ENABLED_COMMAND.Load(sType,"ArrowsEnabledCommand");
ARROWS_DISABLED_COLOR.Load(sType,"ArrowsDisabledColor"); ARROWS_DISABLED_COMMAND.Load(sType,"ArrowsDisabledCommand");
SONG_BANNER_WIDTH.Load(sType,"SongBannerWidth"); SONG_BANNER_WIDTH.Load(sType,"SongBannerWidth");
SONG_BANNER_HEIGHT.Load(sType,"SongBannerHeight"); SONG_BANNER_HEIGHT.Load(sType,"SongBannerHeight");
GROUP_BANNER_WIDTH.Load(sType,"GroupBannerWidth"); GROUP_BANNER_WIDTH.Load(sType,"GroupBannerWidth");
@@ -118,8 +118,8 @@ void EditMenu::Load( const RString &sType )
for( int i=0; i<2; i++ ) for( int i=0; i<2; i++ )
{ {
m_sprArrows[i].Load( THEME->GetPathG(sType,i==0?"left":"right") ); m_sprArrows[i].Load( THEME->GetPathG(sType,i==0?"left":"right") );
m_sprArrows[i].SetX( ARROWS_X.GetValue(i) ); m_sprArrows[i]->SetX( ARROWS_X.GetValue(i) );
this->AddChild( &m_sprArrows[i] ); this->AddChild( m_sprArrows[i] );
} }
m_SelectedRow = GetFirstRow(); m_SelectedRow = GetFirstRow();
@@ -342,16 +342,16 @@ void EditMenu::ChangeToRow( EditMenuRow newRow )
m_SelectedRow = newRow; m_SelectedRow = newRow;
for( int i=0; i<2; i++ ) for( int i=0; i<2; i++ )
m_sprArrows[i].SetY( ROW_Y.GetValue(newRow) ); m_sprArrows[i]->SetY( ROW_Y.GetValue(newRow) );
UpdateArrows(); UpdateArrows();
} }
void EditMenu::UpdateArrows() void EditMenu::UpdateArrows()
{ {
m_sprArrows[0].SetDiffuse( CanGoLeft() ? ARROWS_ENABLED_COLOR : ARROWS_DISABLED_COLOR ); m_sprArrows[0]->RunCommands( CanGoLeft() ? ARROWS_ENABLED_COMMAND : ARROWS_DISABLED_COMMAND );
m_sprArrows[1].SetDiffuse( CanGoRight()? ARROWS_ENABLED_COLOR : ARROWS_DISABLED_COLOR ); m_sprArrows[1]->RunCommands( CanGoRight()? ARROWS_ENABLED_COMMAND : ARROWS_DISABLED_COMMAND );
m_sprArrows[0].EnableAnimation( CanGoLeft() ); m_sprArrows[0]->EnableAnimation( CanGoLeft() );
m_sprArrows[1].EnableAnimation( CanGoRight() ); m_sprArrows[1]->EnableAnimation( CanGoRight() );
} }
static LocalizedString BLANK ( "EditMenu", "Blank" ); static LocalizedString BLANK ( "EditMenu", "Blank" );
stepmania/src/EditMenu.h
+3 -3
View File
@@ -80,7 +80,7 @@ private:
void GetGroupsToShow( vector<RString> &vsGroupsOut ); void GetGroupsToShow( vector<RString> &vsGroupsOut );
void UpdateArrows(); void UpdateArrows();
Sprite m_sprArrows[NUM_ARROWS]; AutoActor m_sprArrows[NUM_ARROWS];
EditMenuRow m_SelectedRow; EditMenuRow m_SelectedRow;
EditMenuRow GetFirstRow() const { return SHOW_GROUPS.GetValue()? ROW_GROUP:ROW_SONG; } EditMenuRow GetFirstRow() const { return SHOW_GROUPS.GetValue()? ROW_GROUP:ROW_SONG; }
@@ -118,8 +118,8 @@ private:
ThemeMetric<bool> SHOW_GROUPS; ThemeMetric<bool> SHOW_GROUPS;
ThemeMetric1D<float> ARROWS_X; ThemeMetric1D<float> ARROWS_X;
ThemeMetric<RageColor> ARROWS_ENABLED_COLOR; ThemeMetric<apActorCommands> ARROWS_ENABLED_COMMAND;
ThemeMetric<RageColor> ARROWS_DISABLED_COLOR; ThemeMetric<apActorCommands> ARROWS_DISABLED_COMMAND;
ThemeMetric<float> SONG_BANNER_WIDTH; ThemeMetric<float> SONG_BANNER_WIDTH;
ThemeMetric<float> SONG_BANNER_HEIGHT; ThemeMetric<float> SONG_BANNER_HEIGHT;
ThemeMetric<float> GROUP_BANNER_WIDTH; ThemeMetric<float> GROUP_BANNER_WIDTH;