Revert Quantize*.

Ended up being finicky and only working with some files.

Perhaps some ups needed downs or vice~versa.
This commit is contained in:
Jason Felds
2011-07-17 01:22:59 -04:00
parent c42ba8a422
commit b545c7d6d3
+8 -8
View File
@@ -2965,12 +2965,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
if( iCheckpointFrequencyRows > 0 ) if( iCheckpointFrequencyRows > 0 )
{ {
// "the first row after the start of the range that lands on a beat" // "the first row after the start of the range that lands on a beat"
int iFirstCheckpointInRange = QuantizeUp(m_iFirstUncrossedRow, int iFirstCheckpointInRange = ((m_iFirstUncrossedRow+iCheckpointFrequencyRows-1)
iCheckpointFrequencyRows); /iCheckpointFrequencyRows) * iCheckpointFrequencyRows;
// "the last row or first row earlier that lands on a beat" // "the last row or first row earlier that lands on a beat"
int iLastCheckpointInRange = QuantizeDown(iLastRowCrossed, int iLastCheckpointInRange = ((iLastRowCrossed)/iCheckpointFrequencyRows)
iCheckpointFrequencyRows); * iCheckpointFrequencyRows;
for( int r = iFirstCheckpointInRange; r <= iLastCheckpointInRange; r += iCheckpointFrequencyRows ) for( int r = iFirstCheckpointInRange; r <= iLastCheckpointInRange; r += iCheckpointFrequencyRows )
{ {
@@ -2992,12 +2992,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
int iTrack = nIter.Track(); int iTrack = nIter.Track();
// "the first row after the hold head that lands on a beat" // "the first row after the hold head that lands on a beat"
int iFirstCheckpointOfHold = QuantizeUp(iStartRow, int iFirstCheckpointOfHold = ((iStartRow+iCheckpointFrequencyRows)/iCheckpointFrequencyRows)
iCheckpointFrequencyRows); * iCheckpointFrequencyRows;
// "the end row or the first earlier row that lands on a beat" // "the end row or the first earlier row that lands on a beat"
int iLastCheckpointOfHold = QuantizeDown(iEndRow, int iLastCheckpointOfHold = ((iEndRow)/iCheckpointFrequencyRows)
iCheckpointFrequencyRows); * iCheckpointFrequencyRows;
// count the end of the hold as a checkpoint // count the end of the hold as a checkpoint
bool bHoldOverlapsRow = iFirstCheckpointOfHold <= r && r <= iLastCheckpointOfHold; bool bHoldOverlapsRow = iFirstCheckpointOfHold <= r && r <= iLastCheckpointOfHold;