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

add animation metrics to ScreenRanking

Browse Source
This commit is contained in:
Chris Danford
2003-10-22 09:45:23 +00:00
parent df0cd8a46a
commit 4b51f89b6c
3 changed files with 318 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+75 -5
View File
@@ -2392,33 +2392,103 @@ NextScreen=ScreenUnlock
CategoryX=517 CategoryX=517
CategoryY=32 CategoryY=32
CategoryWidth=222 CategoryWidth=222
CategoryOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
CategoryOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
BannerX=517 BannerX=517
BannerY=44 BannerY=44
BannerWidth=220 BannerWidth=220
BannerHeight=58 BannerHeight=58
BannerOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
BannerOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
TypeX=520 TypeX=520
TypeY=60 TypeY=60
TypeOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
TypeOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
LineSpacingX=0 LineSpacingX=0
LineSpacingY=60 LineSpacingY=60
BulletsStartX=100 BulletsStartX=100
BulletsStartY=140 BulletsStartY=140
Bullets1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
Bullets2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
Bullets3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
Bullets4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
Bullets5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
Bullets1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
Bullets2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
Bullets3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
Bullets4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
Bullets5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
TextZoom=1.0 TextZoom=1.0
TextSongZoom=0.7 TextSongZoom=0.7
TextColor=0.8,0.8,1,1 TextColor=0.8,0.8,1,1
NamesStartX=180 NamesStartX=180
NamesStartY=140 NamesStartY=140
Names1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
Names2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
Names3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
Names4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
Names5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
Names1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
Names2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
Names3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
Names4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
Names5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
ScoresStartX=520 ScoresStartX=520
ScoresStartY=140 ScoresStartY=140
Scores1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
Scores2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
Scores3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
Scores4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
Scores5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
Scores1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
Scores2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
Scores3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
Scores4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
Scores5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
PointsStartX=380 PointsStartX=380
PointsStartY=140 PointsStartY=140
Points1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
Points2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
Points3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
Points4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
Points5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
Points1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
Points2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
Points3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
Points4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
Points5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
TimeStartX=560 TimeStartX=560
TimeStartY=140 TimeStartY=140
PercentStartX=210 Time1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
Time2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
Time3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
Time4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
Time5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
Time1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
Time2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
Time3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
Time4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
Time5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
PercentStartX=170
PercentStartY=140 PercentStartY=140
PercentColSpacingX=110 Percent1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
PercentColSpacingY=0 Percent2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
Percent3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
Percent4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
Percent5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
Percent1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
Percent2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
Percent3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
Percent4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
Percent5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
DifficultyStartX=170
DifficultyStartY=110
DifficultySpacingX=110
DifficultySpacingY=0
DifficultyOnCommand=addx,640;sleep,0.1;bounceend,1;addx,-640
DifficultyOffCommand=sleep,0.1;linear,0.5;diffusealpha,0
SecondsPerPage=5 SecondsPerPage=5
ShowCategories=0 ShowCategories=1
ShowAllSongs=1 ShowAllSongs=1
CoursesToShow=Courses/DDRMAX/NaokiStandard.crs,Courses/DDRMAX/ParanoiaBrothers.crs,Courses/Samples/PlayersBest1-4.crs CoursesToShow=Courses/DDRMAX/NaokiStandard.crs,Courses/DDRMAX/ParanoiaBrothers.crs,Courses/Samples/PlayersBest1-4.crs
NotesTypesToHide=dance-couple,dance-solo,pump-halfdouble NotesTypesToHide=dance-couple,dance-solo,pump-halfdouble
@@ -2426,7 +2496,7 @@ TextColor1=0.6,0.6,1,1
TextColor2=1,0.3,0.3,1 TextColor2=1,0.3,0.3,1
TextColor3=0.3,1,0.3,1 TextColor3=0.3,1,0.3,1
EmptyScoreName=STEP EmptyScoreName=STEP
ShowSongDifficulties=easy,medium,hard,challenge DifficultiesToShow=easy,medium,hard,challenge
# Not all game types have NotesTypesToHide set, so add a few dummy colors # Not all game types have NotesTypesToHide set, so add a few dummy colors
stepmania/src/ScreenRanking.cpp
+234 -156
View File
@@ -23,40 +23,63 @@
#include "ScoreKeeperMAX2.h" #include "ScoreKeeperMAX2.h"
#include "ScoreKeeper5th.h" #include "ScoreKeeper5th.h"
#define CATEGORY_X THEME->GetMetricF("ScreenRanking","CategoryX")
#define CATEGORY_Y THEME->GetMetricF("ScreenRanking","CategoryY") #define CATEGORY_X THEME->GetMetricF("ScreenRanking","CategoryX")
#define CATEGORY_WIDTH THEME->GetMetricF("ScreenRanking","CategoryWidth") #define CATEGORY_Y THEME->GetMetricF("ScreenRanking","CategoryY")
#define BANNER_X THEME->GetMetricF("ScreenRanking","BannerX") #define CATEGORY_WIDTH THEME->GetMetricF("ScreenRanking","CategoryWidth")
#define BANNER_Y THEME->GetMetricF("ScreenRanking","BannerY") #define CATEGORY_ON_COMMAND THEME->GetMetric ("ScreenRanking","CategoryOnCommand")
#define BANNER_WIDTH THEME->GetMetricF("ScreenRanking","BannerWidth") #define CATEGORY_OFF_COMMAND THEME->GetMetric ("ScreenRanking","CategoryOffCommand")
#define BANNER_HEIGHT THEME->GetMetricF("ScreenRanking","BannerHeight") #define BANNER_X THEME->GetMetricF("ScreenRanking","BannerX")
#define TYPE_X THEME->GetMetricF("ScreenRanking","TypeX") #define BANNER_Y THEME->GetMetricF("ScreenRanking","BannerY")
#define TYPE_Y THEME->GetMetricF("ScreenRanking","TypeY") #define BANNER_WIDTH THEME->GetMetricF("ScreenRanking","BannerWidth")
#define LINE_SPACING_X THEME->GetMetricF("ScreenRanking","LineSpacingX") #define BANNER_HEIGHT THEME->GetMetricF("ScreenRanking","BannerHeight")
#define LINE_SPACING_Y THEME->GetMetricF("ScreenRanking","LineSpacingY") #define BANNER_ON_COMMAND THEME->GetMetric ("ScreenRanking","BannerOnCommand")
#define BULLETS_START_X THEME->GetMetricF("ScreenRanking","BulletsStartX") #define BANNER_OFF_COMMAND THEME->GetMetric ("ScreenRanking","BannerOffCommand")
#define BULLETS_START_Y THEME->GetMetricF("ScreenRanking","BulletsStartY") #define TYPE_X THEME->GetMetricF("ScreenRanking","TypeX")
#define TEXT_ZOOM THEME->GetMetricF("ScreenRanking","TextZoom") #define TYPE_Y THEME->GetMetricF("ScreenRanking","TypeY")
#define TEXT_SONGZOOM THEME->GetMetricF("ScreenRanking","TextSongZoom") #define TYPE_ON_COMMAND THEME->GetMetric ("ScreenRanking","TypeOnCommand")
#define TEXT_COLOR( i ) THEME->GetMetricC("ScreenRanking",ssprintf("TextColor%d",i+1)) #define TYPE_OFF_COMMAND THEME->GetMetric ("ScreenRanking","TypeOffCommand")
#define NAMES_START_X THEME->GetMetricF("ScreenRanking","NamesStartX") #define LINE_SPACING_X THEME->GetMetricF("ScreenRanking","LineSpacingX")
#define NAMES_START_Y THEME->GetMetricF("ScreenRanking","NamesStartY") #define LINE_SPACING_Y THEME->GetMetricF("ScreenRanking","LineSpacingY")
#define SCORES_START_X THEME->GetMetricF("ScreenRanking","ScoresStartX") #define BULLETS_START_X THEME->GetMetricF("ScreenRanking","BulletsStartX")
#define SCORES_START_Y THEME->GetMetricF("ScreenRanking","ScoresStartY") #define BULLETS_START_Y THEME->GetMetricF("ScreenRanking","BulletsStartY")
#define POINTS_START_X THEME->GetMetricF("ScreenRanking","PointsStartX") #define BULLETS_ON_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Bullets%dOnCommand",l+1))
#define POINTS_START_Y THEME->GetMetricF("ScreenRanking","PointsStartY") #define BULLETS_OFF_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Bullets%dOffCommand",l+1))
#define TIME_START_X THEME->GetMetricF("ScreenRanking","TimeStartX") #define TEXT_ZOOM THEME->GetMetricF("ScreenRanking","TextZoom")
#define TIME_START_Y THEME->GetMetricF("ScreenRanking","TimeStartY") #define TEXT_SONGZOOM THEME->GetMetricF("ScreenRanking","TextSongZoom")
#define PERCENT_START_X THEME->GetMetricF("ScreenRanking","PercentStartX") #define TEXT_COLOR( i ) THEME->GetMetricC("ScreenRanking",ssprintf("TextColor%d",i+1))
#define PERCENT_START_Y THEME->GetMetricF("ScreenRanking","PercentStartY") #define NAMES_START_X THEME->GetMetricF("ScreenRanking","NamesStartX")
#define PERCENT_COL_SPACING_X THEME->GetMetricF("ScreenRanking","PercentColSpacingX") #define NAMES_START_Y THEME->GetMetricF("ScreenRanking","NamesStartY")
#define PERCENT_COL_SPACING_Y THEME->GetMetricF("ScreenRanking","PercentColSpacingY") #define NAMES_ON_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Names%dOnCommand",l+1))
#define SECONDS_PER_PAGE THEME->GetMetricF("ScreenRanking","SecondsPerPage") #define NAMES_OFF_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Names%dOffCommand",l+1))
#define SHOW_CATEGORIES THEME->GetMetricB("ScreenRanking","ShowCategories") #define SCORES_START_X THEME->GetMetricF("ScreenRanking","ScoresStartX")
#define SHOW_ALL_SONGS THEME->GetMetricB("ScreenRanking","ShowAllSongs") #define SCORES_START_Y THEME->GetMetricF("ScreenRanking","ScoresStartY")
#define NOTES_TYPES_TO_HIDE THEME->GetMetric ("ScreenRanking","NotesTypesToHide") #define SCORES_ON_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Scores%dOnCommand",l+1))
#define EMPTY_SCORE_NAME THEME->GetMetric ("ScreenRanking","EmptyScoreName") #define SCORES_OFF_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Scores%dOffCommand",l+1))
#define SHOW_SONG_DIFFICULTIES THEME->GetMetric ("ScreenRanking","ShowSongDifficulties") #define POINTS_START_X THEME->GetMetricF("ScreenRanking","PointsStartX")
#define POINTS_START_Y THEME->GetMetricF("ScreenRanking","PointsStartY")
#define POINTS_ON_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Points%dOnCommand",l+1))
#define POINTS_OFF_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Points%dOffCommand",l+1))
#define TIME_START_X THEME->GetMetricF("ScreenRanking","TimeStartX")
#define TIME_START_Y THEME->GetMetricF("ScreenRanking","TimeStartY")
#define TIME_ON_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Time%dOnCommand",l+1))
#define TIME_OFF_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Time%dOffCommand",l+1))
#define PERCENT_START_X THEME->GetMetricF("ScreenRanking","PercentStartX")
#define PERCENT_START_Y THEME->GetMetricF("ScreenRanking","PercentStartY")
#define PERCENT_ON_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Percent%dOnCommand",l+1))
#define PERCENT_OFF_COMMAND( l ) THEME->GetMetric ("ScreenRanking",ssprintf("Percent%dOffCommand",l+1))
#define DIFFICULTY_START_X THEME->GetMetricF("ScreenRanking","DifficultyStartX")
#define DIFFICULTY_START_Y THEME->GetMetricF("ScreenRanking","DifficultyStartY")
#define DIFFICULTY_SPACING_X THEME->GetMetricF("ScreenRanking","DifficultySpacingX")
#define DIFFICULTY_SPACING_Y THEME->GetMetricF("ScreenRanking","DifficultySpacingY")
#define DIFFICULTY_ON_COMMAND THEME->GetMetric ("ScreenRanking","DifficultyOnCommand")
#define DIFFICULTY_OFF_COMMAND THEME->GetMetric ("ScreenRanking","DifficultyOffCommand")
#define SECONDS_PER_PAGE THEME->GetMetricF("ScreenRanking","SecondsPerPage")
#define SHOW_CATEGORIES THEME->GetMetricB("ScreenRanking","ShowCategories")
#define SHOW_ALL_SONGS THEME->GetMetricB("ScreenRanking","ShowAllSongs")
#define NOTES_TYPES_TO_HIDE THEME->GetMetric ("ScreenRanking","NotesTypesToHide")
#define EMPTY_SCORE_NAME THEME->GetMetric ("ScreenRanking","EmptyScoreName")
#define DIFFICULTIES_TO_SHOW THEME->GetMetric ("ScreenRanking","DifficultiesToShow")
#define COURSES_TO_SHOW PREFSMAN->m_sCoursesToShowRanking #define COURSES_TO_SHOW PREFSMAN->m_sCoursesToShowRanking
@@ -66,24 +89,20 @@ const ScreenMessage SM_HidePage = (ScreenMessage)(SM_User+68);
ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ) ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
{ {
m_sprCategory.SetXY( CATEGORY_X, CATEGORY_Y );
this->AddChild( &m_sprCategory ); this->AddChild( &m_sprCategory );
m_banner.SetXY( BANNER_X, BANNER_Y );
this->AddChild( &m_banner ); this->AddChild( &m_banner );
m_textCategory.LoadFromFont( THEME->GetPathToF("ScreenRanking title") ); m_textCategory.LoadFromFont( THEME->GetPathToF("ScreenRanking title") );
m_textCategory.EnableShadow( false ); m_textCategory.EnableShadow( false );
m_textCategory.SetXY( CATEGORY_X, CATEGORY_Y );
this->AddChild( &m_textCategory ); this->AddChild( &m_textCategory );
m_sprType.SetXY( TYPE_X, TYPE_Y );
this->AddChild( &m_sprType ); this->AddChild( &m_sprType );
// make the list of difficulties to show // make the list of difficulties to show
vector<CString> sShowDiffs; vector<CString> sShowDiffs;
split( SHOW_SONG_DIFFICULTIES, ",", sShowDiffs, true ); split( DIFFICULTIES_TO_SHOW, ",", sShowDiffs, true );
for( vector<CString>::const_iterator iter = sShowDiffs.begin(); iter != sShowDiffs.end(); iter++ ) for( vector<CString>::const_iterator iter = sShowDiffs.begin(); iter != sShowDiffs.end(); iter++ )
{ {
@@ -91,44 +110,27 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
} }
for( int i=0; i<NUM_RANKING_LINES; i++ ) for( int l=0; l<NUM_RANKING_LINES; l++ )
{ {
m_sprBullets[i].Load( THEME->GetPathToG(("ScreenRanking bullets 1x5")) ); m_sprBullets[l].Load( THEME->GetPathToG("ScreenRanking bullets 1x5") );
m_sprBullets[i].SetXY( BULLETS_START_X+LINE_SPACING_X*i, BULLETS_START_Y+LINE_SPACING_Y*i ); m_sprBullets[l].SetDiffuseAlpha( 0 );
m_sprBullets[i].SetDiffuse( RageColor(1,1,1,0) ); this->AddChild( &m_sprBullets[l] );
m_sprBullets[i].StopAnimating();
m_sprBullets[i].SetState(i);
this->AddChild( &m_sprBullets[i] );
m_textNames[i].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") ); m_textNames[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
m_textNames[i].EnableShadow( false ); m_textNames[l].SetDiffuseAlpha( 0 );
m_textNames[i].SetXY( NAMES_START_X+LINE_SPACING_X*i, NAMES_START_Y+LINE_SPACING_Y*i ); this->AddChild( &m_textNames[l] );
m_textNames[i].SetZoom( TEXT_ZOOM );
m_textNames[i].SetHorizAlign( Actor::align_left );
this->AddChild( &m_textNames[i] );
m_textScores[i].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") ); m_textScores[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
m_textScores[i].EnableShadow( false ); m_textScores[l].SetDiffuseAlpha( 0 );
m_textScores[i].SetXY( SCORES_START_X+LINE_SPACING_X*i, SCORES_START_Y+LINE_SPACING_Y*i ); this->AddChild( &m_textScores[l] );
m_textScores[i].SetZoom( TEXT_ZOOM );
m_textScores[i].SetHorizAlign( Actor::align_right );
this->AddChild( &m_textScores[i] );
m_textPoints[i].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
m_textPoints[i].EnableShadow( false );
m_textPoints[i].SetXY( POINTS_START_X+LINE_SPACING_X*i, POINTS_START_Y+LINE_SPACING_Y*i );
m_textPoints[i].SetZoom( TEXT_ZOOM );
m_textPoints[i].SetHorizAlign( Actor::align_right );
this->AddChild( &m_textPoints[i] );
m_textTime[i].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
m_textTime[i].EnableShadow( false );
m_textTime[i].SetXY( TIME_START_X+LINE_SPACING_X*i, TIME_START_Y+LINE_SPACING_Y*i );
m_textTime[i].SetZoom( TEXT_ZOOM );
m_textTime[i].SetHorizAlign( Actor::align_right );
this->AddChild( &m_textTime[i] );
m_textPoints[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
m_textPoints[l].SetDiffuseAlpha( 0 );
this->AddChild( &m_textPoints[l] );
m_textTime[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
m_textTime[l].SetDiffuseAlpha( 0 );
this->AddChild( &m_textTime[l] );
if( PREFSMAN->m_sCoursesToShowRanking == "" ) if( PREFSMAN->m_sCoursesToShowRanking == "" )
PREFSMAN->m_sCoursesToShowRanking = THEME->GetMetric("ScreenRanking","CoursesToShow"); PREFSMAN->m_sCoursesToShowRanking = THEME->GetMetric("ScreenRanking","CoursesToShow");
@@ -138,39 +140,23 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
// init all the difficulty graphics // init all the difficulty graphics
for( int d=0; d<NUM_DIFFICULTIES; d++ ) for( int d=0; d<NUM_DIFFICULTIES; d++ )
{ {
Difficulty diff = (Difficulty)d;
bool bShowThis = find(m_vDiffsToShow.begin(), m_vDiffsToShow.end(), d) != m_vDiffsToShow.end();
m_sprDiffHeaders[d].Load( THEME->GetPathToG(("ScreenRanking difficulty 1x5")) ); m_sprDiffHeaders[d].Load( THEME->GetPathToG(("ScreenRanking difficulty 1x5")) );
m_sprDiffHeaders[d].SetDiffuse( RageColor(1,1,1,0) ); m_sprDiffHeaders[d].SetDiffuseAlpha( 0 );
m_sprDiffHeaders[d].StopAnimating(); if( bShowThis )
m_sprDiffHeaders[d].SetState(d); this->AddChild( &m_sprDiffHeaders[d] );
for( int i=0; i<NUM_RANKING_LINES; i++ ) for( int l=0; l<NUM_RANKING_LINES; l++ )
{ {
m_textPercent[i][d].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") ); m_textPercent[l][d].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
m_textPercent[i][d].EnableShadow( false ); m_textPercent[l][d].SetDiffuseAlpha( 0 );
m_textPercent[i][d].SetZoom( TEXT_SONGZOOM ); if( bShowThis )
this->AddChild( &m_textPercent[l][d] );
} }
} }
// enable the difficulty graphics that we care about
DiffVectorCIter pDiff = m_vDiffsToShow.begin();
for( int j=0; pDiff != m_vDiffsToShow.end() && j<NUM_DIFFICULTIES; pDiff++, j++ )
{
int d = (int)*pDiff;
m_sprDiffHeaders[d].SetX( PERCENT_START_X+PERCENT_COL_SPACING_X*j );
m_sprDiffHeaders[d].SetY( PERCENT_START_Y-LINE_SPACING_Y );
this->AddChild( &m_sprDiffHeaders[d] );
for( int i=0; i<NUM_RANKING_LINES; i++ )
{
m_textPercent[i][d].SetX( PERCENT_START_X+LINE_SPACING_X*i+PERCENT_COL_SPACING_X*j );
m_textPercent[i][d].SetY( PERCENT_START_Y+LINE_SPACING_Y*i+PERCENT_COL_SPACING_Y*j );
this->AddChild( &m_textPercent[i][d] );
}
}
vector<StepsType> aNotesTypesToShow; vector<StepsType> aNotesTypesToShow;
GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, aNotesTypesToShow ); GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, aNotesTypesToShow );
@@ -266,7 +252,6 @@ void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
SetPage( m_vPagesToShow[0] ); SetPage( m_vPagesToShow[0] );
m_vPagesToShow.erase( m_vPagesToShow.begin() ); m_vPagesToShow.erase( m_vPagesToShow.begin() );
this->PostScreenMessage( SM_HidePage, SECONDS_PER_PAGE-1 ); this->PostScreenMessage( SM_HidePage, SECONDS_PER_PAGE-1 );
TweenPageOnScreen();
} }
else else
{ {
@@ -284,30 +269,148 @@ void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
void ScreenRanking::SetPage( PageToShow pts ) void ScreenRanking::SetPage( PageToShow pts )
{ {
// Clear all text bool bShowNames, bShowScores, bShowPoints, bShowTime, bShowDifficulty, bShowPercent;
for( int l=0; l<NUM_RANKING_LINES; l++ ) switch( pts.type )
{ {
m_textScores[l].SetText( "" ); case PageToShow::TYPE_CATEGORY:
m_textPoints[l].SetText( "" ); bShowNames = true;
m_textTime[l].SetText( "" ); bShowScores = true;
for( DiffVectorCIter j=m_vDiffsToShow.begin(); j<m_vDiffsToShow.end(); j++ ) bShowPoints = false;
m_textPercent[l][*j].SetText( "" ); bShowTime = false;
m_banner.UnloadTexture(); bShowDifficulty = false;
} bShowPercent = false;
for( int d=0; d<NUM_DIFFICULTIES; d++ ) break;
{ case PageToShow::TYPE_COURSE:
m_sprDiffHeaders[d].SetDiffuseAlpha(0); bShowNames = true;
bShowScores = !pts.pCourse->IsOni();
bShowPoints = pts.pCourse->IsOni();
bShowTime = pts.pCourse->IsOni();
bShowDifficulty = false;
bShowPercent = false;
break;
case PageToShow::TYPE_SONG:
bShowNames = false;
bShowScores = false;
bShowPoints = false;
bShowTime = false;
bShowDifficulty = true;
bShowPercent = true;
break;
default:
ASSERT(0);
} }
int l, d;
// Reset
m_sprCategory.Reset();
m_sprCategory.SetXY( CATEGORY_X, CATEGORY_Y );
m_sprCategory.Command( CATEGORY_ON_COMMAND );
m_banner.Reset();
m_banner.SetXY( BANNER_X, BANNER_Y );
m_banner.Command( BANNER_ON_COMMAND );
m_textCategory.Reset();
m_textCategory.SetXY( CATEGORY_X, CATEGORY_Y );
m_textCategory.Command( CATEGORY_ON_COMMAND );
m_sprType.Reset();
m_sprType.SetXY( TYPE_X, TYPE_Y );
m_sprType.Command( TYPE_ON_COMMAND );
for( l=0; l<NUM_RANKING_LINES; l++ )
{
m_sprBullets[l].Reset();
m_sprBullets[l].SetXY( BULLETS_START_X+LINE_SPACING_X*l, BULLETS_START_Y+LINE_SPACING_Y*l );
m_sprBullets[l].StopAnimating();
m_sprBullets[l].SetState(l);
m_sprBullets[l].Command( BULLETS_ON_COMMAND(l) );
m_textNames[l].Reset();
m_textNames[l].SetXY( NAMES_START_X+LINE_SPACING_X*l, NAMES_START_Y+LINE_SPACING_Y*l );
m_textNames[l].SetZoom( TEXT_ZOOM );
m_textNames[l].SetDiffuseAlpha( 0 );
m_textNames[l].EnableShadow( false );
m_textNames[l].SetHorizAlign( Actor::align_left );
if( bShowNames )
{
m_textNames[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
m_textNames[l].Command( NAMES_ON_COMMAND(l) );
}
m_textScores[l].Reset();
m_textScores[l].SetXY( SCORES_START_X+LINE_SPACING_X*l, SCORES_START_Y+LINE_SPACING_Y*l );
m_textScores[l].SetZoom( TEXT_ZOOM );
m_textScores[l].SetDiffuseAlpha( 0 );
m_textScores[l].EnableShadow( false );
m_textScores[l].SetHorizAlign( Actor::align_right );
if( bShowScores )
{
m_textScores[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
m_textScores[l].Command( SCORES_ON_COMMAND(l) );
}
m_textPoints[l].Reset();
m_textPoints[l].SetXY( POINTS_START_X+LINE_SPACING_X*l, POINTS_START_Y+LINE_SPACING_Y*l );
m_textPoints[l].SetZoom( TEXT_ZOOM );
m_textPoints[l].SetDiffuseAlpha( 0 );
m_textPoints[l].EnableShadow( false );
m_textPoints[l].SetHorizAlign( Actor::align_right );
if( bShowPoints )
{
m_textPoints[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
m_textPoints[l].Command( POINTS_ON_COMMAND(l) );
}
m_textTime[l].Reset();
m_textTime[l].SetXY( TIME_START_X+LINE_SPACING_X*l, TIME_START_Y+LINE_SPACING_Y*l );
m_textTime[l].SetZoom( TEXT_ZOOM );
m_textTime[l].SetDiffuseAlpha( 0 );
m_textTime[l].EnableShadow( false );
m_textTime[l].SetHorizAlign( Actor::align_right );
if( bShowTime )
{
m_textTime[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
m_textTime[l].Command( TIME_ON_COMMAND(l) );
}
}
for( d=0; d<NUM_DIFFICULTIES; d++ )
{
m_sprDiffHeaders[d].Reset();
m_sprDiffHeaders[d].SetXY( DIFFICULTY_START_X+DIFFICULTY_SPACING_X*d, DIFFICULTY_START_Y+DIFFICULTY_SPACING_Y*d );
m_sprDiffHeaders[d].SetDiffuseAlpha( 0 );
m_sprDiffHeaders[d].StopAnimating();
m_sprDiffHeaders[d].SetState(d);
if( bShowDifficulty )
{
m_sprDiffHeaders[d].SetDiffuseAlpha( 1 );
m_sprDiffHeaders[d].Command( DIFFICULTY_ON_COMMAND );
}
for( int l=0; l<NUM_RANKING_LINES; l++ )
{
m_textPercent[l][d].Reset();
m_textPercent[l][d].SetZoom( TEXT_SONGZOOM );
m_textPercent[l][d].SetXY( PERCENT_START_X+DIFFICULTY_SPACING_X*d, PERCENT_START_Y+LINE_SPACING_Y*l );
m_textPercent[l][d].SetDiffuseAlpha( 0 );
m_textPercent[l][d].EnableShadow( false );
if( bShowPercent )
{
m_textPercent[l][d].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
m_textPercent[l][d].Command( PERCENT_ON_COMMAND(l) );
}
}
}
// init page
switch( pts.type ) switch( pts.type )
{ {
case PageToShow::TYPE_CATEGORY: case PageToShow::TYPE_CATEGORY:
{ {
m_textCategory.SetDiffuseAlpha(0);
m_sprCategory.SetDiffuse( RageColor(1,1,1,1) );
m_sprCategory.Load( THEME->GetPathToG(ssprintf("ScreenRanking category %c", 'A'+pts.category)) ); m_sprCategory.Load( THEME->GetPathToG(ssprintf("ScreenRanking category %c", 'A'+pts.category)) );
m_sprType.SetDiffuse( RageColor(1,1,1,1) );
m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) ); m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) );
for( int l=0; l<NUM_RANKING_LINES; l++ ) for( int l=0; l<NUM_RANKING_LINES; l++ )
{ {
SongManager::CategoryData::HighScore hs; SongManager::CategoryData::HighScore hs;
@@ -316,7 +419,6 @@ void ScreenRanking::SetPage( PageToShow pts )
if( hs.sName.empty() ) if( hs.sName.empty() )
hs.sName = EMPTY_SCORE_NAME; hs.sName = EMPTY_SCORE_NAME;
m_sprBullets[l].SetDiffuse( RageColor(1,1,1,1) );
m_textNames[l].SetText( hs.sName ); m_textNames[l].SetText( hs.sName );
m_textScores[l].SetText( ssprintf("%09i",hs.iScore) ); m_textScores[l].SetText( ssprintf("%09i",hs.iScore) );
m_textNames[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) ); m_textNames[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
@@ -360,7 +462,6 @@ void ScreenRanking::SetPage( PageToShow pts )
m_textCategory.SetDiffuseAlpha(1); m_textCategory.SetDiffuseAlpha(1);
} }
m_sprType.SetDiffuse( RageColor(1,1,1,1) );
m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) ); m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) );
for( int l=0; l<NUM_RANKING_LINES; l++ ) for( int l=0; l<NUM_RANKING_LINES; l++ )
{ {
@@ -370,7 +471,6 @@ void ScreenRanking::SetPage( PageToShow pts )
if( hs.sName.empty() ) if( hs.sName.empty() )
hs.sName = EMPTY_SCORE_NAME; hs.sName = EMPTY_SCORE_NAME;
m_sprBullets[l].SetDiffuse( RageColor(1,1,1,1) );
m_textNames[l].SetText( hs.sName ); m_textNames[l].SetText( hs.sName );
if( pts.pCourse->IsOni() ) if( pts.pCourse->IsOni() )
{ {
@@ -443,8 +543,6 @@ void ScreenRanking::SetPage( PageToShow pts )
for( int l=0; l<NUM_RANKING_LINES; l++ ) for( int l=0; l<NUM_RANKING_LINES; l++ )
{ {
m_sprBullets[l].SetDiffuse( RageColor(1,1,1,1) );
Steps::MemCardData::HighScore hs; Steps::MemCardData::HighScore hs;
if( l < (int)pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores.size() ) if( l < (int)pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores.size() )
hs = pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores[l]; hs = pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores[l];
@@ -462,45 +560,25 @@ void ScreenRanking::SetPage( PageToShow pts )
} }
} }
void ScreenRanking::TweenPageOnScreen()
{
m_sprCategory.FadeOn(0,"bounce right",0.5f);
m_banner.FadeOn(0,"bounce right",0.5f);
m_sprType.FadeOn(0.1f,"bounce right",0.5f);
m_textCategory.FadeOn(0,"bounce right",0.5f);
for( int l=0; l<NUM_RANKING_LINES; l++ )
{
m_sprBullets[l].FadeOn(0.2f+l*0.1f,"bounce right far",1.f);
m_textNames[l].FadeOn(0.2f+l*0.1f,"bounce right far",1.f);
m_textScores[l].FadeOn(0.2f+l*0.1f,"bounce right far",1.f);
m_textPoints[l].FadeOn(0.2f+l*0.1f,"bounce right far",1.f);
m_textTime[l].FadeOn(0.2f+l*0.1f,"bounce right far",1.f);
for( int d=0; d<NUM_DIFFICULTIES; d++ )
m_textPercent[l][d].FadeOn(0.2f+l*0.1f,"bounce right far",1.f);
}
for( int d=0; d<NUM_DIFFICULTIES; d++ )
m_sprDiffHeaders[d].FadeOn(0,"bounce right far",1.f);
}
void ScreenRanking::TweenPageOffScreen() void ScreenRanking::TweenPageOffScreen()
{ {
m_sprCategory.FadeOff(0,"fade",0.25f); int l, d;
m_banner.FadeOff(0,"fade",0.25f);
m_sprType.FadeOff(0.1f,"fade",0.25f);
m_textCategory.FadeOff(0.1f,"fade",0.25f);
for( int l=0; l<NUM_RANKING_LINES; l++ ) m_sprCategory.Command( CATEGORY_OFF_COMMAND );
m_banner.Command( BANNER_OFF_COMMAND );
m_sprType.Command( TYPE_OFF_COMMAND );
m_textCategory.Command( CATEGORY_OFF_COMMAND );
for( l=0; l<NUM_RANKING_LINES; l++ )
{ {
m_sprBullets[l].FadeOff(0.2f+l*0.1f,"fade",0.25f); m_sprBullets[l].Command( BULLETS_OFF_COMMAND(l) );
m_textNames[l].FadeOff(0.2f+l*0.1f,"fade",0.25f); m_textNames[l].Command( NAMES_OFF_COMMAND(l) );
m_textScores[l].FadeOff(0.2f+l*0.1f,"fade",0.25f); m_textScores[l].Command( SCORES_OFF_COMMAND(l) );
m_textPoints[l].FadeOff(0.2f+l*0.1f,"fade",0.25f); m_textPoints[l].Command( POINTS_OFF_COMMAND(l) );
m_textTime[l].FadeOff(0.2f+l*0.1f,"fade",0.25f); m_textTime[l].Command( TIME_OFF_COMMAND(l) );
for( int d=0; d<NUM_DIFFICULTIES; d++ ) for( d=0; d<NUM_DIFFICULTIES; d++ )
m_textPercent[l][d].FadeOff(0.2f+l*0.1f,"fade",0.25f); m_textPercent[l][d].Command( PERCENT_OFF_COMMAND(l) );
} }
for( int d=0; d<NUM_DIFFICULTIES; d++ ) for( d=0; d<NUM_DIFFICULTIES; d++ )
m_sprDiffHeaders[d].FadeOff(0,"fade",0.25f); m_sprDiffHeaders[d].Command( DIFFICULTY_OFF_COMMAND );
} }
stepmania/src/StepMania.dsp
+8 -8
View File
@@ -65,8 +65,8 @@ IntDir=.\../Debug6
TargetDir=\stepmania\stepmania TargetDir=\stepmania\stepmania
TargetName=StepMania-debug TargetName=StepMania-debug
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
/Fo$(IntDir)\ /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
# End Special Build Tool # End Special Build Tool
@@ -103,8 +103,8 @@ IntDir=.\Debug
TargetDir=\stepmania\stepmania TargetDir=\stepmania\stepmania
TargetName=default TargetName=default
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
/Fo$(IntDir)\ /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool # End Special Build Tool
@@ -144,8 +144,8 @@ IntDir=.\../Release6
TargetDir=\stepmania\stepmania TargetDir=\stepmania\stepmania
TargetName=StepMania TargetName=StepMania
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
/Fo$(IntDir)\ /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
# End Special Build Tool # End Special Build Tool
@@ -186,8 +186,8 @@ IntDir=.\StepMania___Xbox_Release
TargetDir=\stepmania\stepmania TargetDir=\stepmania\stepmania
TargetName=default TargetName=default
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
/Fo$(IntDir)\ /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool # End Special Build Tool