editor BPM changing fixes: conditional was backwards, and epsilon
must be smaller since we're in BPS
This commit is contained in:
@@ -75,16 +75,16 @@ void TimingData::SetBPMAtBeat( float fBeat, float fBPM )
|
|||||||
if( m_BPMSegments[i].m_iStartIndex >= iNoteRow )
|
if( m_BPMSegments[i].m_iStartIndex >= iNoteRow )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if( i == m_BPMSegments.size() || m_BPMSegments[i].m_iStartIndex == iNoteRow )
|
if( i == m_BPMSegments.size() || m_BPMSegments[i].m_iStartIndex != iNoteRow )
|
||||||
{
|
{
|
||||||
// There is no BPMSegment at the specified beat. If the BPM being set differs
|
// There is no BPMSegment at the specified beat. If the BPM being set differs
|
||||||
// from the last BPMSegment's BPM, create a new BPMSegment.
|
// from the last BPMSegment's BPM, create a new BPMSegment.
|
||||||
if( i == 0 || fabsf(m_BPMSegments[i-1].m_fBPS - fBPS) > 0.003f )
|
if( i == 0 || fabsf(m_BPMSegments[i-1].m_fBPS - fBPS) > 1e-5f )
|
||||||
AddBPMSegment( BPMSegment(iNoteRow, fBPS) );
|
AddBPMSegment( BPMSegment(iNoteRow, fBPM) );
|
||||||
}
|
}
|
||||||
else // BPMSegment being modified is m_BPMSegments[i]
|
else // BPMSegment being modified is m_BPMSegments[i]
|
||||||
{
|
{
|
||||||
if( i > 0 && fabsf(m_BPMSegments[i-1].m_fBPS - fBPS) < 0.003f )
|
if( i > 0 && fabsf(m_BPMSegments[i-1].m_fBPS - fBPS) < 1e-5f )
|
||||||
m_BPMSegments.erase( m_BPMSegments.begin()+i,
|
m_BPMSegments.erase( m_BPMSegments.begin()+i,
|
||||||
m_BPMSegments.begin()+i+1);
|
m_BPMSegments.begin()+i+1);
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user