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

[timing] Better implementation of stop stuff.

Browse Source
This commit is contained in:
Jason Felds
2011-07-27 22:56:00 -04:00
parent b6fe8a0de0
commit 62ac849c95
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesWriterSM.cpp
+20 -8
View File
@@ -102,24 +102,36 @@ static void WriteGlobalTags( RageFile &f, Song &out )
} }
// TODO: make Delays into Stops that start one row before. // TODO: make Delays into Stops that start one row before.
f.Write( "#STOPS:" );
vector<TimingSegment *> &stops = timing.allTimingSegments[SEGMENT_STOP]; vector<TimingSegment *> &stops = timing.allTimingSegments[SEGMENT_STOP];
vector<TimingSegment *> &delays = timing.allTimingSegments[SEGMENT_DELAY];
map<float, float> allPauses;
for( unsigned i=0; i<stops.size(); i++ ) for( unsigned i=0; i<stops.size(); i++ )
{ {
const StopSegment *fs = static_cast<StopSegment *>(stops[i]); const StopSegment *fs = static_cast<StopSegment *>(stops[i]);
float fBeat = fs->GetBeat(); allPauses.insert(pair<float, float>(fs->GetBeat(),
// if (fs->GetDelay()) fBeat--; fs->GetPause()));
f.PutLine( ssprintf( "%.3f=%.3f", fBeat, fs->GetPause() ) );
if( i != stops.size()-1 )
f.Write( "," );
if( fs->GetPause() < 0 ) if( fs->GetPause() < 0 )
{ {
stops.erase(stops.begin()+i,stops.begin()+i+1 ); stops.erase(stops.begin()+i,stops.begin()+i+1 );
i--; i--;
} }
} }
// Delays can't be negative: thus, no effect.
FOREACH(TimingSegment *, delays, ss)
{
allPauses.insert(pair<float, float>(NoteRowToBeat((*ss)->GetRow() - 1),
static_cast<DelaySegment *>(*ss)->GetPause()));
}
f.Write( "#STOPS:" );
vector<RString> stopLines;
FOREACHM(float, float, allPauses, ap)
{
stopLines.push_back(ssprintf("%.3f=%.3f", ap->first, ap->second));
}
f.PutLine(join(",\n", stopLines));
f.PutLine( ";" ); f.PutLine( ";" );
FOREACH_BackgroundLayer( b ) FOREACH_BackgroundLayer( b )