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

implement SuperShuffleTaps without 4s

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-23 05:16:09 +00:00
parent f55f7e0a08
commit f82894ec47
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+15 -8
View File
@@ -741,21 +741,28 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
static void SuperShuffleTaps( NoteData &inout, int iStartIndex, int iEndIndex ) static void SuperShuffleTaps( NoteData &inout, int iStartIndex, int iEndIndex )
{ {
// convertTo4s before calling this // convert to 2sAnd3s before calling this
ASSERT( inout.GetNumHoldNotes() == 0 ); ASSERT( inout.GetNumHoldNotes() == 0 );
/* We already did the normal shuffling code above, which did a good job /* We already did the normal shuffling code above, which did a good job
* of shuffling HoldNotes without creating impossible patterns. * of shuffling HoldNotes without creating impossible patterns.
* Now, go in and shuffle the TapNotes per-row. * Now, go in and shuffle the TapNotes per-row.
* *
* This is only called by NoteDataUtil::Turn. "in" is in 4s, and iStartIndex * This is only called by NoteDataUtil::Turn. "in" is in 2sAnd3s. */
* and iEndIndex are in range. */
FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( inout, r, iStartIndex, iEndIndex ) FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( inout, r, iStartIndex, iEndIndex )
{ {
for( int t1=0; t1<inout.GetNumTracks(); t1++ ) for( int t1=0; t1<inout.GetNumTracks(); t1++ )
{ {
const TapNote tn1 = inout.GetTapNote(t1, r); const TapNote tn1 = inout.GetTapNote(t1, r);
if( tn1.type == TapNote::hold ) switch( tn1.type )
{
case TapNote::empty:
case TapNote::hold_head:
case TapNote::hold_tail:
continue;
}
if( inout.IsHoldNoteAtBeat(t1,r) )
continue; continue;
// a tap that is not part of a hold // a tap that is not part of a hold
@@ -764,7 +771,7 @@ static void SuperShuffleTaps( NoteData &inout, int iStartIndex, int iEndIndex )
{ {
const int t2 = rand() % inout.GetNumTracks(); const int t2 = rand() % inout.GetNumTracks();
const TapNote tn2 = inout.GetTapNote(t2, r); const TapNote tn2 = inout.GetTapNote(t2, r);
if( tn2.type == TapNote::hold ) // a tap that is not part of a hold if( inout.IsHoldNoteAtBeat(t2,r) )
continue; continue;
// swap // swap
@@ -788,9 +795,9 @@ void NoteDataUtil::Turn( NoteData &inout, StepsType st, TrackMapping tt, int iSt
if( tt == super_shuffle ) if( tt == super_shuffle )
{ {
NoteData tempNoteData2; // write into here as we tranform NoteData tempNoteData2; // write into here as we tranform
tempNoteData2.To4s( tempNoteData ); tempNoteData2.To2sAnd3s( tempNoteData );
SuperShuffleTaps( tempNoteData2, iStartIndex, iEndIndex ); /* expects 4s */ SuperShuffleTaps( tempNoteData2, iStartIndex, iEndIndex ); /* expects 2sAnd3s */
tempNoteData.From4s( tempNoteData2 ); tempNoteData.From2sAnd3s( tempNoteData2 );
} }
inout.CopyAll( tempNoteData ); inout.CopyAll( tempNoteData );