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

enum style cleanup

Browse Source
This commit is contained in:
Chris Danford
2008-02-15 09:57:24 +00:00
parent 58f82f8fd8
commit 9385e0bf5d
1 changed files with 68 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+68 -48
View File
@@ -15,27 +15,42 @@
#include "XmlFile.h" #include "XmlFile.h"
#include "PlayerStageStats.h" #include "PlayerStageStats.h"
#define SHIFT_X(p) THEME->GetMetricF(sMetricsGroup, ssprintf("ShiftP%iX", p+1)) #define SHIFT_X(pc) THEME->GetMetricF(sMetricsGroup, ssprintf("ShiftP%iX", pc+1))
#define SHIFT_Y(p) THEME->GetMetricF(sMetricsGroup, ssprintf("ShiftP%iY", p+1)) #define SHIFT_Y(pc) THEME->GetMetricF(sMetricsGroup, ssprintf("ShiftP%iY", pc+1))
static const char *PaneCategoryNames[] = {
"NumSteps",
"Jumps",
"Holds",
"Rolls",
"Mines",
"Hands",
"MachineHighScore",
"MachineHighName",
"ProfileHighScore",
};
XToString( PaneCategory );
LuaXType( PaneCategory );
enum { NEED_NOTES=1, NEED_PROFILE=2 }; enum { NEED_NOTES=1, NEED_PROFILE=2 };
struct Content_t struct Content_t
{ {
const char *name;
int req; int req;
RString sFontType;
}; };
static const Content_t g_Contents[NUM_PaneContents] = static const Content_t g_Contents[NUM_PaneCategory] =
{ {
{ "SongNumSteps", NEED_NOTES }, { NEED_NOTES, "count" },
{ "SongJumps", NEED_NOTES }, { NEED_NOTES, "count" },
{ "SongHolds", NEED_NOTES }, { NEED_NOTES, "count" },
{ "SongRolls", NEED_NOTES }, { NEED_NOTES, "count" },
{ "SongMines", NEED_NOTES }, { NEED_NOTES, "count" },
{ "SongHands", NEED_NOTES }, { NEED_NOTES, "count" },
{ "MachineHighScore", NEED_NOTES }, { NEED_NOTES, "score" },
{ "MachineHighName", NEED_NOTES }, { NEED_NOTES, "name" },
{ "ProfileHighScore", NEED_NOTES|NEED_PROFILE }, { NEED_NOTES|NEED_PROFILE, "score" },
}; };
REGISTER_ACTOR_CLASS( PaneDisplay ) REGISTER_ACTOR_CLASS( PaneDisplay )
@@ -46,23 +61,28 @@ void PaneDisplay::Load( const RString &sMetricsGroup, PlayerNumber pn )
EMPTY_MACHINE_HIGH_SCORE_NAME.Load( sMetricsGroup, "EmptyMachineHighScoreName" ); EMPTY_MACHINE_HIGH_SCORE_NAME.Load( sMetricsGroup, "EmptyMachineHighScoreName" );
NOT_AVAILABLE.Load( sMetricsGroup, "NotAvailable" ); NOT_AVAILABLE.Load( sMetricsGroup, "NotAvailable" );
COUNT_FORMAT.Load( sMetricsGroup, "CountFormat" );
FOREACH_PaneContents( p ) FOREACH_ENUM( PaneCategory, pc )
{ {
m_textContents[p].LoadFromFont( THEME->GetPathF(sMetricsGroup,"text") ); LuaThreadVariable var( "PaneCategory", LuaReference::Create(pc) );
m_textContents[p].SetName( ssprintf("%sText", g_Contents[p].name) );
ActorUtil::LoadAllCommands( m_textContents[p], sMetricsGroup );
ActorUtil::SetXY( m_textContents[p], sMetricsGroup );
m_ContentsFrame.AddChild( &m_textContents[p] );
m_Labels[p].Load( THEME->GetPathG(sMetricsGroup,RString(g_Contents[p].name)+" label") ); RString sFontType = g_Contents[pc].sFontType;
m_Labels[p]->SetName( ssprintf("%sLabel", g_Contents[p].name) );
ActorUtil::LoadAllCommands( *m_Labels[p], sMetricsGroup );
ActorUtil::SetXY( m_Labels[p], sMetricsGroup );
m_ContentsFrame.AddChild( m_Labels[p] );
ActorUtil::LoadAllCommandsFromName( m_textContents[p], sMetricsGroup, g_Contents[p].name ); m_textContents[pc].LoadFromFont( THEME->GetPathF(sMetricsGroup,sFontType) );
m_textContents[pc].SetName( PaneCategoryToString(pc) + "Text" );
ActorUtil::LoadAllCommands( m_textContents[pc], sMetricsGroup );
ActorUtil::SetXY( m_textContents[pc], sMetricsGroup );
m_ContentsFrame.AddChild( &m_textContents[pc] );
m_Labels[pc].Load( THEME->GetPathG(sMetricsGroup,"label " + PaneCategoryToString(pc)) );
m_Labels[pc]->SetName( PaneCategoryToString(pc) + "Label" );
ActorUtil::LoadAllCommands( *m_Labels[pc], sMetricsGroup );
ActorUtil::SetXY( m_Labels[pc], sMetricsGroup );
m_ContentsFrame.AddChild( m_Labels[pc] );
ActorUtil::LoadAllCommandsFromName( m_textContents[pc], sMetricsGroup, PaneCategoryToString(pc) );
} }
m_ContentsFrame.SetXY( SHIFT_X(m_PlayerNumber), SHIFT_Y(m_PlayerNumber) ); m_ContentsFrame.SetXY( SHIFT_X(m_PlayerNumber), SHIFT_Y(m_PlayerNumber) );
@@ -89,7 +109,7 @@ void PaneDisplay::LoadFromNode( const XNode *pNode )
ActorFrame::LoadFromNode( pNode ); ActorFrame::LoadFromNode( pNode );
} }
void PaneDisplay::SetContent( PaneContents c ) void PaneDisplay::SetContent( PaneCategory c )
{ {
RString str = ""; // fill this in RString str = ""; // fill this in
float val = 0; // fill this in float val = 0; // fill this in
@@ -115,7 +135,7 @@ void PaneDisplay::SetContent( PaneContents c )
ProfileSlot slot = ProfileSlot_Machine; ProfileSlot slot = ProfileSlot_Machine;
switch( c ) switch( c )
{ {
case SONG_PROFILE_HIGH_SCORE: case PaneCategory_ProfileHighScore:
slot = (ProfileSlot) m_PlayerNumber; slot = (ProfileSlot) m_PlayerNumber;
} }
@@ -132,15 +152,15 @@ void PaneDisplay::SetContent( PaneContents c )
switch( c ) switch( c )
{ {
case SONG_NUM_STEPS: val = rv[RadarCategory_TapsAndHolds]; break; case PaneCategory_NumSteps: val = rv[RadarCategory_TapsAndHolds]; break;
case SONG_JUMPS: val = rv[RadarCategory_Jumps]; break; case PaneCategory_Jumps: val = rv[RadarCategory_Jumps]; break;
case SONG_HOLDS: val = rv[RadarCategory_Holds]; break; case PaneCategory_Holds: val = rv[RadarCategory_Holds]; break;
case SONG_ROLLS: val = rv[RadarCategory_Rolls]; break; case PaneCategory_Rolls: val = rv[RadarCategory_Rolls]; break;
case SONG_MINES: val = rv[RadarCategory_Mines]; break; case PaneCategory_Mines: val = rv[RadarCategory_Mines]; break;
case SONG_HANDS: val = rv[RadarCategory_Hands]; break; case PaneCategory_Hands: val = rv[RadarCategory_Hands]; break;
case SONG_PROFILE_HIGH_SCORE: case PaneCategory_ProfileHighScore:
case SONG_MACHINE_HIGH_NAME: /* set val for color */ case PaneCategory_MachineHighName: /* set val for color */
case SONG_MACHINE_HIGH_SCORE: case PaneCategory_MachineHighScore:
CHECKPOINT; CHECKPOINT;
val = pHSL->GetTopScore().GetPercentDP(); val = pHSL->GetTopScore().GetPercentDP();
break; break;
@@ -151,7 +171,7 @@ void PaneDisplay::SetContent( PaneContents c )
switch( c ) switch( c )
{ {
case SONG_MACHINE_HIGH_NAME: case PaneCategory_MachineHighName:
if( pHSL->vHighScores.empty() ) if( pHSL->vHighScores.empty() )
{ {
str = EMPTY_MACHINE_HIGH_SCORE_NAME; str = EMPTY_MACHINE_HIGH_SCORE_NAME;
@@ -163,21 +183,21 @@ void PaneDisplay::SetContent( PaneContents c )
str = "????"; str = "????";
} }
break; break;
case SONG_MACHINE_HIGH_SCORE: case PaneCategory_MachineHighScore:
case SONG_PROFILE_HIGH_SCORE: case PaneCategory_ProfileHighScore:
// Don't show or save machine high scores for edits loaded from a player profile. // Don't show or save machine high scores for edits loaded from a player profile.
if( bIsPlayerEdit ) if( bIsPlayerEdit )
str = NOT_AVAILABLE; str = NOT_AVAILABLE;
else else
str = PlayerStageStats::FormatPercentScore( val ); str = PlayerStageStats::FormatPercentScore( val );
break; break;
case SONG_NUM_STEPS: case PaneCategory_NumSteps:
case SONG_JUMPS: case PaneCategory_Jumps:
case SONG_HOLDS: case PaneCategory_Holds:
case SONG_ROLLS: case PaneCategory_Rolls:
case SONG_MINES: case PaneCategory_Mines:
case SONG_HANDS: case PaneCategory_Hands:
str = ssprintf( "%.0f", val ); str = ssprintf( COUNT_FORMAT.GetValue(), val );
} }
} }
@@ -201,7 +221,7 @@ done:
void PaneDisplay::SetFromGameState() void PaneDisplay::SetFromGameState()
{ {
/* Don't update text that doesn't apply to the current mode. It's still tweening off. */ /* Don't update text that doesn't apply to the current mode. It's still tweening off. */
FOREACH_PaneContents( i ) FOREACH_ENUM( PaneCategory, i )
SetContent( i ); SetContent( i );
} }
@@ -211,7 +231,7 @@ void PaneDisplay::SetFromGameState()
class LunaPaneDisplay: public Luna<PaneDisplay> class LunaPaneDisplay: public Luna<PaneDisplay>
{ {
public: public:
static int SetFromGameState( T* p, lua_State *L ) { p->SetFromGameState(); return 0; } static int SetFromGameState( T* pc, lua_State *L ) { pc->SetFromGameState(); return 0; }
LunaPaneDisplay() LunaPaneDisplay()
{ {