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

somewhat fix snapping

Browse Source 
hold notes are still a little odd
This commit is contained in:
Glenn Maynard
2003-06-17 20:08:17 +00:00
parent e6ce3c8e5c
commit a68b8a117e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+7
View File
@@ -1165,18 +1165,25 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType n
// iterate over all TapNotes in the interval and snap them // iterate over all TapNotes in the interval and snap them
for( int i=iNoteIndexBegin; i<=iNoteIndexEnd; i++ ) for( int i=iNoteIndexBegin; i<=iNoteIndexEnd; i++ )
{ {
LOG->Trace("index %i", i);
int iOldIndex = i; int iOldIndex = i;
float fOldBeat = NoteRowToBeat( iOldIndex ); float fOldBeat = NoteRowToBeat( iOldIndex );
float fNewBeat1 = froundf( fOldBeat, fSnapInterval1 ); float fNewBeat1 = froundf( fOldBeat, fSnapInterval1 );
float fNewBeat2 = froundf( fOldBeat, fSnapInterval2 ); float fNewBeat2 = froundf( fOldBeat, fSnapInterval2 );
LOG->Trace("oldbeat %.2f, nb1 %.2f, nb2 %.2f", fOldBeat, fNewBeat1, fNewBeat2);
bool bNewBeat1IsCloser = fabsf(fNewBeat1-fOldBeat) < fabsf(fNewBeat2-fOldBeat); bool bNewBeat1IsCloser = fabsf(fNewBeat1-fOldBeat) < fabsf(fNewBeat2-fOldBeat);
float fNewBeat = bNewBeat1IsCloser ? fNewBeat1 : fNewBeat2; float fNewBeat = bNewBeat1IsCloser ? fNewBeat1 : fNewBeat2;
int iNewIndex = BeatToNoteRow( fNewBeat ); int iNewIndex = BeatToNoteRow( fNewBeat );
LOG->Trace("closer %i, newbeat %.2f, index %i",
bNewBeat1IsCloser, fNewBeat, iNewIndex);
for( int c=0; c<in.GetNumTracks(); c++ ) for( int c=0; c<in.GetNumTracks(); c++ )
{ {
TapNote note = in.GetTapNote(c, iOldIndex); TapNote note = in.GetTapNote(c, iOldIndex);
if( note == TAP_EMPTY )
continue;
in.SetTapNote(c, iOldIndex, TAP_EMPTY); in.SetTapNote(c, iOldIndex, TAP_EMPTY);
// HoldNotes override TapNotes // HoldNotes override TapNotes
if(in.GetTapNote(c, iNewIndex) == TAP_TAP) if(in.GetTapNote(c, iNewIndex) == TAP_TAP)