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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-18 07:28:48 +00:00
parent 33acee8ba0
commit fee5e3ff33
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/TimingData.cpp
+12 -16
View File
@@ -298,38 +298,34 @@ void TimingData::ScaleRegion( float fScale, int iStartIndex, int iEndIndex )
ASSERT( iStartIndex >= 0 ); ASSERT( iStartIndex >= 0 );
ASSERT( iStartIndex < iEndIndex ); ASSERT( iStartIndex < iEndIndex );
unsigned ix = 0; for ( unsigned i = 0; i < m_BPMSegments.size(); i++ )
for ( ix = 0; ix < m_BPMSegments.size(); ix++ )
{ {
const int iSegStart = m_BPMSegments[ix].m_iStartIndex; const int iSegStart = m_BPMSegments[i].m_iStartIndex;
if( iSegStart < iStartIndex ) if( iSegStart < iStartIndex )
continue; continue;
else if( iSegStart > iEndIndex ) else if( iSegStart > iEndIndex )
m_BPMSegments[ix].m_iStartIndex += lrintf( (iEndIndex - iStartIndex) * (fScale - 1) ); m_BPMSegments[i].m_iStartIndex += lrintf( (iEndIndex - iStartIndex) * (fScale - 1) );
else else
m_BPMSegments[ix].m_iStartIndex = lrintf( (iSegStart - iStartIndex) * fScale ) + iStartIndex; m_BPMSegments[i].m_iStartIndex = lrintf( (iSegStart - iStartIndex) * fScale ) + iStartIndex;
} }
for( ix = 0; ix < m_StopSegments.size(); ix++ ) for( unsigned i = 0; i < m_StopSegments.size(); i++ )
{ {
const int iSegStartRow = m_StopSegments[ix].m_iStartRow; const int iSegStartRow = m_StopSegments[i].m_iStartRow;
if( iSegStartRow < iStartIndex ) if( iSegStartRow < iStartIndex )
continue; continue;
else if( iSegStartRow > iEndIndex ) else if( iSegStartRow > iEndIndex )
m_StopSegments[ix].m_iStartRow += lrintf((iEndIndex - iStartIndex) * (fScale - 1)); m_StopSegments[i].m_iStartRow += lrintf((iEndIndex - iStartIndex) * (fScale - 1));
else else
m_StopSegments[ix].m_iStartRow = lrintf((iSegStartRow - iStartIndex) * fScale) + iStartIndex; m_StopSegments[i].m_iStartRow = lrintf((iSegStartRow - iStartIndex) * fScale) + iStartIndex;
} }
} }
void TimingData::ShiftRows( int iStartRow, int iRowsToShift ) void TimingData::ShiftRows( int iStartRow, int iRowsToShift )
{ {
unsigned ix = 0; for( unsigned i = 0; i < m_BPMSegments.size(); i++ )
for( ix = 0; ix < m_BPMSegments.size(); ix++ )
{ {
int &iSegStart = m_BPMSegments[ix].m_iStartIndex; int &iSegStart = m_BPMSegments[i].m_iStartIndex;
if( iSegStart < iStartRow ) if( iSegStart < iStartRow )
continue; continue;
@@ -337,9 +333,9 @@ void TimingData::ShiftRows( int iStartRow, int iRowsToShift )
iSegStart = max( iSegStart, iStartRow ); iSegStart = max( iSegStart, iStartRow );
} }
for( ix = 0; ix < m_StopSegments.size(); ix++ ) for( unsigned i = 0; i < m_StopSegments.size(); i++ )
{ {
int &iSegStartRow = m_StopSegments[ix].m_iStartRow; int &iSegStartRow = m_StopSegments[i].m_iStartRow;
if( iSegStartRow < iStartRow ) if( iSegStartRow < iStartRow )
continue; continue;
iSegStartRow += iRowsToShift; iSegStartRow += iRowsToShift;