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

[br:warps] my changes to NotesLoaderSM for Negative Stops -> Warps. (still not working, sadly)

Browse Source
This commit is contained in:
AJ Kelly
2011-03-26 01:08:05 -05:00
parent 08700ed870
commit aac5710fb4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSM.cpp
+14 -6
View File
@@ -236,12 +236,11 @@ void SMLoader::LoadTimingFromSMFile( const MsdFile &msd, TimingData &out )
// get BPM at current row: // get BPM at current row:
BPMSegment curBPM = out.GetBPMSegmentAtRow(BeatToNoteRow(fFreezeBeat)); BPMSegment curBPM = out.GetBPMSegmentAtRow(BeatToNoteRow(fFreezeBeat));
float fSecondsPerBeat = 60 / curBPM.m_fBPS; float fSecondsPerBeat = 60 / curBPM.GetBPM();
// stop length (# measures to skip) = secsPerBeat * 8
float fSkipBeats = fFreezeSeconds/fSecondsPerBeat; float fSkipBeats = fFreezeSeconds/fSecondsPerBeat;
// WarpSegment wsTemp( BeatToNoteRow(fFreezeBeat), [unknown] ); WarpSegment wsTemp( BeatToNoteRow(fFreezeBeat), BeatToNoteRow(fFreezeBeat+fSkipBeats) );
// arrayWarpsFromNegativeStops.push_back( wsTemp ); arrayWarpsFromNegativeStops.push_back( wsTemp );
if( PREFSMAN->m_bQuirksMode ) if( PREFSMAN->m_bQuirksMode )
{ {
@@ -386,8 +385,17 @@ void SMLoader::LoadTimingFromSMFile( const MsdFile &msd, TimingData &out )
out.AddWarpSegment( arrayWarpsFromNegativeBPMs[j] ); out.AddWarpSegment( arrayWarpsFromNegativeBPMs[j] );
} }
} }
// warp sorting will need to take place. // do the same for Warps from Negative Stops.
//sort(out.m_WarpSegments.begin(), out.m_WarpSegments.end()); /*
if(arrayWarpsFromNegativeStops.size() > 0)
{
for( unsigned j=0; j<arrayWarpsFromNegativeStops.size(); j++ )
{
out.AddWarpSegment( arrayWarpsFromNegativeStops[j] );
}
}
*/
sort(out.m_WarpSegments.begin(), out.m_WarpSegments.end());
} }
} }