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

style cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-26 06:00:52 +00:00
parent 324e07d383
commit 84f2b06713
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/TimingData.cpp
+23 -22
View File
@@ -197,57 +197,58 @@ float TimingData::GetElapsedTimeFromBeat( float fBeat ) const
return fElapsedTime; return fElapsedTime;
} }
void TimingData::ScaleRegion( float fScale, float fStartBeat, float fEndBeat ) { void TimingData::ScaleRegion( float fScale, float fStartBeat, float fEndBeat )
{
ASSERT( fScale > 0 ); ASSERT( fScale > 0 );
ASSERT( fStartBeat >= 0 ); ASSERT( fStartBeat >= 0 );
ASSERT( fStartBeat < fEndBeat ); ASSERT( fStartBeat < fEndBeat );
int ix = 0; unsigned ix = 0;
for (ix = 0; ix < m_BPMSegments.size(); ix++) { for ( ix = 0; ix < m_BPMSegments.size(); ix++ )
{
const float fSegStart = m_BPMSegments[ix].m_fStartBeat; const float fSegStart = m_BPMSegments[ix].m_fStartBeat;
if (fSegStart < fStartBeat) if( fSegStart < fStartBeat )
continue; continue;
else if (fSegStart > fEndBeat) else if( fSegStart > fEndBeat )
m_BPMSegments[ix].m_fStartBeat += (fEndBeat - fStartBeat) * (fScale - 1); m_BPMSegments[ix].m_fStartBeat += (fEndBeat - fStartBeat) * (fScale - 1);
else else
m_BPMSegments[ix].m_fStartBeat = (fSegStart - fStartBeat) * fScale + fStartBeat; m_BPMSegments[ix].m_fStartBeat = (fSegStart - fStartBeat) * fScale + fStartBeat;
} }
for (ix = 0; ix < m_StopSegments.size(); ix++) { for( ix = 0; ix < m_StopSegments.size(); ix++ )
{
const float fSegStart = m_StopSegments[ix].m_fStartBeat; const float fSegStart = m_StopSegments[ix].m_fStartBeat;
if (fSegStart < fStartBeat) if( fSegStart < fStartBeat )
continue; continue;
else if (fSegStart > fEndBeat) else if( fSegStart > fEndBeat )
m_StopSegments[ix].m_fStartBeat += (fEndBeat - fStartBeat) * (fScale - 1); m_StopSegments[ix].m_fStartBeat += (fEndBeat - fStartBeat) * (fScale - 1);
else else
m_StopSegments[ix].m_fStartBeat = (fSegStart - fStartBeat) * fScale + fStartBeat; m_StopSegments[ix].m_fStartBeat = (fSegStart - fStartBeat) * fScale + fStartBeat;
} }
} }
void TimingData::ShiftRows( float fStartBeat, float fBeatsToShift ) { void TimingData::ShiftRows( float fStartBeat, float fBeatsToShift )
int ix = 0; {
unsigned ix = 0;
for (ix = 0; ix < m_BPMSegments.size(); ix++) { for( ix = 0; ix < m_BPMSegments.size(); ix++ )
{
const float fSegStart = m_BPMSegments[ix].m_fStartBeat; const float fSegStart = m_BPMSegments[ix].m_fStartBeat;
if (fSegStart < fStartBeat) if( fSegStart < fStartBeat )
continue; continue;
else {
m_BPMSegments[ix].m_fStartBeat += fBeatsToShift; m_BPMSegments[ix].m_fStartBeat += fBeatsToShift;
if (m_BPMSegments[ix].m_fStartBeat < fStartBeat) m_BPMSegments[ix].m_fStartBeat = max( m_BPMSegments[ix].m_fStartBeat, fStartBeat );
m_BPMSegments[ix].m_fStartBeat = fStartBeat;
}
} }
for (ix = 0; ix < m_StopSegments.size(); ix++) { for( ix = 0; ix < m_StopSegments.size(); ix++ )
{
const float fSegStart = m_StopSegments[ix].m_fStartBeat; const float fSegStart = m_StopSegments[ix].m_fStartBeat;
if (fSegStart < fStartBeat) if( fSegStart < fStartBeat )
continue; continue;
else {
m_StopSegments[ix].m_fStartBeat += fBeatsToShift; m_StopSegments[ix].m_fStartBeat += fBeatsToShift;
if (m_StopSegments[ix].m_fStartBeat < fStartBeat) m_StopSegments[ix].m_fStartBeat = max( m_StopSegments[ix].m_fStartBeat, fStartBeat );
m_StopSegments[ix].m_fStartBeat = fStartBeat;
}
} }
} }