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

NoteData handled.

Browse Source
This commit is contained in:
Jason Felds
2013-05-01 22:03:47 -04:00
parent 2b12717c02
commit d945ee21cb
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteDataUtil.cpp
+11 -10
View File
@@ -345,18 +345,19 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
SplitCompositeNoteData( in, parts ); SplitCompositeNoteData( in, parts );
FOREACH( NoteData, parts, nd ) for (NoteData &nd : parts)
{ {
InsertHoldTails( *nd ); InsertHoldTails( nd );
fLastBeat = max( fLastBeat, nd->GetLastBeat() ); fLastBeat = max( fLastBeat, nd.GetLastBeat() );
} }
int iLastMeasure = int( fLastBeat/BEATS_PER_MEASURE ); int iLastMeasure = int( fLastBeat/BEATS_PER_MEASURE );
sRet = ""; sRet = "";
FOREACH( NoteData, parts, nd ) int partNum = 0;
for (NoteData const &nd : parts)
{ {
if( nd != parts.begin() ) if( partNum++ != 0 )
sRet.append( "&\n" ); sRet.append( "&\n" );
for( int m = 0; m <= iLastMeasure; ++m ) // foreach measure for( int m = 0; m <= iLastMeasure; ++m ) // foreach measure
{ {
@@ -364,7 +365,7 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
sRet.append( 1, ',' ); sRet.append( 1, ',' );
sRet += ssprintf(" // measure %d\n", m); sRet += ssprintf(" // measure %d\n", m);
NoteType nt = GetSmallestNoteTypeForMeasure( *nd, m ); NoteType nt = GetSmallestNoteTypeForMeasure( nd, m );
int iRowSpacing; int iRowSpacing;
if( nt == NoteType_Invalid ) if( nt == NoteType_Invalid )
iRowSpacing = 1; iRowSpacing = 1;
@@ -378,9 +379,9 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
for( int r=iMeasureStartRow; r<=iMeasureLastRow; r+=iRowSpacing ) for( int r=iMeasureStartRow; r<=iMeasureLastRow; r+=iRowSpacing )
{ {
for( int t = 0; t < nd->GetNumTracks(); ++t ) for( int t = 0; t < nd.GetNumTracks(); ++t )
{ {
const TapNote &tn = nd->GetTapNote(t, r); const TapNote &tn = nd.GetTapNote(t, r);
char c; char c;
switch( tn.type ) switch( tn.type )
{ {
@@ -1026,8 +1027,8 @@ void NoteDataUtil::RemoveSimultaneousNotes( NoteData &in, int iMaxSimultaneous,
vector<NoteData> vParts; vector<NoteData> vParts;
SplitCompositeNoteData( in, vParts ); SplitCompositeNoteData( in, vParts );
FOREACH( NoteData, vParts, nd ) for (NoteData &nd : vParts)
RemoveSimultaneousNotes( *nd, iMaxSimultaneous, iStartIndex, iEndIndex ); RemoveSimultaneousNotes( nd, iMaxSimultaneous, iStartIndex, iEndIndex );
in.Init(); in.Init();
in.SetNumTracks( vParts.front().GetNumTracks() ); in.SetNumTracks( vParts.front().GetNumTracks() );
CombineCompositeNoteData( in, vParts ); CombineCompositeNoteData( in, vParts );