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

non-brute-force search for nearest grading note, add bAllowGraded (not

Browse Source 
used yet)
This commit is contained in:
Glenn Maynard
2004-10-25 00:29:34 +00:00
parent 514f184fef
commit 515b57c8d3
2 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+39 -29
View File
@@ -605,46 +605,55 @@ void PlayerMinus::DrawHoldJudgments()
} }
} }
/* It's OK for this function to search a little more than was requested. */ int PlayerMinus::GetClosestNoteDirectional( int col, int iStartRow, int iMaxRowsAhead, bool bAllowGraded, bool bForward ) const
int PlayerMinus::GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsDistance, int iDirection ) const
{ {
// look for the closest matching step /* Be sure to check iStartRow itself, too. */
const int iIndexStartLookingAt = BeatToNoteRow( fBeat ); int iRow = iStartRow;
while( abs(iStartRow-iRow) <= iMaxRowsAhead )
/* Number of elements to examine on either end of iIndexStartLookingAt. Make
* sure we always round up. */
const int iNumElementsToExamine = BeatToNoteRow( fMaxBeatsDistance + 1 );
// Start at iIndexStartLookingAt and search outward.
for( int delta=0; delta < iNumElementsToExamine; delta++ )
{ {
int iCurrentIndex = iIndexStartLookingAt + (iDirection * delta); /* Is iRow the row we want? */
do
if( iCurrentIndex < 0) continue; {
if( m_NoteData.GetTapNote(col, iCurrentIndex).type == TapNote::empty) continue; /* no note here */ if( m_NoteData.GetTapNote(col, iRow).type == TapNote::empty )
if( m_NoteData.GetTapNoteScore(col, iCurrentIndex) != TNS_NONE ) continue; /* this note has a score already */ break;
if( !bAllowGraded && m_NoteData.GetTapNoteScore(col, iRow) != TNS_NONE )
return iCurrentIndex; break;
return iRow;
} }
while(0);
if( bForward && !m_NoteData.GetNextTapNoteRowForTrack( col, iRow ) )
return -1;
if( !bForward && !m_NoteData.GetPrevTapNoteRowForTrack( col, iRow ) )
return -1;
}
return -1; return -1;
} }
int PlayerMinus::GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind ) const /* Find the closest note to fBeat. */
int PlayerMinus::GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind, bool bAllowGraded ) const
{ {
int Fwd = GetClosestNoteDirectional(col, fBeat, fMaxBeatsAhead, 1); // look for the closest matching step
int Back = GetClosestNoteDirectional(col, fBeat, fMaxBeatsBehind, -1); const int iRow = BeatToNoteRow( fBeat );
if(Fwd == -1 && Back == -1) return -1; // Start at iIndexStartLookingAt and search outward.
if(Fwd == -1) return Back; int iNextIndex = GetClosestNoteDirectional( col, iRow, BeatToNoteRow(fMaxBeatsAhead), bAllowGraded, true );
if(Back == -1) return Fwd; int iPrevIndex = GetClosestNoteDirectional( col, iRow, BeatToNoteRow(fMaxBeatsBehind), bAllowGraded, false );
if( iNextIndex == -1 && iPrevIndex == -1 )
return -1;
if( iNextIndex == -1 )
return iPrevIndex;
if( iPrevIndex == -1 )
return iNextIndex;
/* Figure out which row is closer. */ /* Figure out which row is closer. */
const float DistToFwd = fabsf(fBeat-NoteRowToBeat(Fwd)); const float DistToFwd = fabsf( fBeat-NoteRowToBeat(iNextIndex) );
const float DistToBack = fabsf(fBeat-NoteRowToBeat(Back)); const float DistToBack = fabsf( fBeat-NoteRowToBeat(iPrevIndex) );
if( DistToFwd > DistToBack ) return Back; if( DistToFwd > DistToBack )
return Fwd; return iPrevIndex;
return iNextIndex;
} }
@@ -666,7 +675,8 @@ void PlayerMinus::Step( int col, RageTimer tm )
// //
int iIndexOverlappingNote = GetClosestNote( col, fSongBeat, int iIndexOverlappingNote = GetClosestNote( col, fSongBeat,
StepSearchDistanceForwards * GAMESTATE->m_fCurBPS * GAMESTATE->m_SongOptions.m_fMusicRate, StepSearchDistanceForwards * GAMESTATE->m_fCurBPS * GAMESTATE->m_SongOptions.m_fMusicRate,
StepSearchDistanceBackwards * GAMESTATE->m_fCurBPS * GAMESTATE->m_SongOptions.m_fMusicRate ); StepSearchDistanceBackwards * GAMESTATE->m_fCurBPS * GAMESTATE->m_SongOptions.m_fMusicRate,
false );
//LOG->Trace( "iIndexStartLookingAt = %d, iNumElementsToExamine = %d", iIndexStartLookingAt, iNumElementsToExamine ); //LOG->Trace( "iIndexStartLookingAt = %d, iNumElementsToExamine = %d", iIndexStartLookingAt, iNumElementsToExamine );
stepmania/src/Player.h
+2 -2
View File
@@ -71,8 +71,8 @@ protected:
void DrawTapJudgments(); void DrawTapJudgments();
void DrawHoldJudgments(); void DrawHoldJudgments();
int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection ) const; int GetClosestNoteDirectional( int col, int iStartRow, int iMaxRowsAhead, bool bAllowGraded, bool bForward ) const;
int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind ) const; int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind, bool bAllowGraded ) const;
PlayerNumber m_PlayerNumber; PlayerNumber m_PlayerNumber;
float m_fNoteFieldHeight; float m_fNoteFieldHeight;