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

sm5svn 0dc297b [Glenn Maynard]

Browse Source 
"Previously, we didn't create MusicWheel sorts when the screen loads; it was delayed until the
screen begins.  This allowed preloading before the style is set.  However, it caused a
major skip when the screen starts, because creating the sorts is fairly expensive.

Refactor this.  Load the sorts when the screen is loaded, and then go through them
and quickly filter out unplayable data and handle other initialization on begin.
This is much faster, so we can more easily transition seamlessly from the previous
menu.

One known limitation: the sorts are created before we know the style, so we have to
guess.  This means if you're in a style like dance-solo or pump-halfdouble, sorts will
still be based on regular mode.  This affects the difficulty, top grade and roulette sorts."
This commit is contained in:
AJ Kelly
2011-03-08 21:09:38 -06:00
parent d3959d140e
commit 56bb3e8445
4 changed files with 252 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SongUtil.cpp
+38 -23
View File
@@ -460,8 +460,12 @@ static bool CompAscending( const pair<Song *, RString> &a, const pair<Song *, RS
void SongUtil::SortSongPointerArrayByGrades( vector<Song*> &vpSongsInOut, bool bDescending )
{
/* Optimize by pre-writing a string to compare, since doing GetNumNotesWithGrade
* inside the sort is too slow. */
StepsType st;
Difficulty dc;
SongUtil::GetStepsTypeAndDifficultyFromSortOrder( SORT_EASY_METER, st, dc );
/* Optimize by pre-writing a string to compare, since doing
* GetNumNotesWithGrade inside the sort is too slow. */
typedef pair< Song *, RString > val;
vector<val> vals;
vals.reserve( vpSongsInOut.size() );
@@ -472,10 +476,7 @@ void SongUtil::SortSongPointerArrayByGrades( vector<Song*> &vpSongsInOut, bool b
int iCounts[NUM_Grade];
const Profile *pProfile = PROFILEMAN->GetMachineProfile();
ASSERT( pProfile ); // XXX: Debugging.
const Style *pStyle = GAMESTATE->GetCurrentStyle();
ASSERT( pStyle ); // XXX: Debugging.
StepsType st = pStyle->m_StepsType;
ASSERT( pProfile );
pProfile->GetGrades( pSong, st, iCounts );
RString foo;
@@ -620,8 +621,12 @@ RString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
return RString();
case SORT_TOP_GRADES:
{
StepsType st;
Difficulty dc;
SongUtil::GetStepsTypeAndDifficultyFromSortOrder( so, st, dc );
int iCounts[NUM_Grade];
PROFILEMAN->GetMachineProfile()->GetGrades( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, iCounts );
PROFILEMAN->GetMachineProfile()->GetGrades( pSong, st, iCounts );
for( int i=Grade_Tier01; i<NUM_Grade; ++i )
{
@@ -968,6 +973,7 @@ bool SongUtil::GetStepsTypeAndDifficultyFromSortOrder( SortOrder so, StepsType &
return false;
}
bool bDoubles = false;
switch( so )
{
DEFAULT_FAIL( so );
@@ -976,27 +982,36 @@ bool SongUtil::GetStepsTypeAndDifficultyFromSortOrder( SortOrder so, StepsType &
case SORT_MEDIUM_METER:
case SORT_HARD_METER:
case SORT_CHALLENGE_METER:
stOut = GAMESTATE->GetCurrentStyle()->m_StepsType;
bDoubles = false;
break;
case SORT_DOUBLE_EASY_METER:
case SORT_DOUBLE_MEDIUM_METER:
case SORT_DOUBLE_HARD_METER:
case SORT_DOUBLE_CHALLENGE_METER:
stOut = GAMESTATE->GetCurrentStyle()->m_StepsType; // in case we don't find any matches below
vector<const Style*> vpStyles;
GAMEMAN->GetStylesForGame(GAMESTATE->m_pCurGame,vpStyles);
FOREACH_CONST( const Style*, vpStyles, i )
{
if( (*i)->m_StyleType == StyleType_OnePlayerTwoSides )
{
// Ugly hack to ignore pump's half-double.
bool bContainsHalf = ((RString)(*i)->m_szName).find("half") != RString::npos;
if( bContainsHalf )
continue;
stOut = (*i)->m_StepsType;
break;
}
}
bDoubles = true;
break;
}
stOut = StepsType_Invalid;
vector<const Style*> vpStyles;
GAMEMAN->GetStylesForGame(GAMESTATE->m_pCurGame,vpStyles);
FOREACH_CONST( const Style*, vpStyles, i )
{
if( !(*i)->m_bUsedForGameplay )
continue;
if( bDoubles && (*i)->m_StyleType != StyleType_OnePlayerTwoSides )
continue;
if( !bDoubles && (*i)->m_StyleType != StyleType_OnePlayerOneSide && (*i)->m_StyleType != StyleType_TwoPlayersTwoSides )
continue;
// Ugly hack to ignore pump's half-double.
bool bContainsHalf = ((RString)(*i)->m_szName).find("half") != RString::npos;
if( bContainsHalf )
continue;
stOut = (*i)->m_StepsType;
break;
}