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

pull autosync into a separate function

Browse Source
This commit is contained in:
Glenn Maynard
2003-03-26 18:48:19 +00:00
parent 14b4200f1b
commit fdcad04705
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+23 -17
View File
@@ -394,23 +394,8 @@ void Player::Step( int col )
LOG->Trace("(%2d/%2d)Note offset: %f, Score: %i", m_iOffsetSample, SAMPLE_COUNT, fNoteOffset, score); LOG->Trace("(%2d/%2d)Note offset: %f, Score: %i", m_iOffsetSample, SAMPLE_COUNT, fNoteOffset, score);
SetTapNoteScore(col, iIndexOverlappingNote, score); SetTapNoteScore(col, iIndexOverlappingNote, score);
if (score>=TNS_GREAT )
if( GAMESTATE->m_SongOptions.m_bAutoSync && score>=TNS_GREAT ) HandleAutosync(fNoteOffset);
{
m_fOffset[m_iOffsetSample++] = fNoteOffset;
if (m_iOffsetSample >= SAMPLE_COUNT)
{
float mean = calc_mean(m_fOffset, m_fOffset+SAMPLE_COUNT);
float stddev = calc_stddev(m_fOffset, m_fOffset+SAMPLE_COUNT);
if (stddev < .03 && stddev < fabsf(mean)) { //If they stepped with less than .03 error
GAMESTATE->m_pCurSong->m_fBeat0OffsetInSeconds += mean;
LOG->Trace("Offset corrected by %f. Error in steps: %f seconds.", mean, stddev);
} else
LOG->Trace("Offset NOT corrected. Average offset: %f seconds. Error: %f seconds.", mean, stddev);
m_iOffsetSample = 0;
}
}
if (score > TNS_NONE && IsRowComplete(iIndexOverlappingNote, TNS_BOO) ) if (score > TNS_NONE && IsRowComplete(iIndexOverlappingNote, TNS_BOO) )
OnRowDestroyed( score, iIndexOverlappingNote ); OnRowDestroyed( score, iIndexOverlappingNote );
@@ -420,6 +405,27 @@ void Player::Step( int col )
m_GrayArrowRow.Step( col ); m_GrayArrowRow.Step( col );
} }
void Player::HandleAutosync(float fNoteOffset)
{
if( !GAMESTATE->m_SongOptions.m_bAutoSync )
return;
m_fOffset[m_iOffsetSample++] = fNoteOffset;
if (m_iOffsetSample < SAMPLE_COUNT)
return; /* need more */
const float mean = calc_mean(m_fOffset, m_fOffset+SAMPLE_COUNT);
const float stddev = calc_stddev(m_fOffset, m_fOffset+SAMPLE_COUNT);
if (stddev < .03 && stddev < fabsf(mean)) { //If they stepped with less than .03 error
GAMESTATE->m_pCurSong->m_fBeat0OffsetInSeconds += mean;
LOG->Trace("Offset corrected by %f. Error in steps: %f seconds.", mean, stddev);
} else
LOG->Trace("Offset NOT corrected. Average offset: %f seconds. Error: %f seconds.", mean, stddev);
m_iOffsetSample = 0;
}
void Player::OnRowDestroyed( TapNoteScore lastScore, int iIndexThatWasSteppedOn ) void Player::OnRowDestroyed( TapNoteScore lastScore, int iIndexThatWasSteppedOn )
{ {
LOG->Trace( "Player::OnRowDestroyed" ); LOG->Trace( "Player::OnRowDestroyed" );
stepmania/src/Player.h
+1
View File
@@ -56,6 +56,7 @@ protected:
void OnRowDestroyed( TapNoteScore lastScore, int iStepIndex ); void OnRowDestroyed( TapNoteScore lastScore, int iStepIndex );
void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow ); void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow );
void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore ); void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore );
void HandleAutosync(float fNoteOffset);
int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection ); int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection );
int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind ); int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind );