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

[timing] make sure the segments are sorted

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-07-17 13:03:21 +07:00
parent de3916297e
commit e6be564be8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+12 -1
View File
@@ -32,11 +32,17 @@ void TimingData::GetActualBPM( float &fMinBPMOut, float &fMaxBPMOut, float highe
}
}
struct ts_less : binary_function <TimingSegment *, TimingSegment *, bool> {
bool operator() (const TimingSegment *x, const TimingSegment *y) const {
return (*x) < (*y);
}
};
void TimingData::AddSegment(TimingSegmentType tst, TimingSegment * seg)
{
vector<TimingSegment *> &segs = this->allTimingSegments[tst];
// Unsure if this uses the proper comparison.
segs.insert(upper_bound(segs.begin(), segs.end(), seg), seg);
segs.insert(upper_bound(segs.begin(), segs.end(), seg, ts_less()), seg);
}
int TimingData::GetSegmentIndexAtRow(TimingSegmentType tst,
@@ -984,6 +990,11 @@ float TimingData::GetDisplayedBeat( float fBeat ) const
const vector<TimingSegment *> &scrolls = this->allTimingSegments[SEGMENT_SCROLL];
vector<TimingSegment *>::const_iterator it = scrolls.begin(), end = scrolls.end();
float fOutBeat = 0;
for( it = it + 1; it != end; it++ )
{
ASSERT((*(it-1))->GetBeat() <= (*it)->GetBeat());
}
it = scrolls.begin();
for( ; it != end; it++ )
{
if( it+1 == end || fBeat <= (*(it+1))->GetBeat() )