remove some old experimental stuff
This commit is contained in:
@@ -430,13 +430,8 @@ void NoteField::DrawPrimitives()
|
|||||||
fDrawScale *= 1 + 0.5f * fabsf( current_po.m_fPerspectiveTilt );
|
fDrawScale *= 1 + 0.5f * fabsf( current_po.m_fPerspectiveTilt );
|
||||||
fDrawScale *= 1 + fabsf( current_po.m_fEffects[PlayerOptions::EFFECT_MINI] );
|
fDrawScale *= 1 + fabsf( current_po.m_fEffects[PlayerOptions::EFFECT_MINI] );
|
||||||
|
|
||||||
// TODO: Remove use of PlayerNumber.
|
iFirstPixelToDraw = (int)(iFirstPixelToDraw * fDrawScale);
|
||||||
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
|
iLastPixelToDraw = (int)(iLastPixelToDraw * fDrawScale);
|
||||||
float fFirstDrawScale = g_NoteFieldMode[pn].m_fFirstPixelToDrawScale;
|
|
||||||
float fLastDrawScale = g_NoteFieldMode[pn].m_fLastPixelToDrawScale;
|
|
||||||
|
|
||||||
iFirstPixelToDraw = (int)(iFirstPixelToDraw * fFirstDrawScale * fDrawScale);
|
|
||||||
iLastPixelToDraw = (int)(iLastPixelToDraw * fLastDrawScale * fDrawScale);
|
|
||||||
|
|
||||||
|
|
||||||
// Probe for first and last notes on the screen
|
// Probe for first and last notes on the screen
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ NoteFieldMode g_NoteFieldMode[NUM_PLAYERS];
|
|||||||
|
|
||||||
NoteFieldMode::NoteFieldMode()
|
NoteFieldMode::NoteFieldMode()
|
||||||
{
|
{
|
||||||
m_fFirstPixelToDrawScale = m_fLastPixelToDrawScale = 1.0f;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void NoteFieldMode::BeginDrawTrack(int tn)
|
void NoteFieldMode::BeginDrawTrack(int tn)
|
||||||
@@ -55,17 +54,6 @@ void NoteFieldMode::Load(const XNode *pNode, int pn)
|
|||||||
|
|
||||||
/* Required: */
|
/* Required: */
|
||||||
ASSERT( pNode->GetAttrValue("Name", m_Name ) );
|
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)
|
NoteFieldPositioning::NoteFieldPositioning(CString fn)
|
||||||
|
|||||||
@@ -24,10 +24,6 @@ struct NoteFieldMode
|
|||||||
CString m_Id;
|
CString m_Id;
|
||||||
|
|
||||||
float m_fPositionTrackX[MAX_NOTE_TRACKS];
|
float m_fPositionTrackX[MAX_NOTE_TRACKS];
|
||||||
|
|
||||||
float m_fFirstPixelToDrawScale, m_fLastPixelToDrawScale;
|
|
||||||
|
|
||||||
Commands m_JudgmentCmd, m_ComboCmd, m_AttackDisplayCmd;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class NoteFieldPositioning
|
class NoteFieldPositioning
|
||||||
|
|||||||
@@ -236,12 +236,6 @@ void Player::Load( const NoteData& noteData )
|
|||||||
m_ProTimingDisplay.SetX( JUDGMENT_X(pn,bPlayerUsingBothSides) );
|
m_ProTimingDisplay.SetX( JUDGMENT_X(pn,bPlayerUsingBothSides) );
|
||||||
m_ProTimingDisplay.SetY( bReverse ? SCREEN_BOTTOM-JUDGMENT_Y : SCREEN_TOP+JUDGMENT_Y );
|
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
|
// Need to set Y positions of all these elements in Update since
|
||||||
// they change depending on PlayerOptions.
|
// they change depending on PlayerOptions.
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
#include "HoldJudgment.h"
|
#include "HoldJudgment.h"
|
||||||
#include "Combo.h"
|
#include "Combo.h"
|
||||||
#include "NoteDataWithScoring.h"
|
#include "NoteDataWithScoring.h"
|
||||||
#include "ArrowBackdrop.h"
|
|
||||||
#include "RageTimer.h"
|
#include "RageTimer.h"
|
||||||
#include "ProTimingDisplay.h"
|
#include "ProTimingDisplay.h"
|
||||||
#include "RageSound.h"
|
#include "RageSound.h"
|
||||||
@@ -78,7 +77,6 @@ protected:
|
|||||||
float m_fOffset[SAMPLE_COUNT]; // for AutoSync
|
float m_fOffset[SAMPLE_COUNT]; // for AutoSync
|
||||||
int m_iOffsetSample;
|
int m_iOffsetSample;
|
||||||
|
|
||||||
ArrowBackdrop m_ArrowBackdrop;
|
|
||||||
NoteField* m_pNoteField;
|
NoteField* m_pNoteField;
|
||||||
|
|
||||||
HoldJudgment m_HoldJudgment[MAX_NOTE_TRACKS];
|
HoldJudgment m_HoldJudgment[MAX_NOTE_TRACKS];
|
||||||
|
|||||||
Reference in New Issue
Block a user