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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-03 03:39:15 +00:00
parent 38eaa83497
commit 9a164cd7b4
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+5 -22
View File
@@ -735,29 +735,12 @@ void ScreenEdit::Update( float fDeltaTime )
// Update trailing beat // Update trailing beat
float fDelta = GAMESTATE->m_fSongBeat - m_fTrailingBeat; float fDelta = GAMESTATE->m_fSongBeat - m_fTrailingBeat;
if( fabsf(fDelta) < 10 )
if( fabsf(fDelta) < 0.01 ) fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat,
{ fDeltaTime*40 / GAMESTATE->m_pPlayerState[PLAYER_1]->m_CurrentPlayerOptions.m_fScrollSpeed );
m_fTrailingBeat = GAMESTATE->m_fSongBeat; // snap
}
else else
{ fapproach( m_fTrailingBeat, GAMESTATE->m_fSongBeat,
float fSign = fDelta / fabsf(fDelta); fabsf(fDelta) * fDeltaTime*5 );
float fMoveDelta = fSign*fDeltaTime*40 / GAMESTATE->m_pPlayerState[PLAYER_1]->m_CurrentPlayerOptions.m_fScrollSpeed;
if( fabsf(fMoveDelta) > fabsf(fDelta) )
fMoveDelta = fDelta;
m_fTrailingBeat += fMoveDelta;
if( fabsf(fDelta) > 10 )
{
/* We're far off; move faster. Be sure to not overshoot. */
fMoveDelta = fDelta * fDeltaTime*5;
float fNewDelta = GAMESTATE->m_fSongBeat - m_fTrailingBeat;
if( fabsf(fMoveDelta) > fabsf(fNewDelta) )
fMoveDelta = fNewDelta;
m_fTrailingBeat += fMoveDelta;
}
}
PlayTicks(); PlayTicks();
} }