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

Simplify logic in GetYOffset for arrows

Browse Source 
No-op.
This commit is contained in:
Devin J. Pohly
2013-07-18 14:40:16 -04:00
parent bcd90324c7
commit 5c8d021e6e
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ArrowEffects.cpp
+9 -7
View File
@@ -256,16 +256,18 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float
* entirely time spacing (respectively). Occasionally, we tween between them. */
if( pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing != 1.0f )
{
float fBeatsUntilStep, fSpeedMultiplier;
float bShowEffects = !GAMESTATE->m_bInStepEditor;
float fBeatsUntilStep = fNoteBeat - fSongBeat;
if( bShowEffects )
if( !bShowEffects ) {
fBeatsUntilStep = fNoteBeat - fSongBeat;
fSpeedMultiplier = 1.0f;
} else {
fBeatsUntilStep = GetDisplayedBeat(pPlayerState, fNoteBeat) - GetDisplayedBeat(pPlayerState, fSongBeat);
float fYOffsetBeatSpacing = fBeatsUntilStep;
float fSpeedMultiplier = bShowEffects ?
pCurSteps->GetTimingData()->GetDisplayedSpeedPercent(
fSpeedMultiplier = pCurSteps->GetTimingData()->GetDisplayedSpeedPercent(
position.m_fSongBeatVisible,
position.m_fMusicSecondsVisible ) : 1.0f;
fYOffset += fSpeedMultiplier * fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing);
position.m_fMusicSecondsVisible );
}
fYOffset += fSpeedMultiplier * fBeatsUntilStep * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing);
}
if( pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing != 0.0f )