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

pane update

Browse Source
This commit is contained in:
Glenn Maynard
2003-12-10 22:11:07 +00:00
parent 3228ca1afc
commit f63a35506a
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+23 -11
View File
@@ -44,11 +44,12 @@ static const Content_t g_Contents[NUM_PANE_CONTENTS] =
{ "ProfileNumPlays", PANE_SONG_PROFILE_SCORES, NEED_NOTES|NEED_PROFILE }, { "ProfileNumPlays", PANE_SONG_PROFILE_SCORES, NEED_NOTES|NEED_PROFILE },
{ "ProfileRank", PANE_SONG_PROFILE_SCORES, NEED_NOTES|NEED_PROFILE }, { "ProfileRank", PANE_SONG_PROFILE_SCORES, NEED_NOTES|NEED_PROFILE },
{ "CourseMachineHighScore", PANE_COURSE_MACHINE_SCORES, NEED_COURSE }, { "CourseMachineHighScore", PANE_COURSE_MACHINE_SCORES, NEED_COURSE },
{ "CourseMachineNumPlays", PANE_COURSE_MACHINE_SCORES, NEED_COURSE }, { "CourseMachineNumPlays", NUM_PANES, NEED_COURSE },
{ "CourseMachineRank", PANE_COURSE_MACHINE_SCORES, NEED_COURSE }, { "CourseMachineRank", NUM_PANES, NEED_COURSE },
{ "CourseProfileHighScore", PANE_COURSE_PROFILE_SCORES, NEED_COURSE|NEED_PROFILE }, { "CourseMachineHighName", PANE_COURSE_MACHINE_SCORES, NEED_COURSE },
{ "CourseProfileNumPlays", PANE_COURSE_PROFILE_SCORES, NEED_COURSE|NEED_PROFILE }, { "CourseProfileHighScore", PANE_COURSE_MACHINE_SCORES, NEED_COURSE|NEED_PROFILE },
{ "CourseProfileRank", PANE_COURSE_PROFILE_SCORES, NEED_COURSE|NEED_PROFILE } { "CourseProfileNumPlays", NUM_PANES, NEED_COURSE|NEED_PROFILE },
{ "CourseProfileRank", NUM_PANES, NEED_COURSE|NEED_PROFILE }
}; };
static const PaneModes PaneMode[NUM_PANES] = static const PaneModes PaneMode[NUM_PANES] =
@@ -84,7 +85,7 @@ void PaneDisplay::Load( PlayerNumber pn )
m_PlayerNumber = pn; m_PlayerNumber = pn;
m_PreferredPaneForMode[PANEMODE_SONG] = PANE_SONG_DIFFICULTY; m_PreferredPaneForMode[PANEMODE_SONG] = PANE_SONG_DIFFICULTY;
m_PreferredPaneForMode[PANEMODE_BATTLE] = PANE_BATTLE_DIFFICULTY; m_PreferredPaneForMode[PANEMODE_BATTLE] = PANE_BATTLE_DIFFICULTY;
m_PreferredPaneForMode[PANEMODE_COURSE] = PANE_COURSE_PROFILE_SCORES; m_PreferredPaneForMode[PANEMODE_COURSE] = PANE_COURSE_MACHINE_SCORES;
m_sprPaneUnder.Load( THEME->GetPathToG( ssprintf("PaneDisplay under p%i", pn+1)) ); m_sprPaneUnder.Load( THEME->GetPathToG( ssprintf("PaneDisplay under p%i", pn+1)) );
m_sprPaneUnder->SetName( "Under" ); m_sprPaneUnder->SetName( "Under" );
@@ -94,6 +95,9 @@ void PaneDisplay::Load( PlayerNumber pn )
int p; int p;
for( p = 0; p < NUM_PANE_CONTENTS; ++p ) for( p = 0; p < NUM_PANE_CONTENTS; ++p )
{ {
if( g_Contents[p].type == NUM_PANES )
continue; /* skip, disabled */
m_textContents[p].LoadFromFont( THEME->GetPathToF( "PaneDisplay text" ) ); m_textContents[p].LoadFromFont( THEME->GetPathToF( "PaneDisplay text" ) );
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) ); m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
SET_XY_AND_ON_COMMAND( m_textContents[p] ); SET_XY_AND_ON_COMMAND( m_textContents[p] );
@@ -115,6 +119,8 @@ void PaneDisplay::Load( PlayerNumber pn )
for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i ) for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i )
{ {
if( g_Contents[i].type == NUM_PANES )
continue; /* skip, disabled */
COMMAND( m_textContents[i], "LoseFocus" ); COMMAND( m_textContents[i], "LoseFocus" );
COMMAND( m_Labels[i], "LoseFocus" ); COMMAND( m_Labels[i], "LoseFocus" );
m_textContents[i].FinishTweening(); m_textContents[i].FinishTweening();
@@ -188,9 +194,9 @@ void PaneDisplay::SetContent( PaneContents c )
break; break;
} }
case COURSE_MACHINE_HIGH_NAME: /* set val for color */
case COURSE_MACHINE_HIGH_SCORE: case COURSE_MACHINE_HIGH_SCORE:
// XXX add percentdp val = 100.0f * GAMESTATE->m_pCurCourse->GetTopScore( GAMESTATE->GetCurrentStyleDef()->m_StepsType, MEMORY_CARD_MACHINE ).fPercentDP;
val = 100.0f; // * GAMESTATE->m_pCurCourse->GetTopScore( GAMESTATE->GetCurrentStyleDef()->m_StepsType, MEMORY_CARD_MACHINE ).HighScore;
break; break;
case COURSE_MACHINE_NUM_PLAYS: case COURSE_MACHINE_NUM_PLAYS:
@@ -206,8 +212,7 @@ void PaneDisplay::SetContent( PaneContents c )
break; break;
case COURSE_PROFILE_HIGH_SCORE: case COURSE_PROFILE_HIGH_SCORE:
// XXX add percentdp val = 100.0f * GAMESTATE->m_pCurCourse->GetTopScore( GAMESTATE->GetCurrentStyleDef()->m_StepsType, PlayerMemCard(m_PlayerNumber) ).fPercentDP;
val = 100.0f; // * GAMESTATE->m_pCurCourse->GetTopScore( GAMESTATE->GetCurrentStyleDef()->m_StepsType, PlayerMemCard(m_PlayerNumber) ).HighScore;
break; break;
case COURSE_PROFILE_NUM_PLAYS: case COURSE_PROFILE_NUM_PLAYS:
val = (float) GAMESTATE->m_pCurCourse->GetNumTimesPlayed( PlayerMemCard(m_PlayerNumber) ); val = (float) GAMESTATE->m_pCurCourse->GetNumTimesPlayed( PlayerMemCard(m_PlayerNumber) );
@@ -239,6 +244,10 @@ void PaneDisplay::SetContent( PaneContents c )
case SONG_MACHINE_HIGH_NAME: case SONG_MACHINE_HIGH_NAME:
str = GAMESTATE->m_pCurNotes[m_PlayerNumber]->GetTopScore( MEMORY_CARD_MACHINE ).sName; str = GAMESTATE->m_pCurNotes[m_PlayerNumber]->GetTopScore( MEMORY_CARD_MACHINE ).sName;
break; break;
case COURSE_MACHINE_HIGH_NAME:
str = GAMESTATE->m_pCurCourse->GetTopScore( GAMESTATE->GetCurrentStyleDef()->m_StepsType, MEMORY_CARD_MACHINE ).sName;
break;
case SONG_MACHINE_HIGH_SCORE: case SONG_MACHINE_HIGH_SCORE:
case COURSE_MACHINE_HIGH_SCORE: case COURSE_MACHINE_HIGH_SCORE:
case SONG_PROFILE_HIGH_SCORE: case SONG_PROFILE_HIGH_SCORE:
@@ -269,9 +278,9 @@ void PaneDisplay::SetContent( PaneContents c )
const CString metric = ITEM_COLOR(g_Contents[c].name, p); const CString metric = ITEM_COLOR(g_Contents[c].name, p);
CStringArray spec; CStringArray spec;
split( metric, ";", spec ); split( metric, ";", spec );
LOG->Trace("%i/%i, '%s', %zu, max '%s'", p, num, metric.c_str(), spec.size(), spec[0].c_str() );
if( spec.size() < 2 ) if( spec.size() < 2 )
RageException::Throw( "Metric '%s' malformed", metric.c_str() ); RageException::Throw( "Metric '%s' malformed", metric.c_str() );
const float n = (float) atof( spec[0] ); const float n = (float) atof( spec[0] );
if( val >= n ) if( val >= n )
continue; continue;
@@ -321,6 +330,9 @@ void PaneDisplay::SetFocus( PaneTypes NewPane )
for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i ) for( unsigned i = 0; i < NUM_PANE_CONTENTS; ++i )
{ {
if( g_Contents[i].type == NUM_PANES )
continue; /* skip, disabled */
if( g_Contents[i].type == m_CurPane ) if( g_Contents[i].type == m_CurPane )
{ {
COMMAND( m_textContents[i], "LoseFocus" ); COMMAND( m_textContents[i], "LoseFocus" );
stepmania/src/PaneDisplay.h
+1
View File
@@ -56,6 +56,7 @@ enum PaneContents
COURSE_MACHINE_HIGH_SCORE, COURSE_MACHINE_HIGH_SCORE,
COURSE_MACHINE_NUM_PLAYS, COURSE_MACHINE_NUM_PLAYS,
COURSE_MACHINE_RANK, COURSE_MACHINE_RANK,
COURSE_MACHINE_HIGH_NAME,
COURSE_PROFILE_HIGH_SCORE, COURSE_PROFILE_HIGH_SCORE,
COURSE_PROFILE_NUM_PLAYS, COURSE_PROFILE_NUM_PLAYS,
COURSE_PROFILE_RANK, COURSE_PROFILE_RANK,