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

Figures I missed warp conversions on SMA.

Browse Source 
Okay, I may have to start moving these functions
into the SM Loader at this rate.
This commit is contained in:
Jason Felds
2011-05-19 12:19:30 -04:00
parent ed78fa24aa
commit 526584d11e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSMA.cpp
+4 -4
View File
@@ -92,7 +92,7 @@ bool SMALoader::ProcessBPMs( TimingData &out, const int iRowsPerBeat, const RStr
if( negBPM < 0 ) if( negBPM < 0 )
{ {
float endBeat = fBeat + (fNewBPM / -negBPM) * (fBeat - negBeat); float endBeat = fBeat + (fNewBPM / -negBPM) * (fBeat - negBeat);
WarpSegment new_seg(negBeat, endBeat); WarpSegment new_seg(negBeat, endBeat - negBeat);
out.AddWarpSegment( new_seg ); out.AddWarpSegment( new_seg );
negBeat = -1; negBeat = -1;
@@ -108,7 +108,7 @@ bool SMALoader::ProcessBPMs( TimingData &out, const int iRowsPerBeat, const RStr
// add in a warp. // add in a warp.
if( highspeedBeat > 0 ) if( highspeedBeat > 0 )
{ {
WarpSegment new_seg(highspeedBeat, fBeat); WarpSegment new_seg(highspeedBeat, fBeat - highspeedBeat);
out.AddWarpSegment( new_seg ); out.AddWarpSegment( new_seg );
highspeedBeat = -1; highspeedBeat = -1;
} }
@@ -157,7 +157,7 @@ void SMALoader::ProcessStops( TimingData &out, const int iRowsPerBeat, const RSt
if( negBeat + fSkipBeats > fFreezeBeat ) if( negBeat + fSkipBeats > fFreezeBeat )
fSkipBeats = fFreezeBeat - negBeat; fSkipBeats = fFreezeBeat - negBeat;
WarpSegment ws( negBeat, negBeat + fSkipBeats); WarpSegment ws( negBeat, fSkipBeats);
out.AddWarpSegment( ws ); out.AddWarpSegment( ws );
negBeat = -1; negBeat = -1;
@@ -184,7 +184,7 @@ void SMALoader::ProcessStops( TimingData &out, const int iRowsPerBeat, const RSt
float fSecondsPerBeat = 60 / oldBPM.GetBPM(); float fSecondsPerBeat = 60 / oldBPM.GetBPM();
float fSkipBeats = negPause / fSecondsPerBeat; float fSkipBeats = negPause / fSecondsPerBeat;
WarpSegment ws( negBeat, negBeat + fSkipBeats); WarpSegment ws( negBeat, fSkipBeats);
out.AddWarpSegment( ws ); out.AddWarpSegment( ws );
} }
} }
src/Song.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
* @brief The internal version of the cache for StepMania. * @brief The internal version of the cache for StepMania.
* *
* Increment this value to invalidate the current cache. */ * Increment this value to invalidate the current cache. */
const int FILE_CACHE_VERSION = 174; const int FILE_CACHE_VERSION = 175;
/** @brief How long does a song sample last by default? */ /** @brief How long does a song sample last by default? */
const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f; const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;