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

wheel highlight metrics

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-26 00:16:50 +00:00
parent 0017ffac05
commit 29a0c62830
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+7
View File
@@ -1740,6 +1740,13 @@ MusicWheelItemStartOnCommand=addx,320
MusicWheelItemFinishOnCommand=accelerate,0.2;addx,-320 MusicWheelItemFinishOnCommand=accelerate,0.2;addx,-320
MusicWheelItemStartOffCommand= MusicWheelItemStartOffCommand=
MusicWheelItemFinishOffCommand=decelerate,0.2;addx,320 MusicWheelItemFinishOffCommand=decelerate,0.2;addx,320
HighlightOnCommand=glowshift;effectcolor1,#FFFFFF66;effectcolor2,#FFFFFFFF
HighlightStartOnCommand=addx,320
HighlightFinishOnCommand=sleep,0.05;accelerate,0.4;addx,-320
HighlightFinishOnSortCommand=accelerate,0.2;addx,-320
HighlightStartOffCommand=
HighlightFinishOffCommand=decelerate,0.2;addx,320
HighlightFinishOffSortCommand=decelerate,0.2;addx,320
WheelItemOnDelayCenter=0 WheelItemOnDelayCenter=0
WheelItemOnDelayOffset=0.04 WheelItemOnDelayOffset=0.04
WheelItemOffDelayCenter=0 WheelItemOffDelayCenter=0
stepmania/src/MusicWheel.cpp
+20 -19
View File
@@ -107,11 +107,10 @@ MusicWheel::MusicWheel()
if( GAMESTATE->m_CurStyle == STYLE_INVALID ) if( GAMESTATE->m_CurStyle == STYLE_INVALID )
GAMESTATE->m_CurStyle = STYLE_DANCE_SINGLE; GAMESTATE->m_CurStyle = STYLE_DANCE_SINGLE;
m_sprSelectionOverlay.SetName( "Highlight" );
m_sprSelectionOverlay.Load( THEME->GetPathToG("MusicWheel highlight") ); m_sprSelectionOverlay.Load( THEME->GetPathToG("MusicWheel highlight") );
m_sprSelectionOverlay.SetXY( 0, 0 ); this->AddChild( &m_sprSelectionOverlay );
m_sprSelectionOverlay.SetDiffuse( RageColor(1,1,1,1) ); UtilOnCommand( &m_sprSelectionOverlay, "MusicWheel" );
m_sprSelectionOverlay.SetEffectGlowShift( 1.0f, RageColor(1,1,1,0.4f), RageColor(1,1,1,1) );
AddChild( &m_sprSelectionOverlay );
m_ScrollBar.SetX( SCROLL_BAR_X ); m_ScrollBar.SetX( SCROLL_BAR_X );
m_ScrollBar.SetBarHeight( SCROLL_BAR_HEIGHT ); m_ScrollBar.SetBarHeight( SCROLL_BAR_HEIGHT );
@@ -1327,15 +1326,15 @@ void MusicWheel::TweenOnScreen(bool changing_sort)
SetItemPosition( m_sprSelectionOverlay, 0 ); SetItemPosition( m_sprSelectionOverlay, 0 );
m_sprSelectionOverlay.Command( "addx,320" ); COMMAND( m_sprSelectionOverlay, "StartOn");
if(changing_sort) { if( changing_sort )
m_sprSelectionOverlay.BeginTweening( 0.04f * NUM_WHEEL_ITEMS/2 ); // sleep {
m_sprSelectionOverlay.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE ); const float delay = fabsf(NUM_WHEEL_ITEMS/2-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET;
m_sprSelectionOverlay.BeginTweening( delay ); // sleep
COMMAND( m_sprSelectionOverlay, "FinishOnSort");
} else { } else {
m_sprSelectionOverlay.BeginTweening( 0.05f ); // sleep COMMAND( m_sprSelectionOverlay, "FinishOn");
m_sprSelectionOverlay.BeginTweening( 0.4f, Actor::TWEEN_ACCELERATE );
} }
m_sprSelectionOverlay.Command( "addx,-320" );
m_ScrollBar.SetX( SCROLL_BAR_X ); m_ScrollBar.SetX( SCROLL_BAR_X );
m_ScrollBar.Command( "addx,+30" ); m_ScrollBar.Command( "addx,+30" );
@@ -1354,8 +1353,8 @@ void MusicWheel::TweenOnScreen(bool changing_sort)
COMMAND( display, "StartOn"); COMMAND( display, "StartOn");
const float delay = fabsf(i-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET; const float delay = fabsf(i-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET;
display.BeginTweening( delay ); //0.04f*i /*atof(delays[i])*/ ); // sleep display.BeginTweening( delay ); // sleep
COMMAND( display, "FinishOn"); // accelerate,0.2 COMMAND( display, "FinishOn");
if( changing_sort ) if( changing_sort )
display.HurryTweening( 0.25f ); display.HurryTweening( 0.25f );
} }
@@ -1372,16 +1371,18 @@ void MusicWheel::TweenOffScreen(bool changing_sort)
SetItemPosition( m_sprSelectionOverlay, 0 ); SetItemPosition( m_sprSelectionOverlay, 0 );
if(changing_sort) { COMMAND( m_sprSelectionOverlay, "StartOff");
if(changing_sort)
{
/* When changing sort, tween the overlay with the item in the center; /* When changing sort, tween the overlay with the item in the center;
* having it separate looks messy when we're moving fast. */ * having it separate looks messy when we're moving fast. */
m_sprSelectionOverlay.BeginTweening( 0.04f * NUM_WHEEL_ITEMS/2 ); // sleep const float delay = fabsf(NUM_WHEEL_ITEMS/2-WHEEL_ITEM_ON_DELAY_CENTER) * WHEEL_ITEM_ON_DELAY_OFFSET;
m_sprSelectionOverlay.BeginTweening( 0.2f, Actor::TWEEN_DECELERATE ); m_sprSelectionOverlay.BeginTweening( delay ); // sleep
COMMAND( m_sprSelectionOverlay, "FinishOffSort");
} else { } else {
m_sprSelectionOverlay.BeginTweening( 0 ); // sleep COMMAND( m_sprSelectionOverlay, "FinishOff");
m_sprSelectionOverlay.BeginTweening( 0.2f, Actor::TWEEN_DECELERATE );
} }
m_sprSelectionOverlay.Command( "addx,320" ); COMMAND( m_sprSelectionOverlay, "FinishOff");
m_ScrollBar.BeginTweening( 0 ); m_ScrollBar.BeginTweening( 0 );
m_ScrollBar.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE ); m_ScrollBar.BeginTweening( 0.2f, Actor::TWEEN_ACCELERATE );