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

Transition to sprites from quads

Browse Source
This commit is contained in:
Josh Allen
2004-12-03 01:22:22 +00:00
parent 0d608c0806
commit 095bcea577
5 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+23 -23
View File
@@ -714,20 +714,20 @@ TitleBGY=420
TitleBGX=120 TitleBGX=120
TitleBGOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0 TitleBGOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0
TitleBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 TitleBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
RoomsBGColor=0.5,0.0,0.5,0.7
RoomsBGWidth=250 RoomsBGWidth=250
RoomsBGHeight=400 RoomsBGHeight=400
RoomsBGY=240 RoomsBGY=235
RoomsBGX=500 RoomsBGX=500
RoomsBGOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0;linear,1;diffusealpha,0.6 RoomsBGOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0;linear,1;diffusealpha,0.8
RoomsBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 RoomsBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
SelColor=0.0,1.0,0.2,0.4 SelectionY=240
SelHeight=30 SelectionX=500
SelWidth=250 SelectionWidth=150
SelY=240 SelectionHeight=30
SelX=530 SelectionTo1Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,500;y,240
SelOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 SelectionTo2Command=linear,0.3;zoomy,1.7;zoomx,0.6;x,252;y,400
SelOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 SelectionOnCommand=diffusealpha,0.7;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
SelectionOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
TitleY=420 TitleY=420
TitleX=120 TitleX=120
TitleOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0 TitleOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0
@@ -767,11 +767,11 @@ ChatOutputBoxHeight=200
ChatOutputBoxColor=1.0,0.5,0.5,0.7 //transparent reddish ChatOutputBoxColor=1.0,0.5,0.5,0.7 //transparent reddish
ChatInputY=SCREEN_CENTER_Y+70 ChatInputY=SCREEN_CENTER_Y+70
ChatInputX=SCREEN_CENTER_X-300 ChatInputX=SCREEN_CENTER_X-300
ChatInputOnCommand=zoomx,0.0;zoomy,0.0;diffusealpha,0;linear,0.5;diffusealpha,1;zoomx,0.5;zoomy,0.5 ChatInputOnCommand=zoomx,0.0;zoomy,0.0;diffusealpha,0;linear,0.5;diffusealpha,0.8;zoomx,0.5;zoomy,0.5
ChatInputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.25;zoomy,0.25 ChatInputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.25;zoomy,0.25
ChatOutputY=SCREEN_CENTER_Y+64 ChatOutputY=SCREEN_CENTER_Y+64
ChatOutputX=SCREEN_CENTER_X-300 ChatOutputX=SCREEN_CENTER_X-300
ChatOutputOnCommand=zoomx,1.0;zoomy,1.0;diffusealpha,0;linear,0.5;diffusealpha,1;zoomx,0.5;zoomy,0.5 ChatOutputOnCommand=zoomx,1.0;zoomy,1.0;diffusealpha,0;linear,0.5;diffusealpha,0.8;zoomx,0.5;zoomy,0.5
ChatOutputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.25;zoomy,0.25 ChatOutputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.25;zoomy,0.25
GroupsListY=SCREEN_CENTER_Y-90 GroupsListY=SCREEN_CENTER_Y-90
GroupsListX=SCREEN_CENTER_X+160 GroupsListX=SCREEN_CENTER_X+160
@@ -813,17 +813,17 @@ Users1Color=1.0,1.0,1.0,1.0 //Inactive; Undefined
Users2Color=0.5,0.5,1.0,1.0 //Active, In NetScreen Users2Color=0.5,0.5,1.0,1.0 //Active, In NetScreen
Users3Color=0.5,1.0,0.5,1.0 //Active, In Options Users3Color=0.5,1.0,0.5,1.0 //Active, In Options
Users4Color=1.0,0.5,0.5,1.0 //Active, in Evaluation Users4Color=1.0,0.5,0.5,1.0 //Active, in Evaluation
SelColor=0.0,1.0,0.2,0.4 SelectionColor=0.0,1.0,0.2,0.4
SelHeight=30 SelectionHeight=30
SelWidth=300 SelectionWidth=300
SelY=SCREEN_CENTER_Y-90 SelectionY=SCREEN_CENTER_Y-90
SelX=SCREEN_CENTER_X+160 SelectionX=SCREEN_CENTER_X+160
SelOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 SelectionOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0;diffusealpha,0.7
SelOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 SelectionOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
SelTo1Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,480;y,150 SelectionTo1Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,480;y,150
SelTo2Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,480;y,350 SelectionTo2Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,480;y,350
SelTo3Command=linear,0.3;x,260;y,400;zoomx,0.3;zoomy,2.0 SelectionTo3Command=linear,0.3;x,260;y,400;zoomx,0.4;zoomy,2.0
SelTo4Command=linear,0.3;x,80;y,70;zoomx,0.4;zoomy,2.2 SelectionTo4Command=linear,0.3;x,80;y,70;zoomx,0.4;zoomy,2.2
optionsY=SCREEN_CENTER_Y-170 optionsY=SCREEN_CENTER_Y-170
optionsX=SCREEN_CENTER_X-240 optionsX=SCREEN_CENTER_X-240
optionsOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,0.7;zoomx,0.7 optionsOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,0.7;zoomx,0.7
stepmania/src/ScreenNetSelectBase.cpp
+14 -14
View File
@@ -33,19 +33,19 @@ REGISTER_SCREEN_CLASS( ScreenNetSelectBase );
ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMenuElements( sName ) ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMenuElements( sName )
{ {
//ChatBox //ChatBox
m_rectChatInputBox.SetDiffuse( CHATINPUT_COLOR ); m_sprChatInputBox.SetName( "ChatInputBox" );
m_rectChatInputBox.SetName( "ChatInputBox" ); m_sprChatInputBox.Load( THEME->GetPathG( m_sName, "ChatInputBox" ) );
m_rectChatInputBox.SetWidth( CHATINPUT_WIDTH ); m_sprChatInputBox.SetWidth( CHATINPUT_WIDTH );
m_rectChatInputBox.SetHeight( CHATINPUT_HEIGHT ); m_sprChatInputBox.SetHeight( CHATINPUT_HEIGHT );
SET_XY_AND_ON_COMMAND( m_rectChatInputBox ); SET_XY_AND_ON_COMMAND( m_sprChatInputBox );
this->AddChild( &m_rectChatInputBox ); this->AddChild( &m_sprChatInputBox );
m_rectChatOutputBox.SetDiffuse( CHATOUTPUT_COLOR ); m_sprChatOutputBox.SetName( "ChatOutputBox" );
m_rectChatOutputBox.SetName( "ChatOutputBox" ); m_sprChatOutputBox.Load( THEME->GetPathG( m_sName, "ChatOutputBox" ) );
m_rectChatOutputBox.SetWidth( CHATOUTPUT_WIDTH ); m_sprChatOutputBox.SetWidth( CHATOUTPUT_WIDTH );
m_rectChatOutputBox.SetHeight( CHATOUTPUT_HEIGHT ); m_sprChatOutputBox.SetHeight( CHATOUTPUT_HEIGHT );
SET_XY_AND_ON_COMMAND( m_rectChatOutputBox ); SET_XY_AND_ON_COMMAND( m_sprChatOutputBox );
this->AddChild( &m_rectChatOutputBox ); this->AddChild( &m_sprChatOutputBox );
m_textChatInput.LoadFromFont( THEME->GetPathF(m_sName,"chat") ); m_textChatInput.LoadFromFont( THEME->GetPathF(m_sName,"chat") );
m_textChatInput.SetHorizAlign( align_left ); m_textChatInput.SetHorizAlign( align_left );
@@ -201,8 +201,8 @@ void ScreenNetSelectBase::HandleScreenMessage( const ScreenMessage SM )
void ScreenNetSelectBase::TweenOffScreen() void ScreenNetSelectBase::TweenOffScreen()
{ {
OFF_COMMAND( m_rectChatInputBox ); OFF_COMMAND( m_sprChatInputBox );
OFF_COMMAND( m_rectChatOutputBox ); OFF_COMMAND( m_sprChatOutputBox );
OFF_COMMAND( m_textChatInput ); OFF_COMMAND( m_textChatInput );
OFF_COMMAND( m_textChatOutput ); OFF_COMMAND( m_textChatOutput );
stepmania/src/ScreenNetSelectBase.h
+2 -2
View File
@@ -26,8 +26,8 @@ private:
BitmapText m_textChatInput; BitmapText m_textChatInput;
BitmapText m_textChatOutput; BitmapText m_textChatOutput;
BitmapText m_textOutHidden; BitmapText m_textOutHidden;
Quad m_rectChatInputBox; Sprite m_sprChatInputBox;
Quad m_rectChatOutputBox; Sprite m_sprChatOutputBox;
CString m_sTextInput; CString m_sTextInput;
CString m_actualText; CString m_actualText;
stepmania/src/ScreenNetSelectMusic.cpp
+13 -8
View File
@@ -27,6 +27,8 @@
#define GROUPSBG_WIDTH THEME->GetMetricF(m_sName,"GroupsBGWidth") #define GROUPSBG_WIDTH THEME->GetMetricF(m_sName,"GroupsBGWidth")
#define SONGSBG_WIDTH THEME->GetMetricF(m_sName,"SongsBGWidth") #define SONGSBG_WIDTH THEME->GetMetricF(m_sName,"SongsBGWidth")
#define SELECTION_WIDTH THEME->GetMetricF(m_sName,"SelectionWidth")
#define SELECTION_HEIGHT THEME->GetMetricF(m_sName,"SelectionHeight")
const ScreenMessage SM_NoSongs = ScreenMessage(SM_User+3); const ScreenMessage SM_NoSongs = ScreenMessage(SM_User+3);
const ScreenMessage SM_ChangeSong = ScreenMessage(SM_User+5); const ScreenMessage SM_ChangeSong = ScreenMessage(SM_User+5);
@@ -120,9 +122,12 @@ ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenNetSe
} }
m_SelectMode = SelectGroup; m_SelectMode = SelectGroup;
m_rectSelection.SetName( "Sel" ); m_sprSelection.Load( THEME->GetPathG( m_sName, "Selection" ) );
SET_QUAD_INIT( m_rectSelection ); m_sprSelection.SetName( "Selection" );
this->AddChild( &m_rectSelection ); m_sprSelection.SetWidth( SELECTION_WIDTH );
m_sprSelection.SetHeight( SELECTION_HEIGHT );
SET_XY_AND_ON_COMMAND( m_sprSelection );
this->AddChild( &m_sprSelection );
SONGMAN->GetGroupNames( m_vGroups ); SONGMAN->GetGroupNames( m_vGroups );
@@ -413,16 +418,16 @@ void ScreenNetSelectMusic::MenuUp( PlayerNumber pn, const InputEventType type )
m_SelectMode = (NetScreenSelectModes) ( ( (int)m_SelectMode - 1) % (int)SelectModes); m_SelectMode = (NetScreenSelectModes) ( ( (int)m_SelectMode - 1) % (int)SelectModes);
if ( (int) m_SelectMode < 0) if ( (int) m_SelectMode < 0)
m_SelectMode = (NetScreenSelectModes) (SelectModes - 1); m_SelectMode = (NetScreenSelectModes) (SelectModes - 1);
m_rectSelection.StopTweening( ); m_sprSelection.StopTweening( );
COMMAND( m_rectSelection, ssprintf("To%d", m_SelectMode+1 ) ); COMMAND( m_sprSelection, ssprintf("To%d", m_SelectMode+1 ) );
} }
void ScreenNetSelectMusic::MenuDown( PlayerNumber pn, const InputEventType type ) void ScreenNetSelectMusic::MenuDown( PlayerNumber pn, const InputEventType type )
{ {
m_soundChangeSel.Play(); m_soundChangeSel.Play();
m_SelectMode = (NetScreenSelectModes) ( ( (int)m_SelectMode + 1) % (int)SelectModes); m_SelectMode = (NetScreenSelectModes) ( ( (int)m_SelectMode + 1) % (int)SelectModes);
m_rectSelection.StopTweening( ); m_sprSelection.StopTweening( );
COMMAND( m_rectSelection, ssprintf("To%d", m_SelectMode+1 ) ); COMMAND( m_sprSelection, ssprintf("To%d", m_SelectMode+1 ) );
} }
void ScreenNetSelectMusic::MenuStart( PlayerNumber pn ) void ScreenNetSelectMusic::MenuStart( PlayerNumber pn )
@@ -453,7 +458,7 @@ void ScreenNetSelectMusic::TweenOffScreen()
{ {
ScreenNetSelectBase::TweenOffScreen(); ScreenNetSelectBase::TweenOffScreen();
OFF_COMMAND( m_rectSelection ); OFF_COMMAND( m_sprSelection );
OFF_COMMAND( m_textGroups ); OFF_COMMAND( m_textGroups );
OFF_COMMAND( m_rectGroupsBackground ); OFF_COMMAND( m_rectGroupsBackground );
stepmania/src/ScreenNetSelectMusic.h
+1 -1
View File
@@ -62,7 +62,7 @@ protected:
void TweenOffScreen(); void TweenOffScreen();
private: private:
//Selection //Selection
Quad m_rectSelection; Sprite m_sprSelection;
//Groups //Groups
BitmapText m_textGroups; BitmapText m_textGroups;