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

Added Elements to Ez2MusicSelect so that it looks similar to pump, added the "Guide" Graphic to Pump's Select Mode, Returning from Gameplay now goes to the correct SongSelect Screen based upon theme metrics.

Browse Source
This commit is contained in:
Andrew Livy
2002-12-20 19:05:54 +00:00
parent a4588f6c11
commit aa53eab253
12 changed files with 255 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+12 -25
View File
@@ -92,6 +92,8 @@ JoinMessageP1X=120
JoinMessageP1Y=336
JoinMessageP2X=520
JoinMessageP2Y=336
GuideX=320
GuideY=374
HelpText=Press $ on the pad to join. Press ! " to change styles, then press START
TimerSeconds=40
NextScreen=ScreenSelectGroup
@@ -228,31 +230,14 @@ ScoreConnectedToMusicWheel=1
SampleMusicDelay=0.25
[ScreenEz2SelectMusic]
BannerX=320 // central banner
BannerY=240 // central banner
BannerWidth=200
BannerHeight=200
ScoreFrameP1X=80
ScoreFrameP1Y=60
ScoreFrameP2X=560
ScoreFrameP2Y=60
ScoreP1X=80
ScoreP1Y=60
ScoreP2X=560
ScoreP2Y=60
MeterFrameP1X=82
MeterFrameP1Y=432
MeterFrameP2X=238
MeterFrameP2Y=432
MeterP1X=88
MeterP1Y=432
MeterP2X=228
MeterP2Y=432
WheelX=999 // hide
WheelY=999 // hide
HelpText=! or " change music Hold ! and " then press START to change sort::## easier difficulty $$ harder difficulty::#$#$ to change sort
TimerSeconds=60
ScoreConnectedToMusicWheel=1
PumpDifficultyX=320
PumpDifficultyY=280
ScrollingListX=320
ScrollingListY=240
MeterP1X=999 // by default hide these elements
MeterP1Y=999
MeterP2X=999
MeterP2Y=999
[ScreenSelectCourse]
ExplanationX=132
@@ -283,6 +268,7 @@ TimerSeconds=60
StageType=0 // 0 for MAX, 1 for Pump, 2 for EZ2
[ScreenGameplay]
SongSelectScreen=ScreenSelectMusic
BPMX=999 // don't show by default
BPMY=999
BPMZoom=0.0
@@ -352,6 +338,7 @@ DemonstrationSeconds=30
TickEarlySeconds=0.058
[ScreenEvaluation]
SongSelectScreen=ScreenSelectMusic
BannerX=320
BannerY=100
StageX=320
stepmania/src/MusicBannerWheel.cpp
+26 -1
View File
@@ -17,6 +17,7 @@
#include "SongManager.h"
#include "ThemeManager.h"
#include "RageMusic.h"
#include "StyleDef.h"
#define BANNERSPACING 200
#define MAXSONGSINBUFFER 5
@@ -34,6 +35,24 @@ MusicBannerWheel::MusicBannerWheel()
arraySongs = SONGMAN->m_pSongs;
// If there is no currently selected song, select one.
if( GAMESTATE->m_pCurSong == NULL )
{
currentPos=0;
}
else // theres a song already selected (i.e. they came back from gameplay)...
{
// find our song and change the currentPos to wherever it may be.
for(int i=0; i<arraySongs.size(); i++)
{
if( GAMESTATE->m_pCurSong == arraySongs[i])
{
currentPos=i;
i=(arraySongs.size()-1); // get us out of the loop by moving i ahead to the end
}
}
}
LoadSongData();
m_debugtext.LoadFromFont( THEME->GetPathTo("Fonts","small titles") );
@@ -123,7 +142,6 @@ void MusicBannerWheel::BannersLeft()
else
currentPos--;
if(scrlistPos==0)
scrlistPos = MAXSONGSINBUFFER-1;
else
@@ -133,6 +151,7 @@ void MusicBannerWheel::BannersLeft()
LoadSongData();
m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));
m_ScrollingList.Left();
ChangeNotes();
}
void MusicBannerWheel::BannersRight()
@@ -151,8 +170,14 @@ void MusicBannerWheel::BannersRight()
LoadSongData();
m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));
m_ScrollingList.Right();
ChangeNotes();
}
void MusicBannerWheel::ChangeNotes()
{
}
MusicBannerWheel::~MusicBannerWheel()
{
}
stepmania/src/MusicBannerWheel.h
+5
View File
@@ -17,6 +17,10 @@
#include "ScrollingList.h"
#include "SongManager.h"
#include "BitmapText.h"
#include "SongManager.h"
#include "PlayerOptions.h"
#include "SongOptions.h"
class MusicBannerWheel : public ActorFrame
{
@@ -30,6 +34,7 @@ private:
void SetNewPos(int NewPos);
void PlayMusicSample();
void LoadSongData();
void ChangeNotes();
BitmapText m_debugtext;
stepmania/src/ScreenEvaluation.cpp
+3 -1
View File
@@ -25,6 +25,7 @@
#include "ThemeManager.h"
#define SONGSEL_SCREEN THEME->GetMetric("ScreenEvaluation","SongSelectScreen")
#define BANNER_X THEME->GetMetricF("ScreenEvaluation","BannerX")
#define BANNER_Y THEME->GetMetricF("ScreenEvaluation","BannerY")
#define STAGE_X THEME->GetMetricF("ScreenEvaluation","StageX")
@@ -818,7 +819,8 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
MenuStart( PLAYER_INVALID );
break;
case SM_GoToSelectMusic:
SCREENMAN->SetNewScreen( "ScreenSelectMusic" );
// SCREENMAN->SetNewScreen( "ScreenSelectMusic" );
SCREENMAN->SetNewScreen( SONGSEL_SCREEN );
break;
case SM_GoToSelectCourse:
SCREENMAN->SetNewScreen( "ScreenSelectCourse" );
stepmania/src/ScreenEz2SelectMusic.cpp
+176 -50
View File
@@ -1,14 +1,13 @@
#include "stdafx.h"
/*
-----------------------------------------------------------------------------
File: ScreenSandbox.h
File: ScreenEz2SelectMusic.cpp
Desc: Area for testing.
Desc: See Header
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
Chris Danford
Glenn Maynard (OpenGL Code)
Lance Gilbert (OpenGL/Usability Modifications)
Andrew Livy
-----------------------------------------------------------------------------
*/
@@ -27,12 +26,27 @@
#include "GameConstantsAndTypes.h"
#include "PrefsManager.h"
#include "ThemeManager.h"
#include "GameState.h"
#include "StyleDef.h"
#include "InputMapper.h"
#include "CodeDetector.h"
#define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX")
#define SCROLLING_LIST_Y THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListY")
#define PUMP_DIFF_X THEME->GetMetricI("ScreenEz2SelectMusic","PumpDifficultyX")
#define PUMP_DIFF_Y THEME->GetMetricI("ScreenEz2SelectMusic","PumpDifficultyY")
#define HELP_TEXT THEME->GetMetric("ScreenSelectMusic","HelpText")
#define TIMER_SECONDS THEME->GetMetricI("ScreenSelectMusic","TimerSeconds")
#define METER_X( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("MeterP%dX",p+1))
#define METER_Y( p ) THEME->GetMetricF("ScreenEz2SelectMusic",ssprintf("MeterP%dY",p+1))
#define GUIDE_X THEME->GetMetricF("ScreenSelectMode","GuideX")
#define GUIDE_Y THEME->GetMetricF("ScreenSelectMode","GuideY")
const ScreenMessage SM_GoToPrevScreen = ScreenMessage(SM_User+1);
ScreenEz2SelectMusic::ScreenEz2SelectMusic()
{
CodeDetector::RefreshCacheItems();
m_Menu.Load(
THEME->GetPathTo("BGAnimations","select music"),
THEME->GetPathTo("Graphics","select music top edge"),
@@ -40,52 +54,102 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
);
this->AddChild( &m_Menu );
m_MusicBannerWheel.SetX(CENTER_X);
m_MusicBannerWheel.SetY(CENTER_Y);
m_ChoiceListFrame.Load( THEME->GetPathTo("Graphics","select mode list frame"));
m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
this->AddChild( &m_ChoiceListFrame );
m_Guide.Load( THEME->GetPathTo("Graphics","select mode guide"));
m_Guide.SetXY( GUIDE_X, GUIDE_Y );
this->AddChild( &m_Guide );
m_MusicBannerWheel.SetX(SCROLLING_LIST_X);
m_MusicBannerWheel.SetY(SCROLLING_LIST_Y);
this->AddChild( &m_MusicBannerWheel );
m_ChoiceListHighlight.Load( THEME->GetPathTo("Graphics","select mode list highlight"));
m_ChoiceListHighlight.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
this->AddChild( &m_ChoiceListHighlight );
for(int p=0; p<NUM_PLAYERS; p++ )
{
m_FootMeter[p].SetXY( METER_X(p), METER_Y(p) );
m_FootMeter[p].SetShadowLength( 2 );
this->AddChild( &m_FootMeter[p] );
m_iSelection[p] = 0;
}
m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","pump songselect difficulty") );
m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
this->AddChild(&m_PumpDifficultyRating);
MusicChanged();
m_Menu.TweenOnScreenFromMenu( SM_None );
}
void ScreenEz2SelectMusic::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
if( type != IET_FIRST_PRESS )
return; // ignore
// if( type != IET_FIRST_PRESS )
// return; // ignore
switch( DeviceI.device)
PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller );
if( CodeDetector::EnteredEasierDifficulty(GameI.controller) )
{
case DEVICE_KEYBOARD:
switch( DeviceI.button )
{
case SDLK_LEFT:
m_MusicBannerWheel.BannersLeft();
break;
case SDLK_RIGHT:
m_MusicBannerWheel.BannersRight();
break;
case SDLK_UP:
break;
case SDLK_DOWN:
break;
case SDLK_t:
{
SDL_Event *event;
event = (SDL_Event *) malloc(sizeof(event));
event->type = SDL_QUIT;
SDL_PushEvent(event);
}
case SDLK_ESCAPE:
{
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
}
}
EasierDifficulty( pn );
return;
}
if( CodeDetector::EnteredHarderDifficulty(GameI.controller) )
{
HarderDifficulty( pn );
return;
}
Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
}
void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM )
{
Screen::HandleScreenMessage( SM );
switch( SM )
{
case SM_GoToPrevScreen:
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
}
}
void ScreenEz2SelectMusic::MenuRight( PlayerNumber pn, const InputEventType type )
{
m_MusicBannerWheel.BannersRight();
MusicChanged();
}
void ScreenEz2SelectMusic::MenuBack( PlayerNumber pn )
{
MUSIC->Stop();
m_Menu.TweenOffScreenToBlack( SM_GoToPrevScreen, true );
}
void ScreenEz2SelectMusic::MenuLeft( PlayerNumber pn, const InputEventType type )
{
m_MusicBannerWheel.BannersLeft();
MusicChanged();
}
void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
{
MUSIC->Stop();
SCREENMAN->SetNewScreen( "ScreenStage" );
}
void ScreenEz2SelectMusic::Update( float fDeltaTime )
{
Screen::Update( fDeltaTime );
@@ -98,19 +162,81 @@ void ScreenEz2SelectMusic::DrawPrimitives()
m_Menu.DrawTopLayer();
}
void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM )
void ScreenEz2SelectMusic::EasierDifficulty( PlayerNumber pn )
{
Screen::HandleScreenMessage( SM );
switch( SM )
if( !GAMESTATE->IsPlayerEnabled(pn) )
return;
if( m_arrayNotes[pn].empty() )
return;
if( m_iSelection[pn] == 0 )
return;
m_iSelection[pn]--;
// the user explicity switched difficulties. Update the preferred difficulty
GAMESTATE->m_PreferredDifficulty[pn] = m_arrayNotes[pn][ m_iSelection[pn] ]->m_Difficulty;
// m_soundChangeNotes.Play();
AfterNotesChange( pn );
}
void ScreenEz2SelectMusic::HarderDifficulty( PlayerNumber pn )
{
if( !GAMESTATE->IsPlayerEnabled(pn) )
return;
if( m_arrayNotes[pn].empty() )
return;
if( m_iSelection[pn] == int(m_arrayNotes[pn].size()-1) )
return;
m_iSelection[pn]++;
// the user explicity switched difficulties. Update the preferred difficulty
GAMESTATE->m_PreferredDifficulty[pn] = m_arrayNotes[pn][ m_iSelection[pn] ]->m_Difficulty;
// m_soundChangeNotes.Play();
AfterNotesChange( pn );
}
void ScreenEz2SelectMusic::MusicChanged()
{
Song* pSong = m_MusicBannerWheel.GetSelectedSong();
GAMESTATE->m_pCurSong = pSong;
int pn;
for( pn = 0; pn < NUM_PLAYERS; ++pn)
m_arrayNotes[pn].clear();
for( pn = 0; pn < NUM_PLAYERS; ++pn)
{
case SM_DoneClosingWipingLeft:
break;
case SM_DoneClosingWipingRight:
break;
case SM_DoneOpeningWipingLeft:
break;
case SM_DoneOpeningWipingRight:
break;
pSong->GetNotesThatMatch( GAMESTATE->GetCurrentStyleDef()->m_NotesType, m_arrayNotes[pn] );
SortNotesArrayByDifficulty( m_arrayNotes[pn] );
}
for( int p=0; p<NUM_PLAYERS; p++ )
{
AfterNotesChange( (PlayerNumber)p );
}
}
void ScreenEz2SelectMusic::AfterNotesChange( PlayerNumber pn )
{
if( !GAMESTATE->IsPlayerEnabled(pn) )
return;
Notes* pNotes = m_arrayNotes[pn].empty()? NULL: m_arrayNotes[pn][m_iSelection[pn]];
if( pNotes != NULL )
m_PumpDifficultyRating.SetText(ssprintf("Lv.%d",pNotes->m_iMeter));
GAMESTATE->m_pCurNotes[pn] = pNotes;
// Notes* m_pNotes = GAMESTATE->m_pCurNotes[pn];
m_FootMeter[pn].SetFromNotes( pNotes );
}
stepmania/src/ScreenEz2SelectMusic.h
+22 -4
View File
@@ -2,12 +2,12 @@
#define SCREENEZ2SELECTMUSIC_H
/*
-----------------------------------------------------------------------------
Class: ScreenSandbox
Class: ScreenEz2SelectMusic
Desc: Area for testing.
Desc: A Scrolling List Of Song Banners used to select the song the player wants.
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
Chris Danford
Andrew Livy
-----------------------------------------------------------------------------
*/
@@ -20,6 +20,7 @@
#include "RageSoundStream.h"
#include "MusicBannerWheel.h"
#include "MenuElements.h"
#include "FootMeter.h"
class ScreenEz2SelectMusic : public Screen
{
@@ -30,10 +31,27 @@ public:
virtual void Update( float fDeltaTime );
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
virtual void HandleScreenMessage( const ScreenMessage SM );
virtual void MenuStart( PlayerNumber pn );
virtual void MenuLeft( PlayerNumber pn, const InputEventType type );
virtual void MenuRight( PlayerNumber pn, const InputEventType type );
virtual void MenuBack( PlayerNumber pn );
protected:
void AfterNotesChange( PlayerNumber pn );
void MusicChanged();
void EasierDifficulty( PlayerNumber pn );
void HarderDifficulty( PlayerNumber pn );
Sprite m_ChoiceListFrame;
Sprite m_ChoiceListHighlight;
Sprite m_Guide;
BitmapText m_PumpDifficultyRating;
MusicBannerWheel m_MusicBannerWheel;
MenuElements m_Menu;
FootMeter m_FootMeter[NUM_PLAYERS];
CArray<Notes*, Notes*> m_arrayNotes[NUM_PLAYERS];
int m_iSelection[NUM_PLAYERS];
};
stepmania/src/ScreenGameplay.cpp
+4 -1
View File
@@ -33,6 +33,8 @@
// Defines
//
#define SONGSEL_SCREEN THEME->GetMetric("ScreenGameplay","SongSelectScreen")
#define MAXCOMBO_X THEME->GetMetricF("ScreenGameplay","MAXCOMBOX")
#define MAXCOMBO_Y THEME->GetMetricF("ScreenGameplay","MAXCOMBOY")
#define MAXCOMBO_ZOOM THEME->GetMetricF("ScreenGameplay","MAXCOMBOZoom")
@@ -1389,7 +1391,8 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
switch( GAMESTATE->m_PlayMode )
{
case PLAY_MODE_ARCADE:
SCREENMAN->SetNewScreen( "ScreenSelectMusic" );
// SCREENMAN->SetNewScreen( "ScreenSelectMusic" );
SCREENMAN->SetNewScreen( SONGSEL_SCREEN );
break;
case PLAY_MODE_ONI:
case PLAY_MODE_ENDLESS:
stepmania/src/ScreenMusicScroll.cpp
-1
View File
@@ -115,7 +115,6 @@ const CString CREDIT_LINES[] =
"Garett Sakamoto",
"SailorBob",
"AngelTK (Kenny Lai)",
"spds (James Sanders)",
"Illusionz - Issaquah, WA",
"Quarters - Kirkland, WA",
"Segapark - Bournemouth, UK",
stepmania/src/ScreenSelectMode.cpp
+6
View File
@@ -34,6 +34,8 @@ const ScreenMessage SM_GoToNextScreen = ScreenMessage(SM_User + 2);
#define JOIN_FRAME_Y( i ) THEME->GetMetricF("ScreenSelectMode",ssprintf("JoinFrameP%dY",i+1))
#define JOIN_MESSAGE_X( p ) THEME->GetMetricF("ScreenSelectMode",ssprintf("JoinMessageP%dX",p+1))
#define JOIN_MESSAGE_Y( i ) THEME->GetMetricF("ScreenSelectMode",ssprintf("JoinMessageP%dY",i+1))
#define GUIDE_X THEME->GetMetricF("ScreenSelectMode","GuideX")
#define GUIDE_Y THEME->GetMetricF("ScreenSelectMode","GuideY")
#define HELP_TEXT THEME->GetMetric("ScreenSelectMode","HelpText")
#define TIMER_SECONDS THEME->GetMetricI("ScreenSelectMode","TimerSeconds")
#define NEXT_SCREEN THEME->GetMetric("ScreenSelectMode","NextScreen")
@@ -76,6 +78,10 @@ ScreenSelectMode::ScreenSelectMode()
m_ChoiceListHighlight.SetXY( CENTER_X, SCROLLING_LIST_Y);
this->AddChild( &m_ChoiceListHighlight );
m_Guide.Load( THEME->GetPathTo("Graphics","select mode guide"));
m_Guide.SetXY( GUIDE_X, GUIDE_Y );
this->AddChild( &m_Guide );
for( int p=0; p<NUM_PLAYERS; p++ )
{
m_sprJoinFrame[p].Load( THEME->GetPathTo("Graphics","select player join frame 1x2") );
stepmania/src/ScreenSelectMode.h
+1
View File
@@ -54,6 +54,7 @@ protected:
Sprite m_sprJoinFrame[NUM_PLAYERS];
Sprite m_ChoiceListFrame;
Sprite m_ChoiceListHighlight;
Sprite m_Guide;
CArray<ModeChoice*,ModeChoice*> m_apPossibleModeChoices;
stepmania/src/plib-1.6.0/sg_d.lib
BIN
View File
Binary file not shown.
stepmania/src/plib-1.6.0/ul_d.lib
BIN
View File
Binary file not shown.