From f8b90e0bcf5b6616e8a875a42085c46633881c2e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 15 Jan 2005 01:38:42 +0000 Subject: [PATCH] remove some old experimental stuff --- stepmania/src/NoteField.cpp | 9 ++------- stepmania/src/NoteFieldPositioning.cpp | 12 ------------ stepmania/src/NoteFieldPositioning.h | 4 ---- stepmania/src/Player.cpp | 6 ------ stepmania/src/Player.h | 2 -- 5 files changed, 2 insertions(+), 31 deletions(-) diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 1f2799cf51..208ec5dbb4 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -430,13 +430,8 @@ void NoteField::DrawPrimitives() fDrawScale *= 1 + 0.5f * fabsf( current_po.m_fPerspectiveTilt ); fDrawScale *= 1 + fabsf( current_po.m_fEffects[PlayerOptions::EFFECT_MINI] ); - // TODO: Remove use of PlayerNumber. - PlayerNumber pn = m_pPlayerState->m_PlayerNumber; - float fFirstDrawScale = g_NoteFieldMode[pn].m_fFirstPixelToDrawScale; - float fLastDrawScale = g_NoteFieldMode[pn].m_fLastPixelToDrawScale; - - iFirstPixelToDraw = (int)(iFirstPixelToDraw * fFirstDrawScale * fDrawScale); - iLastPixelToDraw = (int)(iLastPixelToDraw * fLastDrawScale * fDrawScale); + iFirstPixelToDraw = (int)(iFirstPixelToDraw * fDrawScale); + iLastPixelToDraw = (int)(iLastPixelToDraw * fDrawScale); // Probe for first and last notes on the screen diff --git a/stepmania/src/NoteFieldPositioning.cpp b/stepmania/src/NoteFieldPositioning.cpp index 7a36e211c9..17185a043f 100644 --- a/stepmania/src/NoteFieldPositioning.cpp +++ b/stepmania/src/NoteFieldPositioning.cpp @@ -19,7 +19,6 @@ NoteFieldMode g_NoteFieldMode[NUM_PLAYERS]; NoteFieldMode::NoteFieldMode() { - m_fFirstPixelToDrawScale = m_fLastPixelToDrawScale = 1.0f; } void NoteFieldMode::BeginDrawTrack(int tn) @@ -55,17 +54,6 @@ void NoteFieldMode::Load(const XNode *pNode, int pn) /* Required: */ ASSERT( pNode->GetAttrValue("Name", m_Name ) ); - - // if we aren't loading a player, we can bail here. - if(pn == -1) - return; - - GetValue( pNode, pn, "PixelsDrawAheadScale", m_fFirstPixelToDrawScale ); - GetValue( pNode, pn, "PixelsDrawBehindScale", m_fLastPixelToDrawScale ); - - CString s; - if( GetValue( pNode, pn, "Judgment", s ) ) m_JudgmentCmd = ParseCommands(s); - if( GetValue( pNode, pn, "Combo", s ) ) m_ComboCmd = ParseCommands(s); } NoteFieldPositioning::NoteFieldPositioning(CString fn) diff --git a/stepmania/src/NoteFieldPositioning.h b/stepmania/src/NoteFieldPositioning.h index 7067b1797f..1b4320603b 100644 --- a/stepmania/src/NoteFieldPositioning.h +++ b/stepmania/src/NoteFieldPositioning.h @@ -24,10 +24,6 @@ struct NoteFieldMode CString m_Id; float m_fPositionTrackX[MAX_NOTE_TRACKS]; - - float m_fFirstPixelToDrawScale, m_fLastPixelToDrawScale; - - Commands m_JudgmentCmd, m_ComboCmd, m_AttackDisplayCmd; }; class NoteFieldPositioning diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index ce866c1f50..bbd303dde9 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -236,12 +236,6 @@ void Player::Load( const NoteData& noteData ) m_ProTimingDisplay.SetX( JUDGMENT_X(pn,bPlayerUsingBothSides) ); m_ProTimingDisplay.SetY( bReverse ? SCREEN_BOTTOM-JUDGMENT_Y : SCREEN_TOP+JUDGMENT_Y ); - /* These commands add to the above positioning, and are usually empty. */ - m_Judgment.RunCommands( g_NoteFieldMode[pn].m_JudgmentCmd ); - m_ProTimingDisplay.RunCommands( g_NoteFieldMode[pn].m_JudgmentCmd ); - m_Combo.RunCommands( g_NoteFieldMode[pn].m_ComboCmd ); - m_AttackDisplay.RunCommands( g_NoteFieldMode[pn].m_AttackDisplayCmd ); - // Need to set Y positions of all these elements in Update since // they change depending on PlayerOptions. diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h index 718007dc3b..7ffbf378b3 100644 --- a/stepmania/src/Player.h +++ b/stepmania/src/Player.h @@ -8,7 +8,6 @@ #include "HoldJudgment.h" #include "Combo.h" #include "NoteDataWithScoring.h" -#include "ArrowBackdrop.h" #include "RageTimer.h" #include "ProTimingDisplay.h" #include "RageSound.h" @@ -78,7 +77,6 @@ protected: float m_fOffset[SAMPLE_COUNT]; // for AutoSync int m_iOffsetSample; - ArrowBackdrop m_ArrowBackdrop; NoteField* m_pNoteField; HoldJudgment m_HoldJudgment[MAX_NOTE_TRACKS];