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

get rid of the frame; it helps less now than it did when I added it,

Browse Source 
and the combo needs to be above the backdrop
This commit is contained in:
Glenn Maynard
2003-04-14 23:09:35 +00:00
parent 1f20439578
commit 577c8567d4
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+14 -8
View File
@@ -62,11 +62,10 @@ Player::Player()
m_iOffsetSample = 0; m_iOffsetSample = 0;
m_ArrowFrame.AddChild(&m_ArrowBackdrop); this->AddChild( &m_ArrowBackdrop );
m_ArrowFrame.AddChild(&m_NoteField); this->AddChild( &m_NoteField );
m_ArrowFrame.AddChild(&m_GrayArrowRow); this->AddChild( &m_GrayArrowRow );
m_ArrowFrame.AddChild(&m_GhostArrowRow); this->AddChild( &m_GhostArrowRow );
this->AddChild( &m_ArrowFrame );
this->AddChild( &m_Judgment ); this->AddChild( &m_Judgment );
this->AddChild( &m_Combo ); this->AddChild( &m_Combo );
for( int c=0; c<MAX_NOTE_TRACKS; c++ ) for( int c=0; c<MAX_NOTE_TRACKS; c++ )
@@ -159,7 +158,10 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset ); m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset );
} }
m_ArrowFrame.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y ); m_ArrowBackdrop.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
m_NoteField.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
m_GrayArrowRow.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
m_GhostArrowRow.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
if( GAMESTATE->m_PlayerOptions[pn].m_fEffects[PlayerOptions::EFFECT_MINI] == 1 ) if( GAMESTATE->m_PlayerOptions[pn].m_fEffects[PlayerOptions::EFFECT_MINI] == 1 )
{ {
@@ -268,7 +270,9 @@ void Player::Update( float fDeltaTime )
void Player::DrawPrimitives() void Player::DrawPrimitives()
{ {
m_Combo.Draw(); // draw this below everything else // Draw these below everything else.
m_ArrowBackdrop.Draw();
m_Combo.Draw();
float fTilt = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fPerspectiveTilt; float fTilt = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fPerspectiveTilt;
bool bReverse = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fReverseScroll==1; bool bReverse = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fReverseScroll==1;
@@ -288,7 +292,9 @@ void Player::DrawPrimitives()
DISPLAY->LookAt(Eye, At, Up); DISPLAY->LookAt(Eye, At, Up);
} }
m_ArrowFrame.Draw(); m_GrayArrowRow.Draw();
m_NoteField.Draw();
m_GhostArrowRow.Draw();
if( fTilt != 0 ) if( fTilt != 0 )
DISPLAY->ExitPerspective(); DISPLAY->ExitPerspective();
stepmania/src/Player.h
-1
View File
@@ -74,7 +74,6 @@ protected:
GrayArrowRow m_GrayArrowRow; GrayArrowRow m_GrayArrowRow;
NoteField m_NoteField; NoteField m_NoteField;
GhostArrowRow m_GhostArrowRow; GhostArrowRow m_GhostArrowRow;
ActorFrame m_ArrowFrame;
HoldJudgment m_HoldJudgment[MAX_NOTE_TRACKS]; HoldJudgment m_HoldJudgment[MAX_NOTE_TRACKS];