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

working on ScreenHighScores

Browse Source
This commit is contained in:
Chris Danford
2003-01-20 05:08:35 +00:00
parent d8d9fb2c5b
commit d1c96dcf7f
15 changed files with 92 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+14
View File
@@ -753,6 +753,20 @@ NextScreen=ScreenHighScores
[ScreenHighScores]
SecondsToShow=30
NextScreen=ScreenMemoryCard
CategoryX=400
CategoryY=40
LineSpacingX=0
LineSpacingY=60
BulletsStartX=60
BulletsStartY=140
NamesStartX=250
NamesStartY=140
NamesZoom=1.2
NamesColor=0.8,0.8,1,1
ScoresStartX=450
ScoresStartY=140
ScoresZoom=1.2
ScoresColor=0.8,0.8,1,1
[ScreenMemoryCard]
SecondsToShow=5
stepmania/src/ActorFrame.cpp
+2 -2
View File
@@ -19,7 +19,7 @@ void ActorFrame::AddChild( Actor* pActor )
m_SubActors.push_back( pActor );
}
void ActorFrame::MoveToBack( Actor* pActor )
void ActorFrame::MoveToTail( Actor* pActor )
{
vector<Actor*>::iterator iter = find( m_SubActors.begin(), m_SubActors.end(), pActor );
if( iter == m_SubActors.end() ) // didn't find
@@ -32,7 +32,7 @@ void ActorFrame::MoveToBack( Actor* pActor )
m_SubActors.push_back( pActor );
}
void ActorFrame::MoveToFront( Actor* pActor )
void ActorFrame::MoveToHead( Actor* pActor )
{
vector<Actor*>::iterator iter = find( m_SubActors.begin(), m_SubActors.end(), pActor );
if( iter == m_SubActors.end() ) // didn't find
stepmania/src/ActorFrame.h
+2 -2
View File
@@ -17,8 +17,8 @@ class ActorFrame : public Actor
{
public:
virtual void AddChild( Actor* pActor );
virtual void MoveToBack( Actor* pActor );
virtual void MoveToFront( Actor* pActor );
virtual void MoveToTail( Actor* pActor );
virtual void MoveToHead( Actor* pActor );
virtual ~ActorFrame() { }
virtual void Update( float fDeltaTime );
stepmania/src/FontCharAliases.cpp
+1 -1
View File
@@ -319,6 +319,7 @@ static void InitCharAliases()
CharAliases["uparrow"] = 0x2191; /* ↑ */
CharAliases["rightarrow"] = 0x2192; /* → */
CharAliases["downarrow"] = 0x2193; /* ↓ */
CharAliases["doublezeta"] = 0xE009; /* ↓ */
/* These are internal-use glyphs; they don't have real Unicode codepoints. */
CharAliases["up"] = 0xE000;
@@ -330,7 +331,6 @@ static void InitCharAliases()
CharAliases["menuleft"] = 0xE006;
CharAliases["menuright"] = 0xE007;
CharAliases["start"] = 0xE008;
CharAliases["zz"] = 0xE009;
for(aliasmap::const_iterator i = CharAliases.begin(); i != CharAliases.end(); ++i)
{
stepmania/src/ScreenAlbums.h
+1 -1
View File
@@ -15,7 +15,7 @@
class ScreenAlbums : public ScreenAttract
{
public:
ScreenAlbums() : ScreenAttract("Albums","albums") { };
ScreenAlbums() : ScreenAttract("ScreenAlbums","albums") { };
};
stepmania/src/ScreenAttract.cpp
+2 -2
View File
@@ -27,8 +27,8 @@
#include "RageSoundManager.h"
#define SECONDS_TO_SHOW THEME->GetMetricF("Screen"+m_sMetricName,"SecondsToShow")
#define NEXT_SCREEN THEME->GetMetric("Screen"+m_sMetricName,"NextScreen")
#define SECONDS_TO_SHOW THEME->GetMetricF(m_sMetricName,"SecondsToShow")
#define NEXT_SCREEN THEME->GetMetric(m_sMetricName,"NextScreen")
const ScreenMessage SM_BeginFadingOut = ScreenMessage(SM_User+2);
const ScreenMessage SM_GoToNextScreen = ScreenMessage(SM_User+3);
stepmania/src/ScreenCompany.h
+1 -1
View File
@@ -15,7 +15,7 @@
class ScreenCompany : public ScreenAttract
{
public:
ScreenCompany() : ScreenAttract("Company","company") { };
ScreenCompany() : ScreenAttract("ScreenCompany","company") { };
};
stepmania/src/ScreenHighScores.cpp
+54
View File
@@ -10,3 +10,57 @@
-----------------------------------------------------------------------------
*/
#include "ScreenHighScores.h"
#include "ThemeManager.h"
#define CATEGORY_X THEME->GetMetricF("ScreenHighScores","CategoryX")
#define CATEGORY_Y THEME->GetMetricF("ScreenHighScores","CategoryY")
#define LINE_SPACING_X THEME->GetMetricF("ScreenHighScores","LineSpacingX")
#define LINE_SPACING_Y THEME->GetMetricF("ScreenHighScores","LineSpacingY")
#define BULLETS_START_X THEME->GetMetricF("ScreenHighScores","BulletsStartX")
#define BULLETS_START_Y THEME->GetMetricF("ScreenHighScores","BulletsStartY")
#define NAMES_START_X THEME->GetMetricF("ScreenHighScores","NamesStartX")
#define NAMES_START_Y THEME->GetMetricF("ScreenHighScores","NamesStartY")
#define NAMES_ZOOM THEME->GetMetricF("ScreenHighScores","NamesZoom")
#define NAMES_COLOR THEME->GetMetricC("ScreenHighScores","NamesColor")
#define SCORES_START_X THEME->GetMetricF("ScreenHighScores","ScoresStartX")
#define SCORES_START_Y THEME->GetMetricF("ScreenHighScores","ScoresStartY")
#define SCORES_ZOOM THEME->GetMetricF("ScreenHighScores","ScoresZoom")
#define SCORES_COLOR THEME->GetMetricC("ScreenHighScores","ScoresColor")
ScreenHighScores::ScreenHighScores() : ScreenAttract("ScreenHighScores","high scores")
{
m_textCategory.LoadFromFont( THEME->GetPathTo("Fonts","Header2") );
m_textCategory.TurnShadowOff();
m_textCategory.SetXY( CATEGORY_X, CATEGORY_Y );
m_textCategory.SetText( "" );
for( int i=0; i<NUM_HIGH_SCORES; i++ )
{
m_sprBullets[i].Load( THEME->GetPathTo("Graphics",("high scores bullets 1x5")) );
m_sprBullets[i].SetXY( BULLETS_START_X+LINE_SPACING_X*i, BULLETS_START_Y+LINE_SPACING_Y*i );
m_sprBullets[i].StopAnimating();
m_sprBullets[i].SetState(i);
this->AddChild( &m_sprBullets[i] );
m_textNames[i].LoadFromFont( THEME->GetPathTo("Fonts","high scores") );
m_textNames[i].TurnShadowOff();
m_textNames[i].SetXY( NAMES_START_X+LINE_SPACING_X*i, NAMES_START_Y+LINE_SPACING_Y*i );
m_textNames[i].SetText( ssprintf("NAME %d",i) );
m_textNames[i].SetZoom( NAMES_ZOOM );
m_textNames[i].SetDiffuse( NAMES_COLOR );
this->AddChild( &m_textNames[i] );
m_textScores[i].LoadFromFont( THEME->GetPathTo("Fonts","high scores") );
m_textScores[i].TurnShadowOff();
m_textScores[i].SetXY( SCORES_START_X+LINE_SPACING_X*i, SCORES_START_Y+LINE_SPACING_Y*i );
m_textScores[i].SetText( ssprintf("SCORE %d",i) );
m_textScores[i].SetZoom( SCORES_ZOOM );
m_textScores[i].SetDiffuse( SCORES_COLOR );
this->AddChild( &m_textScores[i] );
}
this->MoveToTail( &m_Fade );
}
stepmania/src/ScreenHighScores.h
+8 -1
View File
@@ -11,11 +11,18 @@
#include "ScreenAttract.h"
#define NUM_HIGH_SCORES 5
class ScreenHighScores : public ScreenAttract
{
public:
ScreenHighScores() : ScreenAttract("HighScores","high scores") { };
ScreenHighScores();
protected:
BitmapText m_textCategory;
Sprite m_sprBullets[NUM_HIGH_SCORES];
BitmapText m_textNames[NUM_HIGH_SCORES];
BitmapText m_textScores[NUM_HIGH_SCORES];
};
stepmania/src/ScreenHowToPlay.h
+1 -1
View File
@@ -15,7 +15,7 @@
class ScreenHowToPlay : public ScreenAttract
{
public:
ScreenHowToPlay() : ScreenAttract("HowToPlay","how to play") {};
ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay","how to play") {};
};
stepmania/src/ScreenLogo.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#define SONGS_Y THEME->GetMetricF("ScreenLogo","SongsY")
ScreenLogo::ScreenLogo() : ScreenAttract("Logo","logo")
ScreenLogo::ScreenLogo() : ScreenAttract("ScreenLogo","logo")
{
m_sprLogo.Load( THEME->GetPathTo("Graphics",ssprintf("logo %s",GAMESTATE->GetCurrentGameDef()->m_szName)) );
m_sprLogo.SetXY( LOGO_X, LOGO_Y );
@@ -56,5 +56,5 @@ ScreenLogo::ScreenLogo() : ScreenAttract("Logo","logo")
m_textSongs.SetShadowLength( 2 );
this->AddChild( &m_textSongs );
this->MoveToBack( &(ScreenAttract::m_Fade) ); // put it in the back so it covers up the stuff we just added
this->MoveToTail( &(ScreenAttract::m_Fade) ); // put it in the back so it covers up the stuff we just added
}
stepmania/src/ScreenMemoryCard.h
+1 -1
View File
@@ -15,7 +15,7 @@
class ScreenMemoryCard : public ScreenAttract
{
public:
ScreenMemoryCard() : ScreenAttract("MemoryCard","memory card") { };
ScreenMemoryCard() : ScreenAttract("ScreenMemoryCard","memory card") { };
};
stepmania/src/ScreenTitleMenu.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ ScreenTitleMenu::ScreenTitleMenu()
this->SendScreenMessage( SM_PlayComment, SECONDS_BETWEEN_COMMENTS);
this->MoveToBack( &(ScreenAttract::m_Fade) ); // put it in the back so it covers up the stuff we just added
this->MoveToTail( &(ScreenAttract::m_Fade) ); // put it in the back so it covers up the stuff we just added
}
ScreenTitleMenu::~ScreenTitleMenu()
stepmania/src/ScreenUnlock.h
+1 -1
View File
@@ -15,7 +15,7 @@
class ScreenUnlock : public ScreenAttract
{
public:
ScreenUnlock() : ScreenAttract("Unlock","unlock") { };
ScreenUnlock() : ScreenAttract("ScreenUnlock","unlock") { };
};
stepmania/src/ScreenWarning.h
+1 -1
View File
@@ -15,7 +15,7 @@
class ScreenWarning : public ScreenAttract
{
public:
ScreenWarning() : ScreenAttract("Warning","warning") {};
ScreenWarning() : ScreenAttract("ScreenWarning","warning") {};
};