From 154aeff9511fc898e16a56740e6207d8e5679e8f Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 5 Aug 2011 12:14:15 -0500 Subject: [PATCH] [NoteField] Added AreaHighlightColor metric. --- Docs/Changelog_sm5.txt | 4 ++++ Themes/_fallback/metrics.ini | 1 + src/NoteField.cpp | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index f01dfec96c..307d6a4907 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 Preview 3 | 20110??? -------------------------------------------------------------------------------- +2011/08/05 +---------- +* [NoteField] Added AreaHighlightColor metric. [AJ] + 2011/08/04 ---------- * [NoteTypes, ScreenEdit] Removed artificial MAX_NOTES_PER_MEASURE limit. [AJ] diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 412c6312d5..4c51e8c250 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -953,6 +953,7 @@ Bar16thAlpha=1 RoutineNoteSkinP1=RoutineSkinP1() RoutineNoteSkinP2=RoutineSkinP2() # +AreaHighlightColor=color("1,0,0,0.3") BPMColor=color("1,0,0,1") StopColor=color("0.8,0.8,0,1") DelayColor=color("0,0.8,0.8,1") diff --git a/src/NoteField.cpp b/src/NoteField.cpp index da6cb36b5b..c83d9eb1a9 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -428,7 +428,7 @@ void NoteField::DrawMarkerBar( int iBeat ) m_rectMarkerBar.Draw(); } -// todo: make colors in this section metricable -aj +static ThemeMetric AREA_HIGHLIGHT_COLOR("NoteField", "AreaHighlightColor"); void NoteField::DrawAreaHighlight( int iStartBeat, int iEndBeat ) { float fStartBeat = NoteRowToBeat( iStartBeat ); @@ -443,7 +443,7 @@ void NoteField::DrawAreaHighlight( int iStartBeat, int iEndBeat ) ASSERT( fYEndPos < +5000 ); m_rectAreaHighlight.StretchTo( RectF(-GetWidth()/2, fYStartPos, GetWidth()/2, fYEndPos) ); - m_rectAreaHighlight.SetDiffuse( RageColor(1,0,0,0.3f) ); + m_rectAreaHighlight.SetDiffuse( AREA_HIGHLIGHT_COLOR ); m_rectAreaHighlight.Draw(); }