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

don't bother unloading "unused" note skins; now we just load all the note skins we'll need in advance for a whole round

Browse Source
This commit is contained in:
Glenn Maynard
2005-03-18 04:13:19 +00:00
parent 9a4283c8ee
commit b6b9b11b0f
5 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteField.cpp
+6 -30
View File
@@ -68,38 +68,14 @@ void NoteField::CacheNoteSkin( CString skin )
m_NoteDisplays[ skin ] = nd;
}
void NoteField::CacheAllUsedNoteSkins( bool bDeleteUnused )
void NoteField::CacheAllUsedNoteSkins()
{
/* Cache note skins. */
/* Cache all note skins that we might need for the whole song, course or battle
* play, so we don't have to load them later (such as between course songs). */
vector<CString> skins;
GAMESTATE->GetAllUsedNoteSkins( skins );
for( unsigned i=0; i < skins.size(); ++i )
CacheNoteSkin( skins[i] );
if( bDeleteUnused )
{
set<CString> setToDelete;
for( map<CString, NoteDisplayCols *>::iterator it = m_NoteDisplays.begin();
it != m_NoteDisplays.end(); ++it )
{
setToDelete.insert( it->first );
}
for( unsigned i=0; i < skins.size(); ++i )
{
CString sSkin = skins[i];
sSkin.ToLower();
setToDelete.erase( sSkin );
}
/* Free note skins that are no longer used. */
for( set<CString>::iterator it = setToDelete.begin(); it != setToDelete.end(); ++it )
{
NoteDisplayCols *pNoteDisplay = m_NoteDisplays[*it];
delete pNoteDisplay;
m_NoteDisplays.erase( *it );
}
}
}
void NoteField::Load(
@@ -120,9 +96,7 @@ void NoteField::Load(
ASSERT( m_pNoteData->GetNumTracks() == GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer );
/* If we're in gameplay, we havn't applied course modifiers yet, so we don't know what
* note skins we'll need. Don't delete unused skins yet. */
CacheAllUsedNoteSkins( false );
CacheAllUsedNoteSkins();
RefreshBeatToNoteSkin();
}
@@ -152,6 +126,8 @@ void NoteField::RefreshBeatToNoteSkin()
map<CString, NoteDisplayCols *>::iterator display = m_NoteDisplays.find( Skin );
if( display == m_NoteDisplays.end() )
{
/* Skins should always be loaded by CacheAllUsedNoteSkins. */
LOG->Warn( "NoteField::RefreshBeatToNoteSkin: need note skin \"%s\" which should have been loaded alraedy", Skin.c_str() );
this->CacheNoteSkin( Skin );
display = m_NoteDisplays.find( Skin );
}