handle Y values in GrayArrowRow and GhostArrowRow
This commit is contained in:
@@ -26,9 +26,10 @@ GhostArrowRow::GhostArrowRow()
|
||||
m_iNumCols = 0;
|
||||
}
|
||||
|
||||
void GhostArrowRow::Load( PlayerNumber pn )
|
||||
void GhostArrowRow::Load( PlayerNumber pn, float fYReverseOffset )
|
||||
{
|
||||
m_PlayerNumber = pn;
|
||||
m_fYReverseOffsetPixels = fYReverseOffset;
|
||||
|
||||
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
|
||||
|
||||
@@ -55,11 +56,6 @@ void GhostArrowRow::Load( PlayerNumber pn )
|
||||
m_GhostBright[c].Load( NOTESKIN->GetPathTo(pn, Button, "tap explosion bright") );
|
||||
m_GhostMine[c].Load( NOTESKIN->GetPathTo(pn, Button, "tap explosion mine") );
|
||||
m_HoldGhost[c].Load( NOTESKIN->GetPathTo(pn, Button, "hold explosion") );
|
||||
|
||||
m_GhostDim[c].SetX( pStyleDef->m_ColumnInfo[pn][c].fXOffset );
|
||||
m_GhostBright[c].SetX( pStyleDef->m_ColumnInfo[pn][c].fXOffset );
|
||||
m_GhostMine[c].SetX( pStyleDef->m_ColumnInfo[pn][c].fXOffset );
|
||||
m_HoldGhost[c].SetX( pStyleDef->m_ColumnInfo[pn][c].fXOffset );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,6 +68,25 @@ void GhostArrowRow::Update( float fDeltaTime )
|
||||
m_GhostBright[c].Update( fDeltaTime );
|
||||
m_GhostMine[c].Update( fDeltaTime );
|
||||
m_HoldGhost[c].Update( fDeltaTime );
|
||||
|
||||
const float fX = ArrowGetXPos( m_PlayerNumber, c, 0 );
|
||||
const float fY = ArrowGetYPos( m_PlayerNumber, c, 0, m_fYReverseOffsetPixels );
|
||||
const float fZ = ArrowGetZPos( m_PlayerNumber, c, 0 );
|
||||
|
||||
m_GhostDim[c].SetX( fX );
|
||||
m_GhostBright[c].SetX( fX );
|
||||
m_GhostMine[c].SetX( fX );
|
||||
m_HoldGhost[c].SetX( fX );
|
||||
|
||||
m_GhostDim[c].SetY( fY );
|
||||
m_GhostBright[c].SetY( fY );
|
||||
m_GhostMine[c].SetY( fY );
|
||||
m_HoldGhost[c].SetY( fY );
|
||||
|
||||
m_GhostDim[c].SetZ( fZ );
|
||||
m_GhostBright[c].SetZ( fZ );
|
||||
m_GhostMine[c].SetZ( fZ );
|
||||
m_HoldGhost[c].SetZ( fZ );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,18 +96,6 @@ void GhostArrowRow::DrawPrimitives()
|
||||
{
|
||||
g_NoteFieldMode[m_PlayerNumber].BeginDrawTrack(c);
|
||||
|
||||
float fX = ArrowGetXPos( m_PlayerNumber, c, 0 );
|
||||
m_GhostDim[c].SetX( fX );
|
||||
m_GhostBright[c].SetX( fX );
|
||||
m_GhostMine[c].SetX( fX );
|
||||
m_HoldGhost[c].SetX( fX );
|
||||
|
||||
float fZ = ArrowGetZPos( m_PlayerNumber, c, 0 );
|
||||
m_GhostDim[c].SetZ( fZ );
|
||||
m_GhostBright[c].SetZ( fZ );
|
||||
m_GhostMine[c].SetZ( fZ );
|
||||
m_HoldGhost[c].SetZ( fZ );
|
||||
|
||||
m_GhostDim[c].Draw();
|
||||
m_GhostBright[c].Draw();
|
||||
m_GhostMine[c].Draw();
|
||||
|
||||
Reference in New Issue
Block a user