actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add metrics for Timing Data colors.

Browse Source 
Note: this changes the TimeSignatureColor to be different
from the StopColor. Please do not be alarmed.
This commit is contained in:
Jason Felds
2011-01-18 13:02:30 -05:00
parent 80396f4342
commit ebcea92292
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/metrics.ini
+6
View File
@@ -888,6 +888,12 @@ Bar16thAlpha=1
# #
RoutineNoteSkinP1=RoutineSkinP1() RoutineNoteSkinP1=RoutineSkinP1()
RoutineNoteSkinP2=RoutineSkinP2() RoutineNoteSkinP2=RoutineSkinP2()
#
BPMColor=color("1,0,0,1")
StopColor=color("0.8,0.8,0,1")
DelayColor=color("0,0.8,0.8,1")
TimeSignatureColor=color("1,0.55,0,1")
TickcountColor=color("0,1,0,1")
[PlayerStageStats] [PlayerStageStats]
# Original CVS Grading # Original CVS Grading
src/NoteField.cpp
+11 -5
View File
@@ -412,6 +412,12 @@ void NoteField::DrawAreaHighlight( int iStartBeat, int iEndBeat )
// todo: add DrawWarpAreaBG? -aj // todo: add DrawWarpAreaBG? -aj
static ThemeMetric<RageColor> BPM_COLOR ( "NoteField", "BPMColor" );
static ThemeMetric<RageColor> STOP_COLOR ( "NoteField", "StopColor" );
static ThemeMetric<RageColor> DELAY_COLOR ( "NoteField", "DelayColor" );
static ThemeMetric<RageColor> TIME_SIGNATURE_COLOR ( "NoteField", "TimeSignatureColor" );
static ThemeMetric<RageColor> TICKCOUNT_COLOR ( "NoteField", "TickcountColor" );
void NoteField::DrawBPMText( const float fBeat, const float fBPM ) void NoteField::DrawBPMText( const float fBeat, const float fBPM )
{ {
const float fYOffset = ArrowEffects::GetYOffset( m_pPlayerState, 0, fBeat ); const float fYOffset = ArrowEffects::GetYOffset( m_pPlayerState, 0, fBeat );
@@ -420,7 +426,7 @@ void NoteField::DrawBPMText( const float fBeat, const float fBPM )
m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetZoom( fZoom );
m_textMeasureNumber.SetHorizAlign( align_right ); m_textMeasureNumber.SetHorizAlign( align_right );
m_textMeasureNumber.SetDiffuse( RageColor(1,0,0,1) ); m_textMeasureNumber.SetDiffuse( BPM_COLOR );
m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
m_textMeasureNumber.SetText( ssprintf("%.3f", fBPM) ); m_textMeasureNumber.SetText( ssprintf("%.3f", fBPM) );
m_textMeasureNumber.SetXY( -GetWidth()/2 - 60*fZoom, fYPos ); m_textMeasureNumber.SetXY( -GetWidth()/2 - 60*fZoom, fYPos );
@@ -436,9 +442,9 @@ void NoteField::DrawFreezeText( const float fBeat, const float fSecs, const floa
m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetZoom( fZoom );
m_textMeasureNumber.SetHorizAlign( align_right ); m_textMeasureNumber.SetHorizAlign( align_right );
if(bDelay) if(bDelay)
m_textMeasureNumber.SetDiffuse( RageColor(0,0.8f,0.8f,1) ); m_textMeasureNumber.SetDiffuse( DELAY_COLOR );
else else
m_textMeasureNumber.SetDiffuse( RageColor(0.8f,0.8f,0,1) ); m_textMeasureNumber.SetDiffuse( STOP_COLOR );
m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
m_textMeasureNumber.SetText( ssprintf("%.3f", fSecs) ); m_textMeasureNumber.SetText( ssprintf("%.3f", fSecs) );
m_textMeasureNumber.SetXY( -GetWidth()/2.f - 10*fZoom, fYPos ); m_textMeasureNumber.SetXY( -GetWidth()/2.f - 10*fZoom, fYPos );
@@ -453,7 +459,7 @@ void NoteField::DrawTimeSignatureText( const float fBeat, int iNumerator, int iD
m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetZoom( fZoom );
m_textMeasureNumber.SetHorizAlign( align_right ); m_textMeasureNumber.SetHorizAlign( align_right );
m_textMeasureNumber.SetDiffuse( RageColor(0.8f,0.8f,0,1) ); m_textMeasureNumber.SetDiffuse( TIME_SIGNATURE_COLOR );
m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
m_textMeasureNumber.SetText( ssprintf("%d\n--\n%d", iNumerator, iDenominator) ); m_textMeasureNumber.SetText( ssprintf("%d\n--\n%d", iNumerator, iDenominator) );
m_textMeasureNumber.SetXY( -GetWidth()/2.f - 30*fZoom, fYPos ); m_textMeasureNumber.SetXY( -GetWidth()/2.f - 30*fZoom, fYPos );
@@ -468,7 +474,7 @@ void NoteField::DrawTickcountText( const float fBeat, int iTicks )
m_textMeasureNumber.SetZoom( fZoom ); m_textMeasureNumber.SetZoom( fZoom );
m_textMeasureNumber.SetHorizAlign( align_left ); m_textMeasureNumber.SetHorizAlign( align_left );
m_textMeasureNumber.SetDiffuse( RageColor(0,1,0,1) ); m_textMeasureNumber.SetDiffuse( TICKCOUNT_COLOR );
m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) ); m_textMeasureNumber.SetGlow( RageColor(1,1,1,RageFastCos(RageTimer::GetTimeSinceStartFast()*2)/2+0.5f) );
m_textMeasureNumber.SetText( ssprintf("%d", iTicks) ); m_textMeasureNumber.SetText( ssprintf("%d", iTicks) );
m_textMeasureNumber.SetXY( GetWidth()/2.f + 10*fZoom, fYPos ); m_textMeasureNumber.SetXY( GetWidth()/2.f + 10*fZoom, fYPos );