add TapJudgmentsUnderField, HoldJudgmentsUnderField
This commit is contained in:
@@ -1951,6 +1951,8 @@ BrightGhostComboThreshold=100
|
|||||||
StartDrawingAtPixels=-60
|
StartDrawingAtPixels=-60
|
||||||
StopDrawingAtPixels=350
|
StopDrawingAtPixels=350
|
||||||
MaxProTimingError=100
|
MaxProTimingError=100
|
||||||
|
TapJudgmentsUnderField=0
|
||||||
|
HoldJudgmentsUnderField=0
|
||||||
|
|
||||||
[ProTimingDisplay]
|
[ProTimingDisplay]
|
||||||
MarvelousCommand=shadowlength,4;diffuse,1,1,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
|
MarvelousCommand=shadowlength,4;diffuse,1,1,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ CachedThemeMetricF GRAY_ARROWS_Y_REVERSE ("Player","GrayArrowsYReverse");
|
|||||||
CachedThemeMetricF HOLD_JUDGMENT_Y_STANDARD ("Player","HoldJudgmentYStandard");
|
CachedThemeMetricF HOLD_JUDGMENT_Y_STANDARD ("Player","HoldJudgmentYStandard");
|
||||||
CachedThemeMetricF HOLD_JUDGMENT_Y_REVERSE ("Player","HoldJudgmentYReverse");
|
CachedThemeMetricF HOLD_JUDGMENT_Y_REVERSE ("Player","HoldJudgmentYReverse");
|
||||||
CachedThemeMetricI BRIGHT_GHOST_COMBO_THRESHOLD("Player","BrightGhostComboThreshold");
|
CachedThemeMetricI BRIGHT_GHOST_COMBO_THRESHOLD("Player","BrightGhostComboThreshold");
|
||||||
|
CachedThemeMetricB TAP_JUDGMENTS_UNDER_FIELD ("Player","TapJudgmentsUnderField");
|
||||||
|
CachedThemeMetricB HOLD_JUDGMENTS_UNDER_FIELD ("Player","HoldJudgmentsUnderField");
|
||||||
#define START_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StartDrawingAtPixels")
|
#define START_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StartDrawingAtPixels")
|
||||||
#define STOP_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StopDrawingAtPixels")
|
#define STOP_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StopDrawingAtPixels")
|
||||||
#define MAX_PRO_TIMING_ERROR THEME->GetMetricI("Player","MaxProTimingError")
|
#define MAX_PRO_TIMING_ERROR THEME->GetMetricI("Player","MaxProTimingError")
|
||||||
@@ -64,6 +66,8 @@ PlayerMinus::PlayerMinus()
|
|||||||
HOLD_JUDGMENT_Y_STANDARD.Refresh();
|
HOLD_JUDGMENT_Y_STANDARD.Refresh();
|
||||||
HOLD_JUDGMENT_Y_REVERSE.Refresh();
|
HOLD_JUDGMENT_Y_REVERSE.Refresh();
|
||||||
BRIGHT_GHOST_COMBO_THRESHOLD.Refresh();
|
BRIGHT_GHOST_COMBO_THRESHOLD.Refresh();
|
||||||
|
TAP_JUDGMENTS_UNDER_FIELD.Refresh();
|
||||||
|
HOLD_JUDGMENTS_UNDER_FIELD.Refresh();
|
||||||
|
|
||||||
m_PlayerNumber = PLAYER_INVALID;
|
m_PlayerNumber = PLAYER_INVALID;
|
||||||
|
|
||||||
@@ -429,6 +433,12 @@ void PlayerMinus::DrawPrimitives()
|
|||||||
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind == 0 )
|
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind == 0 )
|
||||||
m_Combo.Draw();
|
m_Combo.Draw();
|
||||||
|
|
||||||
|
if( TAP_JUDGMENTS_UNDER_FIELD )
|
||||||
|
DrawTapJudgments();
|
||||||
|
|
||||||
|
if( HOLD_JUDGMENTS_UNDER_FIELD )
|
||||||
|
DrawHoldJudgments();
|
||||||
|
|
||||||
float fTilt = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fPerspectiveTilt;
|
float fTilt = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fPerspectiveTilt;
|
||||||
float fSkew = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fSkew;
|
float fSkew = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].m_fSkew;
|
||||||
bool bReverse = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].GetReversePercentForColumn(0)>0.5;
|
bool bReverse = GAMESTATE->m_CurrentPlayerOptions[m_PlayerNumber].GetReversePercentForColumn(0)>0.5;
|
||||||
@@ -470,14 +480,26 @@ void PlayerMinus::DrawPrimitives()
|
|||||||
DISPLAY->PopMatrix();
|
DISPLAY->PopMatrix();
|
||||||
|
|
||||||
|
|
||||||
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind == 0 )
|
if( !TAP_JUDGMENTS_UNDER_FIELD )
|
||||||
{
|
DrawTapJudgments();
|
||||||
|
|
||||||
|
if( !TAP_JUDGMENTS_UNDER_FIELD )
|
||||||
|
DrawHoldJudgments();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PlayerMinus::DrawTapJudgments()
|
||||||
|
{
|
||||||
|
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind )
|
||||||
|
return;
|
||||||
|
|
||||||
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_bProTiming )
|
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_bProTiming )
|
||||||
m_ProTimingDisplay.Draw();
|
m_ProTimingDisplay.Draw();
|
||||||
else
|
else
|
||||||
m_Judgment.Draw();
|
m_Judgment.Draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PlayerMinus::DrawHoldJudgments()
|
||||||
|
{
|
||||||
for( int c=0; c<GetNumTracks(); c++ )
|
for( int c=0; c<GetNumTracks(); c++ )
|
||||||
m_HoldJudgment[c].Draw();
|
m_HoldJudgment[c].Draw();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,8 @@ protected:
|
|||||||
void HandleTapRowScore( unsigned row );
|
void HandleTapRowScore( unsigned row );
|
||||||
void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore );
|
void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore );
|
||||||
void HandleAutosync(float fNoteOffset);
|
void HandleAutosync(float fNoteOffset);
|
||||||
|
void DrawTapJudgments();
|
||||||
|
void DrawHoldJudgments();
|
||||||
|
|
||||||
int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection );
|
int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection );
|
||||||
int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind );
|
int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind );
|
||||||
|
|||||||
Reference in New Issue
Block a user