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

fix flip

Browse Source
This commit is contained in:
Glenn Maynard
2003-05-17 21:39:32 +00:00
parent fd74e6e64d
commit 98aebfaffb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ArrowEffects.cpp
+8 -3
View File
@@ -90,12 +90,12 @@ float ArrowGetXPos( PlayerNumber pn, int iColNum, float fYPos )
float fMinX, fMaxX; float fMinX, fMaxX;
GAMESTATE->GetCurrentStyleDef()->GetMinAndMaxColX( pn, fMinX, fMaxX ); GAMESTATE->GetCurrentStyleDef()->GetMinAndMaxColX( pn, fMinX, fMaxX );
float fRealPixelOffset = GAMESTATE->GetCurrentStyleDef()->m_ColumnInfo[pn][iColNum].fXOffset; const float fRealPixelOffset = GAMESTATE->GetCurrentStyleDef()->m_ColumnInfo[pn][iColNum].fXOffset;
float fPositionBetween = SCALE( fRealPixelOffset, fMinX, fMaxX, -1, 1 ); const float fPositionBetween = SCALE( fRealPixelOffset, fMinX, fMaxX, -1, 1 );
float fRads = acosf( fPositionBetween ); float fRads = acosf( fPositionBetween );
fRads += fYPos * 6 / SCREEN_HEIGHT; fRads += fYPos * 6 / SCREEN_HEIGHT;
float fAdjustedPixelOffset = SCALE( cosf(fRads), -1, 1, fMinX, fMaxX ); const float fAdjustedPixelOffset = SCALE( cosf(fRads), -1, 1, fMinX, fMaxX );
fPixelOffsetFromCenter = fAdjustedPixelOffset - fRealPixelOffset; fPixelOffsetFromCenter = fAdjustedPixelOffset - fRealPixelOffset;
} }
@@ -103,7 +103,12 @@ float ArrowGetXPos( PlayerNumber pn, int iColNum, float fYPos )
if( fEffects[PlayerOptions::EFFECT_DRUNK] > 0 ) if( fEffects[PlayerOptions::EFFECT_DRUNK] > 0 )
fPixelOffsetFromCenter += fEffects[PlayerOptions::EFFECT_DRUNK] * ( cosf( RageTimer::GetTimeSinceStart() + iColNum*0.2f + fYPos*10/SCREEN_HEIGHT) * ARROW_SIZE*0.5f ); fPixelOffsetFromCenter += fEffects[PlayerOptions::EFFECT_DRUNK] * ( cosf( RageTimer::GetTimeSinceStart() + iColNum*0.2f + fYPos*10/SCREEN_HEIGHT) * ARROW_SIZE*0.5f );
if( fEffects[PlayerOptions::EFFECT_FLIP] > 0 ) if( fEffects[PlayerOptions::EFFECT_FLIP] > 0 )
{
fPixelOffsetFromCenter *= SCALE(fEffects[PlayerOptions::EFFECT_FLIP], 0.f, 1.f, 1.f, -1.f); fPixelOffsetFromCenter *= SCALE(fEffects[PlayerOptions::EFFECT_FLIP], 0.f, 1.f, 1.f, -1.f);
const float fRealPixelOffset = GAMESTATE->GetCurrentStyleDef()->m_ColumnInfo[pn][iColNum].fXOffset;
const float fDistance = -fRealPixelOffset * 2;
fPixelOffsetFromCenter += fDistance * fEffects[PlayerOptions::EFFECT_FLIP];
}
return fPixelOffsetFromCenter; return fPixelOffsetFromCenter;
} }