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

fix popping in converge + boomerang

Browse Source
This commit is contained in:
Chris Danford
2004-08-29 05:56:51 +00:00
parent 1be5b1072d
commit c11c9283cd
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteField.cpp
+10 -2
View File
@@ -401,15 +401,23 @@ void NoteField::DrawPrimitives()
NoteDisplayCols *cur = SearchForSongBeat(); NoteDisplayCols *cur = SearchForSongBeat();
cur->m_ReceptorArrowRow.Draw(); cur->m_ReceptorArrowRow.Draw();
const PlayerOptions &current_po = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber];
// //
// Adjust draw range depending on some effects // Adjust draw range depending on some effects
// //
int iFirstPixelToDraw = m_iStartDrawingPixel; int iFirstPixelToDraw = m_iStartDrawingPixel;
// HACK: if boomerang and converge are on, then we want to draw much
// earlier to that the notes don't pop on screen.
float fConvergeTimesBoomerang =
current_po.m_fScrolls[PlayerOptions::SCROLL_CONVERGE] *
current_po.m_fAccels[PlayerOptions::ACCEL_BOOMERANG];
iFirstPixelToDraw += SCALE( fConvergeTimesBoomerang, 0.f, 1.f, 0.f, -SCREEN_HEIGHT/2 );
int iLastPixelToDraw = m_iEndDrawingPixel; int iLastPixelToDraw = m_iEndDrawingPixel;
float fDrawScale = 1; float fDrawScale = 1;
fDrawScale *= 1 + 0.5f * fabsf( GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fPerspectiveTilt ); fDrawScale *= 1 + 0.5f * fabsf( current_po.m_fPerspectiveTilt );
fDrawScale *= 1 + fabsf( GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fEffects[PlayerOptions::EFFECT_MINI] ); fDrawScale *= 1 + fabsf( current_po.m_fEffects[PlayerOptions::EFFECT_MINI] );
float fFirstDrawScale = g_NoteFieldMode[m_PlayerNumber].m_fFirstPixelToDrawScale; float fFirstDrawScale = g_NoteFieldMode[m_PlayerNumber].m_fFirstPixelToDrawScale;
float fLastDrawScale = g_NoteFieldMode[m_PlayerNumber].m_fLastPixelToDrawScale; float fLastDrawScale = g_NoteFieldMode[m_PlayerNumber].m_fLastPixelToDrawScale;