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

More Scrolling Banner Changes....

Browse Source 
Now you can have songs automatically play AND have a confirm on them.
Can also change rotation of the banner / whole list via metrics. (allowing for vertical scrolling lists) or more importantly, a 4th mix interface ;)
This commit is contained in:
Andrew Livy
2003-06-09 01:13:25 +00:00
parent b5d733398d
commit dd8d872d28
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+3 -1
View File
@@ -644,6 +644,8 @@ PumpDifficultyX=320
PumpDifficultyY=280 PumpDifficultyY=280
ScrollingListX=320 ScrollingListX=320
ScrollingListY=240 ScrollingListY=240
ScrollingListRotation=0
BannerRotation=0
MeterP1X=999 // by default hide these elements MeterP1X=999 // by default hide these elements
MeterP1Y=999 MeterP1Y=999
MeterP2X=999 MeterP2X=999
@@ -676,7 +678,7 @@ DifficultyRatingX=999
DifficultyRatingY=999 DifficultyRatingY=999
DifficultyRatingOrientation=0 DifficultyRatingOrientation=0
DifficultyRatingSpacing=40.0 DifficultyRatingSpacing=40.0
PreviewMusicMode=0 // 0 = play music as you select, 1 = no music plays, select once and preview music plays, select again for confirm, 2 = no music plays at all. PreviewMusicMode=0 // 0 = play music as you select, 1 = no music plays, select once and preview music plays, select again for confirm, 2 = no music plays at all, 3 = play music as select, press twice to confirm
[ScreenSelectCourse] [ScreenSelectCourse]
ExplanationX=132 ExplanationX=132
stepmania/src/MusicBannerWheel.cpp
+2 -2
View File
@@ -179,7 +179,7 @@ void MusicBannerWheel::InsertNewBanner(int direction)
{ {
ASSERT(0); // we should be going in some sort of direction. ASSERT(0); // we should be going in some sort of direction.
} }
if(PREVIEWMUSICMODE == 0) if(PREVIEWMUSICMODE == 0 || PREVIEWMUSICMODE == 3)
PlayMusicSample(); PlayMusicSample();
} }
@@ -270,7 +270,7 @@ void MusicBannerWheel::LoadSongData()
m_ScrollingList.Load( asGraphicPaths ); m_ScrollingList.Load( asGraphicPaths );
if(SingleLoad == 2) if(SingleLoad == 2)
SingleLoad = 1; SingleLoad = 1;
if(PREVIEWMUSICMODE == 0) if(PREVIEWMUSICMODE == 0 || PREVIEWMUSICMODE == 3)
PlayMusicSample(); PlayMusicSample();
} }
stepmania/src/ScreenEz2SelectMusic.cpp
+15 -9
View File
@@ -33,6 +33,7 @@
#define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX") #define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX")
#define SCROLLING_LIST_Y THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListY") #define SCROLLING_LIST_Y THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListY")
#define SCROLLING_LIST_ROT THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListRotation")
#define PUMP_DIFF_X THEME->GetMetricF("ScreenEz2SelectMusic","PumpDifficultyX") #define PUMP_DIFF_X THEME->GetMetricF("ScreenEz2SelectMusic","PumpDifficultyX")
#define PUMP_DIFF_Y THEME->GetMetricF("ScreenEz2SelectMusic","PumpDifficultyY") #define PUMP_DIFF_Y THEME->GetMetricF("ScreenEz2SelectMusic","PumpDifficultyY")
#define HELP_TEXT THEME->GetMetric("ScreenSelectMusic","HelpText") #define HELP_TEXT THEME->GetMetric("ScreenSelectMusic","HelpText")
@@ -75,9 +76,10 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
i_ErrorDetected=0; i_ErrorDetected=0;
CodeDetector::RefreshCacheItems(); CodeDetector::RefreshCacheItems();
if(PREVIEWMUSICMODE == 1) if(PREVIEWMUSICMODE == 1 || PREVIEWMUSICMODE == 3)
{ {
SOUNDMAN->StopMusic(); if(PREVIEWMUSICMODE == 1)
SOUNDMAN->StopMusic();
iConfirmSelection = 0; iConfirmSelection = 0;
} }
@@ -95,6 +97,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
m_MusicBannerWheel.SetX(SCROLLING_LIST_X); m_MusicBannerWheel.SetX(SCROLLING_LIST_X);
m_MusicBannerWheel.SetY(SCROLLING_LIST_Y); m_MusicBannerWheel.SetY(SCROLLING_LIST_Y);
m_MusicBannerWheel.SetRotationZ(SCROLLING_LIST_ROT);
if(m_MusicBannerWheel.CheckSongsExist() != 0) if(m_MusicBannerWheel.CheckSongsExist() != 0)
{ {
@@ -414,7 +417,7 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
m_soundSelect.Play(); m_soundSelect.Play();
if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 0) if((PREVIEWMUSICMODE == 1 || PREVIEWMUSICMODE == 3) && iConfirmSelection == 0)
{ {
iConfirmSelection = 1; iConfirmSelection = 1;
m_MusicBannerWheel.StartBouncing(); m_MusicBannerWheel.StartBouncing();
@@ -482,11 +485,12 @@ void ScreenEz2SelectMusic::EasierDifficulty( PlayerNumber pn )
if( m_iSelection[pn] == 0 ) if( m_iSelection[pn] == 0 )
return; return;
if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1) if((PREVIEWMUSICMODE == 1 || PREVIEWMUSICMODE == 3) && iConfirmSelection == 1)
{ {
iConfirmSelection = 0; iConfirmSelection = 0;
m_MusicBannerWheel.StopBouncing(); m_MusicBannerWheel.StopBouncing();
SOUNDMAN->StopMusic(); if(PREVIEWMUSICMODE == 1)
SOUNDMAN->StopMusic();
} }
m_iSelection[pn]--; m_iSelection[pn]--;
@@ -525,12 +529,13 @@ void ScreenEz2SelectMusic::HarderDifficulty( PlayerNumber pn )
return; return;
} }
if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1) if((PREVIEWMUSICMODE == 1 || PREVIEWMUSICMODE == 3) && iConfirmSelection == 1)
{ {
iConfirmSelection = 0; iConfirmSelection = 0;
m_MusicBannerWheel.StopBouncing(); m_MusicBannerWheel.StopBouncing();
SOUNDMAN->StopMusic(); if(PREVIEWMUSICMODE == 1)
SOUNDMAN->StopMusic();
} }
m_iSelection[pn]++; m_iSelection[pn]++;
@@ -571,10 +576,11 @@ void ScreenEz2SelectMusic::MusicChanged()
OFF_COMMAND( m_sprBalloon ); OFF_COMMAND( m_sprBalloon );
} }
if(PREVIEWMUSICMODE == 1 && iConfirmSelection == 1) if((PREVIEWMUSICMODE == 1 || PREVIEWMUSICMODE == 3) && iConfirmSelection == 1)
{ {
iConfirmSelection = 0; iConfirmSelection = 0;
SOUNDMAN->StopMusic(); if(PREVIEWMUSICMODE == 1)
SOUNDMAN->StopMusic();
} }
int pn; int pn;
stepmania/src/ScrollingList.cpp
+5
View File
@@ -37,6 +37,8 @@ enum BANNER_PREFS_TYPES
#define ZOOM_OFFSET THEME->GetMetricF("ScreenEz2SelectMusic","BannerZoomOffset") #define ZOOM_OFFSET THEME->GetMetricF("ScreenEz2SelectMusic","BannerZoomOffset")
#define FADE_OFFSET THEME->GetMetricF("ScreenEz2SelectMusic","BannerFadeOffset") #define FADE_OFFSET THEME->GetMetricF("ScreenEz2SelectMusic","BannerFadeOffset")
#define BANNER_ROTATION THEME->GetMetricF("ScreenEz2SelectMusic","BannerRotation")
#define SPRITE_TYPE_SPRITE 0 #define SPRITE_TYPE_SPRITE 0
#define SPRITE_TYPE_CROPPEDSPRITE 1 #define SPRITE_TYPE_CROPPEDSPRITE 1
@@ -491,6 +493,9 @@ void ScrollingList::DrawPrimitives()
m_apCSprites[iIndexToDraw2]->SetX( (+i+m_fSelectionLag) * m_iSpacing ); m_apCSprites[iIndexToDraw2]->SetX( (+i+m_fSelectionLag) * m_iSpacing );
m_apCSprites[iIndexToDraw1]->SetZ( (m_iNumVisible)/2 - i); m_apCSprites[iIndexToDraw1]->SetZ( (m_iNumVisible)/2 - i);
m_apCSprites[iIndexToDraw2]->SetZ( (m_iNumVisible)/2 - i); m_apCSprites[iIndexToDraw2]->SetZ( (m_iNumVisible)/2 - i);
m_apCSprites[iIndexToDraw1]->SetRotationZ(BANNER_ROTATION);
m_apCSprites[iIndexToDraw2]->SetRotationZ(BANNER_ROTATION);
m_sprBannerMask.SetRotationZ(BANNER_ROTATION);
if( i==0 ) // so we don't draw 0 twice if( i==0 ) // so we don't draw 0 twice
{ {
if(!m_iBouncingState) if(!m_iBouncingState)