From 91789e4b1c22bfc680e5260f78db9a0189bdef09 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 18 Jan 2011 13:23:52 -0500 Subject: [PATCH] Flexible horizontal TimingData labels. --- Themes/_fallback/metrics.ini | 6 ++++++ src/NoteField.cpp | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 9d97da69b7..517b6e27e0 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -900,6 +900,12 @@ StopIsLeftSide=true DelayIsLeftSide=true TimeSignatureIsLeftSide=true TickcountIsLeftSide=false +# +BPMOffsetX=60 +StopOffsetX=10 +DelayOffsetX=10 +TimeSignatureOffsetX=30 +TickcountOffsetX=10 [PlayerStageStats] # Original CVS Grading diff --git a/src/NoteField.cpp b/src/NoteField.cpp index fa3c1bf15f..3a4bd10bbc 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -422,6 +422,11 @@ static ThemeMetric STOP_IS_LEFT_SIDE ( "NoteField", "StopIsLeftSide" ); static ThemeMetric DELAY_IS_LEFT_SIDE ( "NoteField", "DelayIsLeftSide" ); static ThemeMetric TIME_SIGNATURE_IS_LEFT_SIDE ( "NoteField", "TimeSignatureIsLeftSide" ); static ThemeMetric TICKCOUNT_IS_LEFT_SIDE ( "NoteField", "TickcountIsLeftSide" ); +static ThemeMetric BPM_OFFSETX ( "NoteField", "BPMOffsetX" ); +static ThemeMetric STOP_OFFSETX ( "NoteField", "StopOffsetX" ); +static ThemeMetric DELAY_OFFSETX ( "NoteField", "DelayOffsetX" ); +static ThemeMetric TIME_SIGNATURE_OFFSETX ( "NoteField", "TimeSignatureOffsetX" ); +static ThemeMetric TICKCOUNT_OFFSETX ( "NoteField", "TickcountOffsetX" ); void NoteField::DrawBPMText( const float fBeat, const float fBPM ) { @@ -429,7 +434,7 @@ void NoteField::DrawBPMText( const float fBeat, const float fBPM ) const float fYPos = ArrowEffects::GetYPos( m_pPlayerState, 0, fYOffset, m_fYReverseOffsetPixels ); const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); const float xBase = GetWidth()/2.f; - const float xOffset = 60 * fZoom; + const float xOffset = BPM_OFFSETX * fZoom; m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetHorizAlign( align_right ); @@ -446,7 +451,7 @@ void NoteField::DrawFreezeText( const float fBeat, const float fSecs, const floa const float fYPos = ArrowEffects::GetYPos( m_pPlayerState, 0, fYOffset, m_fYReverseOffsetPixels ); const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); const float xBase = GetWidth()/2.f; - const float xOffset = (bDelay ? 10 : 10) * fZoom; + const float xOffset = (bDelay ? DELAY_OFFSETX : STOP_OFFSETX) * fZoom; m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetHorizAlign( align_right ); @@ -471,7 +476,7 @@ void NoteField::DrawTimeSignatureText( const float fBeat, int iNumerator, int iD const float fYPos = ArrowEffects::GetYPos( m_pPlayerState, 0, fYOffset, m_fYReverseOffsetPixels ); const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); const float xBase = GetWidth()/2.f; - const float xOffset = 30 * fZoom; + const float xOffset = TIME_SIGNATURE_OFFSETX * fZoom; m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetHorizAlign( align_right ); @@ -488,7 +493,7 @@ void NoteField::DrawTickcountText( const float fBeat, int iTicks ) const float fYPos = ArrowEffects::GetYPos( m_pPlayerState, 0, fYOffset, m_fYReverseOffsetPixels ); const float fZoom = ArrowEffects::GetZoom( m_pPlayerState ); const float xBase = GetWidth()/2.f; - const float xOffset = 10 * fZoom; + const float xOffset = TICKCOUNT_OFFSETX * fZoom; m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetHorizAlign( align_left );