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

MusicWheel::readyWheelItemsData remove ragetimer

Browse Source
This commit is contained in:
sukibaby
2024-08-06 16:16:47 -07:00
committed by teejusb
parent bfde995b60
commit 64fa8e9971
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheel.cpp
+11 -14
View File
@@ -970,23 +970,20 @@ std::vector<MusicWheelItemData *> & MusicWheel::getWheelItemsData(SortOrder so)
}
void MusicWheel::readyWheelItemsData(SortOrder so) {
if(m_WheelItemDatasStatus[so]!=VALID) {
RageTimer timer;
if(m_WheelItemDatasStatus[so] == VALID && so != SORT_PREFERRED)
return;
std::vector<MusicWheelItemData*> &aUnFilteredDatas = m__UnFilteredWheelItemDatas[so];
std::vector<MusicWheelItemData*> &aUnFilteredDatas = m__UnFilteredWheelItemDatas[so];
if(m_WheelItemDatasStatus[so]==INVALID) {
BuildWheelItemDatas( aUnFilteredDatas, so );
}
FilterWheelItemDatas( aUnFilteredDatas, m__WheelItemDatas[so], so );
// The preferred sort's songs are subject to change during a session (particularly if two players have different preferred songs)
// thus it's status should remain invalid so the wheel items are rebuilt each time in case of change.
if (so != SORT_PREFERRED) {
m_WheelItemDatasStatus[so]=VALID;
}
LOG->Trace( "MusicWheel sorting took: %f", timer.GetTimeSinceStart() );
if(m_WheelItemDatasStatus[so]==INVALID) {
BuildWheelItemDatas( aUnFilteredDatas, so );
}
FilterWheelItemDatas( aUnFilteredDatas, m__WheelItemDatas[so], so );
// The preferred sort's songs are subject to change during a session (particularly if two players have different preferred songs)
// thus it's status should remain invalid so the wheel items are rebuilt each time in case of change.
if (so != SORT_PREFERRED) {
m_WheelItemDatasStatus[so]=VALID;
}
}
void MusicWheel::FilterWheelItemDatas(std::vector<MusicWheelItemData *> &aUnFilteredDatas, std::vector<MusicWheelItemData *> &aFilteredData, SortOrder so )