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

pressing L+R for the sort code should end up back at the originally selected item

Browse Source 
fix jumpy wheel when letting go of L+R near-simultaneously
fix MenuTimer doesn't choose a Random song if sitting on a section or sort
fix MenuTimer fire has no effect if wheel is tweening
This commit is contained in:
Chris Danford
2005-06-12 23:43:39 +00:00
parent 8f9951e38d
commit 49b3cbaf34
3 changed files with 199 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+122 -110
View File
@@ -167,9 +167,9 @@ void MusicWheel::Load( CString sType )
CString times; CString times;
/* Build all of the wheel item data. Do this after selecting /* Build all of the wheel item data. Do this after selecting
* the extra stage, so it knows to always display it. */ * the extra stage, so it knows to always display it. */
for( int so=0; so<NUM_SORT_ORDERS; so++ ) FOREACH_SortOrder( so )
{ {
BuildWheelItemDatas( m_WheelItemDatas[so], SortOrder(so) ); BuildWheelItemDatas( m_WheelItemDatas[so], so );
times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() ); times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() );
} }
LOG->Trace( "took: %s", times.c_str() ); LOG->Trace( "took: %s", times.c_str() );
@@ -876,121 +876,122 @@ void MusicWheel::UpdateItems(float fDeltaTime )
} }
} }
void MusicWheel::UpdateSwitch() { void MusicWheel::UpdateSwitch()
switch( m_WheelState ) {
switch( m_WheelState )
{
case STATE_FLYING_OFF_BEFORE_NEXT_SORT:
{ {
case STATE_FLYING_OFF_BEFORE_NEXT_SORT: Song* pPrevSelectedSong = m_CurWheelItemData[m_iSelection]->m_pSong;
SCREENMAN->PostMessageToTopScreen( SM_SortOrderChanged, 0 );
SetOpenGroup(SongUtil::GetSectionNameFromSongAndSort( pPrevSelectedSong, GAMESTATE->m_SortOrder ));
m_iSelection = 0;
//
// Select the previously selected item
//
switch( GAMESTATE->m_SortOrder )
{ {
Song* pPrevSelectedSong = m_CurWheelItemData[m_iSelection]->m_pSong; default:
// Look for the last selected song or course
SCREENMAN->PostMessageToTopScreen( SM_SortOrderChanged, 0 ); SelectSongOrCourse();
break;
SetOpenGroup(SongUtil::GetSectionNameFromSongAndSort( pPrevSelectedSong, GAMESTATE->m_SortOrder )); case SORT_MODE_MENU:
SelectModeMenuItem();
m_iSelection = 0; break;
//
// Select the previously selected item
//
switch( GAMESTATE->m_SortOrder )
{
default:
// Look for the last selected song or course
SelectSongOrCourse();
break;
case SORT_MODE_MENU:
SelectModeMenuItem();
break;
}
//
// Change difficulty for sorts by meter - XXX: do this with GameCommand?
//
Difficulty dc = DIFFICULTY_INVALID;
switch( GAMESTATE->m_SortOrder )
{
case SORT_EASY_METER: dc = DIFFICULTY_EASY; break;
case SORT_MEDIUM_METER: dc = DIFFICULTY_MEDIUM; break;
case SORT_HARD_METER: dc = DIFFICULTY_HARD; break;
case SORT_CHALLENGE_METER: dc = DIFFICULTY_CHALLENGE; break;
}
if( dc != DIFFICULTY_INVALID )
{
FOREACH_PlayerNumber( p )
if( GAMESTATE->IsPlayerEnabled(p) )
GAMESTATE->m_PreferredDifficulty[p].Set( dc );
}
SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
RebuildAllMusicWheelItems();
TweenOnScreen(true);
m_WheelState = STATE_FLYING_ON_AFTER_NEXT_SORT;
SCREENMAN->ZeroNextUpdate();
} }
break;
case STATE_FLYING_ON_AFTER_NEXT_SORT: //
m_WheelState = STATE_SELECTING_MUSIC; // now, wait for input // Change difficulty for sorts by meter - XXX: do this with GameCommand?
break; //
Difficulty dc = DIFFICULTY_INVALID;
case STATE_TWEENING_ON_SCREEN: switch( GAMESTATE->m_SortOrder )
m_fTimeLeftInState = 0;
if( (GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage) || GAMESTATE->IsExtraStage2() )
{ {
m_WheelState = STATE_LOCKED; case SORT_EASY_METER: dc = DIFFICULTY_EASY; break;
SCREENMAN->PlayStartSound(); case SORT_MEDIUM_METER: dc = DIFFICULTY_MEDIUM; break;
m_fLockedWheelVelocity = 0; case SORT_HARD_METER: dc = DIFFICULTY_HARD; break;
case SORT_CHALLENGE_METER: dc = DIFFICULTY_CHALLENGE; break;
} }
else if( dc != DIFFICULTY_INVALID )
{ {
m_WheelState = STATE_SELECTING_MUSIC; FOREACH_PlayerNumber( p )
if( GAMESTATE->IsPlayerEnabled(p) )
GAMESTATE->m_PreferredDifficulty[p].Set( dc );
} }
break;
case STATE_TWEENING_OFF_SCREEN:
m_WheelState = STATE_WAITING_OFF_SCREEN;
m_fTimeLeftInState = 0;
break;
case STATE_SELECTING_MUSIC:
m_fTimeLeftInState = 0;
break;
case STATE_ROULETTE_SPINNING:
case STATE_RANDOM_SPINNING:
break;
case STATE_WAITING_OFF_SCREEN:
break;
case STATE_LOCKED:
break;
case STATE_ROULETTE_SLOWING_DOWN:
if( m_iSwitchesLeftInSpinDown == 0 )
{
m_WheelState = STATE_LOCKED;
m_fTimeLeftInState = 0;
SCREENMAN->PlayStartSound();
m_fLockedWheelVelocity = 0;
/* Send this again so the screen starts sample music. */ SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 ); RebuildAllMusicWheelItems();
} TweenOnScreen(true);
else m_WheelState = STATE_FLYING_ON_AFTER_NEXT_SORT;
{
m_iSwitchesLeftInSpinDown--;
const float SwitchTimes[] = { 0.5f, 1.3f, 0.8f, 0.4f, 0.2f };
ASSERT(m_iSwitchesLeftInSpinDown >= 0 && m_iSwitchesLeftInSpinDown <= 4);
m_fTimeLeftInState = SwitchTimes[m_iSwitchesLeftInSpinDown];
LOG->Trace( "m_iSwitchesLeftInSpinDown id %d, m_fTimeLeftInState is %f", m_iSwitchesLeftInSpinDown, m_fTimeLeftInState ); SCREENMAN->ZeroNextUpdate();
if( m_iSwitchesLeftInSpinDown < 2 )
ChangeMusic(randomf(0,1) >= 0.5f? 1:-1);
else
ChangeMusic(1);
}
break;
default:
ASSERT(0); // all state changes should be handled explicitly
break;
} }
break;
case STATE_FLYING_ON_AFTER_NEXT_SORT:
m_WheelState = STATE_SELECTING_MUSIC; // now, wait for input
break;
case STATE_TWEENING_ON_SCREEN:
m_fTimeLeftInState = 0;
if( (GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage) || GAMESTATE->IsExtraStage2() )
{
m_WheelState = STATE_LOCKED;
SCREENMAN->PlayStartSound();
m_fLockedWheelVelocity = 0;
}
else
{
m_WheelState = STATE_SELECTING_MUSIC;
}
break;
case STATE_TWEENING_OFF_SCREEN:
m_WheelState = STATE_WAITING_OFF_SCREEN;
m_fTimeLeftInState = 0;
break;
case STATE_SELECTING_MUSIC:
m_fTimeLeftInState = 0;
break;
case STATE_ROULETTE_SPINNING:
case STATE_RANDOM_SPINNING:
break;
case STATE_WAITING_OFF_SCREEN:
break;
case STATE_LOCKED:
break;
case STATE_ROULETTE_SLOWING_DOWN:
if( m_iSwitchesLeftInSpinDown == 0 )
{
m_WheelState = STATE_LOCKED;
m_fTimeLeftInState = 0;
SCREENMAN->PlayStartSound();
m_fLockedWheelVelocity = 0;
/* Send this again so the screen starts sample music. */
SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
}
else
{
m_iSwitchesLeftInSpinDown--;
const float SwitchTimes[] = { 0.5f, 1.3f, 0.8f, 0.4f, 0.2f };
ASSERT(m_iSwitchesLeftInSpinDown >= 0 && m_iSwitchesLeftInSpinDown <= 4);
m_fTimeLeftInState = SwitchTimes[m_iSwitchesLeftInSpinDown];
LOG->Trace( "m_iSwitchesLeftInSpinDown id %d, m_fTimeLeftInState is %f", m_iSwitchesLeftInSpinDown, m_fTimeLeftInState );
if( m_iSwitchesLeftInSpinDown < 2 )
ChangeMusic(randomf(0,1) >= 0.5f? 1:-1);
else
ChangeMusic(1);
}
break;
default:
ASSERT(0); // all state changes should be handled explicitly
break;
}
} }
void MusicWheel::ChangeMusic(int dist) void MusicWheel::ChangeMusic(int dist)
@@ -1148,7 +1149,7 @@ void MusicWheel::StartRoulette()
m_Moving = 1; m_Moving = 1;
m_TimeBeforeMovingBegins = 0; m_TimeBeforeMovingBegins = 0;
m_SpinSpeed = 1.0f/ROULETTE_SWITCH_SECONDS; m_SpinSpeed = 1.0f/ROULETTE_SWITCH_SECONDS;
SetOpenGroup("", SortOrder(SORT_ROULETTE)); SetOpenGroup("", SORT_ROULETTE);
} }
void MusicWheel::StartRandom() void MusicWheel::StartRandom()
@@ -1161,8 +1162,11 @@ void MusicWheel::StartRandom()
/* Shuffle and use the roulette wheel. */ /* Shuffle and use the roulette wheel. */
RandomGen rnd; RandomGen rnd;
random_shuffle( m_WheelItemDatas[SORT_ROULETTE].begin(), m_WheelItemDatas[SORT_ROULETTE].end(), rnd ); random_shuffle( m_WheelItemDatas[SORT_ROULETTE].begin(), m_WheelItemDatas[SORT_ROULETTE].end(), rnd );
SetOpenGroup( "", SORT_ROULETTE );
SetOpenGroup( "", SortOrder(SORT_ROULETTE) ); }
else
{
SetOpenGroup( "", GAMESTATE->m_PreferredSortOrder );
} }
m_Moving = -1; m_Moving = -1;
@@ -1263,7 +1267,8 @@ void MusicWheel::TweenOffScreenUpdateItems(bool changing_sort) {
} }
} }
bool MusicWheel::MoveSpecific(int n) { bool MusicWheel::MoveSpecific(int n)
{
/* If we're not selecting, discard this. We won't ignore it; we'll /* If we're not selecting, discard this. We won't ignore it; we'll
* get called again every time the key is repeated. */ * get called again every time the key is repeated. */
/* Still process Move(0) so we sometimes continue moving immediate /* Still process Move(0) so we sometimes continue moving immediate
@@ -1373,6 +1378,13 @@ try_next:
return wid[0].m_pSong; return wid[0].m_pSong;
} }
void MusicWheel::FinishChangingSorts()
{
FinishTweening();
m_WheelState = STATE_SELECTING_MUSIC;
m_fTimeLeftInState = 0;
}
/* /*
* (c) 2001-2004 Chris Danford, Chris Gomez, Glenn Maynard * (c) 2001-2004 Chris Danford, Chris Gomez, Glenn Maynard
* All rights reserved. * All rights reserved.
stepmania/src/MusicWheel.h
+1
View File
@@ -59,6 +59,7 @@ public:
void SetOpenGroup(CString group, SortOrder so = SORT_INVALID); void SetOpenGroup(CString group, SortOrder so = SORT_INVALID);
SortOrder GetSortOrder() const { return m_SortOrder; } SortOrder GetSortOrder() const { return m_SortOrder; }
virtual void ChangeMusic(int dist); /* +1 or -1 */ //CHECK THIS virtual void ChangeMusic(int dist); /* +1 or -1 */ //CHECK THIS
void FinishChangingSorts();
protected: protected:
virtual void LoadFromMetrics( CString sType ); virtual void LoadFromMetrics( CString sType );
stepmania/src/ScreenSelectMusic.cpp
+75 -35
View File
@@ -828,47 +828,75 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
} }
} }
if( MenuI.button == MENU_BUTTON_RIGHT || MenuI.button == MENU_BUTTON_LEFT ) switch( MenuI.button )
{ {
/* If we're rouletting, hands off. */ case MENU_BUTTON_RIGHT:
if( m_MusicWheel.IsRouletting() ) case MENU_BUTTON_LEFT:
return;
bool bLeftIsDown = false;
bool bRightIsDown = false;
FOREACH_EnabledPlayer( p )
{ {
if( !bSelectIsPressed ) /* If we're rouletting, hands off. */
{ if( m_MusicWheel.IsRouletting() )
bLeftIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_LEFT) ); return;
bRightIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_RIGHT) );
}
}
bool bBothDown = bLeftIsDown && bRightIsDown; bool bLeftIsDown = false;
bool bNeitherDown = !bLeftIsDown && !bRightIsDown; bool bRightIsDown = false;
if( bBothDown || bNeitherDown )
m_MusicWheel.Move( 0 );
else if( bLeftIsDown )
m_MusicWheel.Move( -1 );
else if( bRightIsDown )
m_MusicWheel.Move( +1 );
else
ASSERT(0);
// Reset the repeat timer when a key is released.
// This fixes jumping when you release Left and Right at the same
// time (e.g. after tapping Left+Right to change sort).
if( type == IET_RELEASE )
{
FOREACH_EnabledPlayer( p ) FOREACH_EnabledPlayer( p )
{ {
INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_LEFT) ); if( !bSelectIsPressed )
INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_RIGHT) ); {
bLeftIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_LEFT) );
bRightIsDown |= INPUTMAPPER->IsButtonDown( MenuInput(p, MENU_BUTTON_RIGHT) );
}
}
bool bBothDown = bLeftIsDown && bRightIsDown;
bool bNeitherDown = !bLeftIsDown && !bRightIsDown;
if( bBothDown || bNeitherDown )
{
m_MusicWheel.Move( 0 );
if( type == IET_FIRST_PRESS )
{
switch( MenuI.button )
{
case MENU_BUTTON_LEFT:
m_MusicWheel.ChangeMusic( -1 );
break;
case MENU_BUTTON_RIGHT:
m_MusicWheel.ChangeMusic( +1 );
break;
}
}
}
else if( bLeftIsDown )
{
if( type != IET_RELEASE )
m_MusicWheel.Move( -1 );
}
else if( bRightIsDown )
{
if( type != IET_RELEASE )
m_MusicWheel.Move( +1 );
}
else
{
ASSERT(0);
}
// Reset the repeat timer when the button is released.
// This fixes jumping when you release Left and Right after entering the sort
// code at the same if L & R aren't released at the exact same time.
if( type == IET_RELEASE )
{
FOREACH_HumanPlayer( p )
{
INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_LEFT) );
INPUTMAPPER->ResetKeyRepeat( MenuInput(p, MENU_BUTTON_RIGHT) );
}
} }
} }
break;
} }
@@ -1101,8 +1129,20 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
} }
else else
{ {
if( m_MusicWheel.GetSelectedType() != TYPE_SONG && m_MusicWheel.GetSelectedType() != TYPE_COURSE ) // Finish sort changing so that the wheel can respond immediately to our
// request to choose random.
m_MusicWheel.FinishChangingSorts();
switch( m_MusicWheel.GetSelectedType() )
{
case TYPE_SONG:
case TYPE_COURSE:
case TYPE_RANDOM:
case TYPE_PORTAL:
break;
default:
m_MusicWheel.StartRandom(); m_MusicWheel.StartRandom();
break;
}
MenuStart(PLAYER_INVALID); MenuStart(PLAYER_INVALID);
} }
return; return;