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

make Quick transform more reasonable

Browse Source
This commit is contained in:
Chris Danford
2003-11-07 06:15:33 +00:00
parent cf579908cb
commit 97b8f7f6cc
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+12 -11
View File
@@ -556,39 +556,40 @@ void NoteDataUtil::Wide( NoteData &in, float fStartBeat, float fEndBeat )
void NoteDataUtil::Big( NoteData &in, float fStartBeat, float fEndBeat ) void NoteDataUtil::Big( NoteData &in, float fStartBeat, float fEndBeat )
{ {
InsertIntelligentTaps(in,1.0f,0.5f,false,fStartBeat,fEndBeat); // add 8ths between 4ths InsertIntelligentTaps(in,1.0f,0.5f,1.0f,false,fStartBeat,fEndBeat); // add 8ths between 4ths
} }
void NoteDataUtil::Quick( NoteData &in, float fStartBeat, float fEndBeat ) void NoteDataUtil::Quick( NoteData &in, float fStartBeat, float fEndBeat )
{ {
InsertIntelligentTaps(in,0.5f,0.25f,false,fStartBeat,fEndBeat); // add 16ths between 8ths InsertIntelligentTaps(in,0.5f,0.25f,1.0f,false,fStartBeat,fEndBeat); // add 16ths between 8ths
} }
void NoteDataUtil::Skippy( NoteData &in, float fStartBeat, float fEndBeat ) void NoteDataUtil::Skippy( NoteData &in, float fStartBeat, float fEndBeat )
{ {
InsertIntelligentTaps(in,1.0f,0.75f,true,fStartBeat,fEndBeat); // add 16ths between 4ths InsertIntelligentTaps(in,1.0f,0.75f,1.0f,true,fStartBeat,fEndBeat); // add 16ths between 4ths
} }
void NoteDataUtil::InsertIntelligentTaps( NoteData &in, float fBeatInterval, float fInsertBeatOffset, bool bSkippy, float fStartBeat, float fEndBeat ) void NoteDataUtil::InsertIntelligentTaps( NoteData &in, float fWindowSizeBeats, float fInsertOffsetBeats, float fWindowStrideBeats, bool bSkippy, float fStartBeat, float fEndBeat )
{ {
ASSERT( fInsertBeatOffset <= fBeatInterval ); ASSERT( fInsertOffsetBeats <= fWindowSizeBeats );
ASSERT( fWindowSizeBeats <= fWindowStrideBeats );
in.ConvertHoldNotesTo4s(); in.ConvertHoldNotesTo4s();
/* Start on a multiple of fBeatInterval. */ /* Start on a multiple of fBeatInterval. */
fStartBeat = froundf( fStartBeat, fBeatInterval ); fStartBeat = froundf( fStartBeat, fWindowStrideBeats );
// Insert a beat in the middle of every fBeatInterval. // Insert a beat in the middle of every fBeatInterval.
const int first_row = BeatToNoteRow( fStartBeat ); const int first_row = BeatToNoteRow( fStartBeat );
const int last_row = min( BeatToNoteRow(fEndBeat), in.GetLastRow() ); const int last_row = min( BeatToNoteRow(fEndBeat), in.GetLastRow() );
const int rows_per_interval = BeatToNoteRow( fBeatInterval ); const int rows_per_window = BeatToNoteRow( fWindowSizeBeats );
const int insert_row_offset = BeatToNoteRow( fInsertBeatOffset ); const int rows_per_stride = BeatToNoteRow( fWindowStrideBeats );
const int insert_row_offset = BeatToNoteRow( fInsertOffsetBeats );
for( int i=first_row; i<last_row; i+=rows_per_interval ) for( int i=first_row; i<last_row; i+=rows_per_stride )
{ {
int iRowEarlier = i; int iRowEarlier = i;
int iRowLater = i + rows_per_interval; int iRowLater = i + rows_per_window;
int iRowToAdd = i + insert_row_offset; int iRowToAdd = i + insert_row_offset;
if( in.GetNumTapNonEmptyTracks(iRowEarlier)!=1 || in.GetNumTracksWithTap(iRowEarlier)!=1 ) if( in.GetNumTapNonEmptyTracks(iRowEarlier)!=1 || in.GetNumTracksWithTap(iRowEarlier)!=1 )
continue; continue;
stepmania/src/NoteDataUtil.h
+1 -1
View File
@@ -47,7 +47,7 @@ namespace NoteDataUtil
void Big( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 ); void Big( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 );
void Quick( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 ); void Quick( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 );
void Skippy( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 ); void Skippy( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 );
void InsertIntelligentTaps( NoteData &in, float fBeatInterval, float fInsertBeatOffset, bool bSkippy, float fStartBeat = 0, float fEndBeat = 99999 ); void InsertIntelligentTaps( NoteData &in, float fWindowSizeBeats, float fInsertOffsetBeats, float fWindowStrideBeats, bool bSkippy, float fStartBeat = 0, float fEndBeat = 99999 );
void Mines( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 ); void Mines( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 );
void Echo( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 ); void Echo( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 );
void Planted( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 ); void Planted( NoteData &in, float fStartBeat = 0, float fEndBeat = 99999 );