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

[ScreenGameplay] Removed hardcoded commands for Debug (give up text) and replace them with DebugStartOnCommand, DebugBackOnCommand, and DebugTweenOffCommand.

Browse Source
This commit is contained in:
AJ Kelly
2011-05-15 13:38:41 -05:00
parent 015fceea70
commit f8f4453637
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm5.txt
+6
View File
@@ -8,6 +8,12 @@ ________________________________________________________________________________
StepMania 5.0 $NEXT | 20110xyy StepMania 5.0 $NEXT | 20110xyy
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
2011/05/15
----------
* [ScreenGameplay] Removed hardcoded commands for Debug (give up text) and
replace them with DebugStartOnCommand, DebugBackOnCommand, and
DebugTweenOffCommand. [AJ]
2011/05/14 2011/05/14
---------- ----------
* [ModIcon] Added StopWords metric. [AJ] * [ModIcon] Added StopWords metric. [AJ]
Themes/_fallback/metrics.ini
+3
View File
@@ -3211,6 +3211,9 @@ SongOptionsOffCommand=
DebugX=SCREEN_CENTER_X DebugX=SCREEN_CENTER_X
DebugY=SCREEN_BOTTOM-72 DebugY=SCREEN_BOTTOM-72
DebugOnCommand=zoom,0.75 DebugOnCommand=zoom,0.75
DebugStartOnCommand=stoptweening;diffusealpha,0;linear,1/8;diffusealpha,1
DebugBackOnCommand=stoptweening;diffusealpha,0;linear,1/8;diffusealpha,1
DebugTweenOffCommand=stoptweening;linear,1/8;diffusealpha,0
# #
SongNumberFormat="%d" SongNumberFormat="%d"
SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60 SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60
src/ScreenGameplay.cpp
+3 -14
View File
@@ -2156,11 +2156,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
else if( input.type==IET_FIRST_PRESS && m_GiveUpTimer.IsZero() ) else if( input.type==IET_FIRST_PRESS && m_GiveUpTimer.IsZero() )
{ {
m_textDebug.SetText( GIVE_UP_START_TEXT ); m_textDebug.SetText( GIVE_UP_START_TEXT );
// todo: un-hardcode commands and move to metrics -aj m_textDebug.PlayCommand( "StartOn" );
m_textDebug.StopTweening();
m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
m_textDebug.BeginTweening( 1/8.f );
m_textDebug.SetDiffuse( RageColor(1,1,1,1) );
m_GiveUpTimer.Touch(); // start the timer m_GiveUpTimer.Touch(); // start the timer
} }
@@ -2187,18 +2183,11 @@ void ScreenGameplay::Input( const InputEventPlus &input )
else if( PREFSMAN->m_bDelayedBack && input.type==IET_FIRST_PRESS ) else if( PREFSMAN->m_bDelayedBack && input.type==IET_FIRST_PRESS )
{ {
m_textDebug.SetText( GIVE_UP_BACK_TEXT ); m_textDebug.SetText( GIVE_UP_BACK_TEXT );
// todo: un-hardcode commands and move to metrics -aj m_textDebug.PlayCommand( "BackOn" );
m_textDebug.StopTweening();
m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
m_textDebug.BeginTweening( 1/8.f );
m_textDebug.SetDiffuse( RageColor(1,1,1,1) );
} }
else if( PREFSMAN->m_bDelayedBack && input.type==IET_RELEASE ) else if( PREFSMAN->m_bDelayedBack && input.type==IET_RELEASE )
{ {
// todo: un-hardcode commands and move to metrics -aj m_textDebug.PlayCommand( "TweenOff" );
m_textDebug.StopTweening();
m_textDebug.BeginTweening( 1/8.f );
m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
} }
return; return;