From 48674b5d88c5cb657406970f5ded0a1bb8e2292d Mon Sep 17 00:00:00 2001 From: David Wilson Date: Thu, 2 Oct 2003 04:15:50 +0000 Subject: [PATCH] Made Metrics to control how the Lyrics looks before the Swipe --- stepmania/Themes/default/metrics.ini | 5 ++++- stepmania/src/LyricDisplay.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 6998f0e56d..9f6d5a4633 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1953,6 +1953,9 @@ BannerHeight=184 [LyricDisplay] InCommand=shadowlength,0;zoomy,0;spring,0.20;zoomy,1; OutCommand=linear,0.20;zoomy,0 +//Affects Lyrics PreSwipe 1 = no Swipe +Alpha=.5 +WashOut=2 //Bigger number = Larger effect [ScoreKeeperRave] AttackDurationSeconds=10 @@ -2099,7 +2102,7 @@ Caution=Toggle whether the Caution screen is shown. OniScoreDisplay=Toggle whether the score in Oni mode displays Dance Points or the Dance Percent. SongGroup=Toggle whether the Select Group screen is shown. WheelSections=ALWAYS means sections in group + ABC; NEVER means no sections;::ABC ONLY shows sections in just ABC sort -Translations=Choose whether to displays song titles in their native::language (日本語), or to transliterate when possible +Translations=Choose whether to displays song titles in their native::language (???), or to transliterate when possible Lyrics=Choose whether to show lyrics if a song::has them available (LRC File) 10+footInRed=Choose where 10 footers or higher are displayed::in red on the song select wheel. CourseSort=Determines how courses are sorted. diff --git a/stepmania/src/LyricDisplay.cpp b/stepmania/src/LyricDisplay.cpp index 30b2a2992b..71dde04733 100644 --- a/stepmania/src/LyricDisplay.cpp +++ b/stepmania/src/LyricDisplay.cpp @@ -97,11 +97,15 @@ void LyricDisplay::Update( float fDeltaTime ) m_textLyrics[i].SetZoomX(fZoom); RageColor color = GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_Color; + + float WashOut = THEME->GetMetricF("LyricDisplay","WashOut");//DW + if (WashOut == 0) WashOut = 1; + if( i==0 ) { for( int c=0; c<4; c++ ) - color[c] /= 2; - color.a = 0.5f; + color[c] /= WashOut; + color.a = THEME->GetMetricF("LyricDisplay","Alpha");//DW; } m_textLyrics[i].SetDiffuse(color);