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

add expanded bar

Browse Source
This commit is contained in:
Chris Danford
2005-04-28 11:39:31 +00:00
parent 5c43e5b944
commit 77efd71587
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Graphics/MusicWheelItem expanded.redir
+1
View File
@@ -0,0 +1 @@
MusicWheelItem section
stepmania/src/MusicWheel.cpp
+6 -3
View File
@@ -872,7 +872,8 @@ void MusicWheel::RebuildMusicWheelItems( int dist )
WheelItemData *data = m_CurWheelItemData[iIndex]; WheelItemData *data = m_CurWheelItemData[iIndex];
MusicWheelItem *display = m_MusicWheelItems[i]; MusicWheelItem *display = m_MusicWheelItems[i];
display->LoadFromWheelItemData( data ); bool bExpanded = (data->m_Type == TYPE_SECTION) ? (data->m_sSectionName == m_sExpandedSectionName) : false;
display->LoadFromWheelItemData( data, bExpanded );
} }
} }
else else
@@ -889,7 +890,8 @@ void MusicWheel::RebuildMusicWheelItems( int dist )
WheelItemData *data = m_CurWheelItemData[iIndex]; WheelItemData *data = m_CurWheelItemData[iIndex];
MusicWheelItem *display = m_MusicWheelItems[i]; MusicWheelItem *display = m_MusicWheelItems[i];
display->LoadFromWheelItemData( data ); bool bExpanded = (data->m_Type == TYPE_SECTION) ? (data->m_sSectionName == m_sExpandedSectionName) : false;
display->LoadFromWheelItemData( data, bExpanded );
} }
} }
else if( dist < 0 ) else if( dist < 0 )
@@ -902,7 +904,8 @@ void MusicWheel::RebuildMusicWheelItems( int dist )
WheelItemData *data = m_CurWheelItemData[iIndex]; WheelItemData *data = m_CurWheelItemData[iIndex];
MusicWheelItem *display = m_MusicWheelItems[i]; MusicWheelItem *display = m_MusicWheelItems[i];
display->LoadFromWheelItemData( data ); bool bExpanded = (data->m_Type == TYPE_SECTION) ? (data->m_sSectionName == m_sExpandedSectionName) : false;
display->LoadFromWheelItemData( data, bExpanded );
} }
} }
} }
stepmania/src/MusicWheelItem.cpp
+8 -4
View File
@@ -60,6 +60,10 @@ MusicWheelItem::MusicWheelItem()
m_sprSectionBar.SetXY( 0, 0 ); m_sprSectionBar.SetXY( 0, 0 );
this->AddChild( &m_sprSectionBar ); this->AddChild( &m_sprSectionBar );
m_sprExpandedBar.Load( THEME->GetPathG("MusicWheelItem","expanded") );
m_sprExpandedBar.SetXY( 0, 0 );
this->AddChild( &m_sprExpandedBar );
m_fPercentGray = 0; m_fPercentGray = 0;
m_WheelNotifyIcon.SetXY( ICON_X, ICON_Y ); m_WheelNotifyIcon.SetXY( ICON_X, ICON_Y );
m_WheelNotifyIcon.RunCommands( ICON_ON_COMMAND ); m_WheelNotifyIcon.RunCommands( ICON_ON_COMMAND );
@@ -103,7 +107,7 @@ MusicWheelItem::MusicWheelItem()
} }
void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID ) void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID, bool bExpanded )
{ {
ASSERT( pWID != NULL ); ASSERT( pWID != NULL );
data = pWID; data = pWID;
@@ -114,6 +118,7 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID )
m_TextBanner.SetHidden( true ); m_TextBanner.SetHidden( true );
m_sprSongBar.SetHidden( true ); m_sprSongBar.SetHidden( true );
m_sprSectionBar.SetHidden( true ); m_sprSectionBar.SetHidden( true );
m_sprExpandedBar.SetHidden( true );
m_textSectionName.SetHidden( true ); m_textSectionName.SetHidden( true );
m_textRoulette.SetHidden( true ); m_textRoulette.SetHidden( true );
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
@@ -193,7 +198,7 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID )
case TYPE_RANDOM: case TYPE_RANDOM:
case TYPE_PORTAL: case TYPE_PORTAL:
case TYPE_SORT: case TYPE_SORT:
m_sprSectionBar.SetHidden( false ); (bExpanded ? m_sprExpandedBar : m_sprSectionBar).SetHidden( false );
break; break;
case TYPE_SONG: case TYPE_SONG:
case TYPE_COURSE: case TYPE_COURSE:
@@ -229,7 +234,6 @@ void MusicWheelItem::RefreshGrades()
m_GradeDisplay[p].SetGrade( p, grade ); m_GradeDisplay[p].SetGrade( p, grade );
} }
} }
@@ -244,7 +248,7 @@ void MusicWheelItem::DrawPrimitives()
if( m_fPercentGray > 0 ) if( m_fPercentGray > 0 )
{ {
Sprite &bar = m_sprSectionBar.GetHidden() ? m_sprSongBar : m_sprSectionBar; Sprite &bar = m_sprSongBar.GetVisible() ? m_sprSongBar : (m_sprSectionBar.GetVisible() ? m_sprSectionBar : m_sprExpandedBar);
bar.SetGlow( RageColor(0,0,0,m_fPercentGray) ); bar.SetGlow( RageColor(0,0,0,m_fPercentGray) );
bar.SetDiffuse( RageColor(0,0,0,0) ); bar.SetDiffuse( RageColor(0,0,0,0) );
bar.Draw(); bar.Draw();
stepmania/src/MusicWheelItem.h
+2 -1
View File
@@ -23,7 +23,7 @@ public:
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
virtual void DrawPrimitives(); virtual void DrawPrimitives();
void LoadFromWheelItemData( WheelItemData* pWID ); void LoadFromWheelItemData( WheelItemData* pWID, bool bExpanded );
void RefreshGrades(); void RefreshGrades();
WheelItemData *data; WheelItemData *data;
@@ -31,6 +31,7 @@ public:
Sprite m_sprSongBar; Sprite m_sprSongBar;
Sprite m_sprSectionBar; Sprite m_sprSectionBar;
Sprite m_sprExpandedBar;
WheelNotifyIcon m_WheelNotifyIcon; WheelNotifyIcon m_WheelNotifyIcon;
TextBanner m_TextBanner; TextBanner m_TextBanner;
BitmapText m_textSectionName; BitmapText m_textSectionName;