From 0dfdaee605456b716fae3c7c04b1e25344f3aa01 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 15 Jan 2005 02:01:26 +0000 Subject: [PATCH] remove some more old experimental stuff --- stepmania/src/GameState.cpp | 6 +-- stepmania/src/GameState.h | 6 --- stepmania/src/GhostArrowRow.cpp | 5 +- stepmania/src/NoteField.cpp | 5 +- stepmania/src/NoteFieldPositioning.cpp | 64 ++++++-------------------- stepmania/src/NoteFieldPositioning.h | 28 ++--------- stepmania/src/Player.cpp | 8 ++-- stepmania/src/ReceptorArrow.cpp | 8 +--- stepmania/src/ReceptorArrowRow.cpp | 5 +- stepmania/src/ScreenEdit.cpp | 1 + stepmania/src/ScreenGameplay.cpp | 1 + stepmania/src/ScreenHowToPlay.cpp | 1 + stepmania/src/ScreenNameEntry.cpp | 4 +- 13 files changed, 34 insertions(+), 108 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index d4caf28828..d02d4246a9 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -29,6 +29,7 @@ #include "CommonMetrics.h" #include "Actor.h" #include "PlayerState.h" +#include "Style.h" #include #include @@ -41,7 +42,6 @@ GameState* GAMESTATE = NULL; // global and accessable from anywhere in our progr GameState::GameState() { - m_pPosition = NULL; m_pCurStyle = NULL; m_pCurGame = NULL; @@ -71,7 +71,6 @@ GameState::GameState() GameState::~GameState() { - SAFE_DELETE( m_pPosition ); for( unsigned i=0; iReset(); diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 66e28424a5..408e341ba0 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -19,7 +19,6 @@ class Course; class Trail; class Game; class Style; -class NoteFieldPositioning; class Character; class TimingData; struct StageStats; @@ -249,11 +248,6 @@ public: deque m_vLastPeakComboAwards[NUM_PLAYERS]; - // - // Arrow positioning - // - NoteFieldPositioning *m_pPosition; - // // Attract stuff // diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp index 56bd7adce5..9ebe9b25ec 100644 --- a/stepmania/src/GhostArrowRow.cpp +++ b/stepmania/src/GhostArrowRow.cpp @@ -10,6 +10,7 @@ #include "NoteFieldPositioning.h" #include "Game.h" #include "PlayerState.h" +#include "Style.h" GhostArrowRow::GhostArrowRow() @@ -108,13 +109,13 @@ void GhostArrowRow::DrawPrimitives() // TODO: Remove indexing by PlayerNumber. PlayerNumber pn = m_pPlayerState->m_PlayerNumber; - g_NoteFieldMode[pn].BeginDrawTrack(c); + NoteFieldMode::BeginDrawTrack( pn, c ); m_GhostDim[c]->Draw(); m_GhostBright[c]->Draw(); m_HoldGhost[c]->Draw(); - g_NoteFieldMode[pn].EndDrawTrack(c); + NoteFieldMode::EndDrawTrack( c ); } } diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 208ec5dbb4..8a8d79e76d 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -16,6 +16,7 @@ #include "song.h" #include "ScreenDimensions.h" #include "PlayerState.h" +#include "Style.h" NoteField::NoteField() { @@ -527,7 +528,7 @@ void NoteField::DrawPrimitives() { // TODO: Remove use of PlayerNumber. PlayerNumber pn = m_pPlayerState->m_PlayerNumber; - g_NoteFieldMode[pn].BeginDrawTrack(c); + NoteFieldMode::BeginDrawTrack( pn, c ); // // Draw all HoldNotes in this column (so that they appear under the tap notes) @@ -642,7 +643,7 @@ void NoteField::DrawPrimitives() } - g_NoteFieldMode[pn].EndDrawTrack(c); + NoteFieldMode::EndDrawTrack( c ); } cur->m_GhostArrowRow.Draw(); diff --git a/stepmania/src/NoteFieldPositioning.cpp b/stepmania/src/NoteFieldPositioning.cpp index fbc86e389d..a7f4caeaf8 100644 --- a/stepmania/src/NoteFieldPositioning.cpp +++ b/stepmania/src/NoteFieldPositioning.cpp @@ -2,67 +2,29 @@ #include "NoteFieldPositioning.h" #include "RageDisplay.h" -#include "RageUtil.h" #include "RageLog.h" -#include "RageMath.h" - #include "GameState.h" -#include "GameManager.h" -#include "IniFile.h" -#include "Game.h" -#include "ScreenDimensions.h" -#include "PlayerState.h" -#include "XmlFile.h" +#include "Style.h" -/* Copies of the current mode. Update this by calling Load. */ -NoteFieldMode g_NoteFieldMode[NUM_PLAYERS]; - -NoteFieldMode::NoteFieldMode() -{ -} - -void NoteFieldMode::BeginDrawTrack(int tn) +void NoteFieldMode::BeginDrawTrack( PlayerNumber pn, int iTrack ) { DISPLAY->CameraPushMatrix(); - if(tn != -1) - { - DISPLAY->PushMatrix(); - DISPLAY->Translate( m_fPositionTrackX[tn], 0, 0 ); - } -} + ASSERT( iTrack != -1 ); -void NoteFieldMode::EndDrawTrack(int tn) -{ - if(tn != -1) - DISPLAY->PopMatrix(); - - DISPLAY->CameraPopMatrix(); -} - -NoteFieldPositioning::NoteFieldPositioning(CString fn) -{ -} - -bool NoteFieldMode::MatchesCurrentGame() const -{ - return true; -} - -void NoteFieldPositioning::Load(PlayerNumber pn) -{ - NoteFieldMode &mode = g_NoteFieldMode[pn]; - - mode = NoteFieldMode(); /* reset */ + DISPLAY->PushMatrix(); const Style *s = GAMESTATE->GetCurrentStyle(); + const float fPixelXOffsetFromCenter = s->m_ColumnInfo[pn][iTrack].fXOffset; + DISPLAY->Translate( fPixelXOffsetFromCenter, 0, 0 ); +} - /* Load the settings in the style table by default. */ - for(int tn = 0; tn < MAX_NOTE_TRACKS; ++tn) - { - const float fPixelXOffsetFromCenter = s->m_ColumnInfo[pn][tn].fXOffset; - mode.m_fPositionTrackX[tn] = fPixelXOffsetFromCenter; - } +void NoteFieldMode::EndDrawTrack( int iTrack ) +{ + ASSERT( iTrack != -1 ); + + DISPLAY->PopMatrix(); + DISPLAY->CameraPopMatrix(); } diff --git a/stepmania/src/NoteFieldPositioning.h b/stepmania/src/NoteFieldPositioning.h index 774c9db0d1..c146b6c69d 100644 --- a/stepmania/src/NoteFieldPositioning.h +++ b/stepmania/src/NoteFieldPositioning.h @@ -2,35 +2,13 @@ #define NOTEFIELD_POSITIONING_H #include "PlayerNumber.h" -#include "Style.h" -#include "Command.h" -class IniFile; -struct XNode; - -struct NoteFieldMode +namespace NoteFieldMode { - NoteFieldMode(); - bool MatchesCurrentGame() const; - - void BeginDrawTrack(int tn); - void EndDrawTrack(int tn); - - float m_fPositionTrackX[MAX_NOTE_TRACKS]; + void BeginDrawTrack( PlayerNumber pn, int iTrack ); + void EndDrawTrack( int iTrack ); }; -class NoteFieldPositioning -{ -public: - NoteFieldPositioning(CString fn); - void Load(PlayerNumber pn); - -private: - vector Modes; -}; - -extern NoteFieldMode g_NoteFieldMode[NUM_PLAYERS]; - #endif /* diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index bbd303dde9..1e9cf4882f 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -33,6 +33,7 @@ #include "PlayerState.h" #include "GameplayMessages.h" #include "GameSoundManager.h" +#include "Style.h" ThemeMetric GRAY_ARROWS_Y_STANDARD ("Player","ReceptorArrowsYStandard"); ThemeMetric GRAY_ARROWS_Y_REVERSE ("Player","ReceptorArrowsYReverse"); @@ -156,9 +157,6 @@ void Player::Load( const NoteData& noteData ) GAMESTATE->ResetNoteSkinsForPlayer( pn ); - /* Ensure that this is up-to-date. */ - GAMESTATE->m_pPosition->Load(pn); - // init steps m_NoteData.Init(); bool bOniDead = GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY && @@ -617,11 +615,11 @@ void Player::DrawHoldJudgments() for( int c=0; cm_PlayerNumber; - - NoteFieldMode &mode = g_NoteFieldMode[pn]; - CString sButton = mode.GrayButtonNames[iColNo]; - if( sButton == "" ) - sButton = GAMESTATE->GetCurrentGame()->ColToButtonName( iColNo ); + CString sButton = GAMESTATE->GetCurrentGame()->ColToButtonName( iColNo ); CString sPath; m_pReceptorWaiting.Load( NOTESKIN->GetPathToFromNoteSkinAndButton(NoteSkin,sButton,"receptor waiting") ); diff --git a/stepmania/src/ReceptorArrowRow.cpp b/stepmania/src/ReceptorArrowRow.cpp index ee71e077cf..b2d418b2ef 100644 --- a/stepmania/src/ReceptorArrowRow.cpp +++ b/stepmania/src/ReceptorArrowRow.cpp @@ -8,6 +8,7 @@ #include "PrefsManager.h" #include "NoteFieldPositioning.h" #include "PlayerState.h" +#include "Style.h" ReceptorArrowRow::ReceptorArrowRow() @@ -58,9 +59,9 @@ void ReceptorArrowRow::DrawPrimitives() for( int c=0; c SECONDS_TO_SHOW ("ScreenHowToPlay","SecondsToShow"); static const ThemeMetric STEPFILE ("ScreenHowToPlay","Stepfile"); diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index a0c789f1ce..c5777a87be 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -19,6 +19,7 @@ #include "Game.h" #include "ScreenDimensions.h" #include "PlayerState.h" +#include "Style.h" // @@ -178,9 +179,6 @@ ScreenNameEntry::ScreenNameEntry( CString sClassName ) : Screen( sClassName ) ASSERT( GAMESTATE->IsHumanPlayer(p) ); // they better be enabled if they made a high score! - /* Ensure that this is up-to-date. */ - GAMESTATE->m_pPosition->Load( (PlayerNumber)p ); - float fPlayerX = PLAYER_X(p,GAMESTATE->GetCurrentStyle()->m_StyleType); m_ReceptorArrowRow[p].Load( GAMESTATE->m_pPlayerState[p], GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.m_sNoteSkin, 0 );