From 09b88acb0dce56db852e86be3daf0caf107df1ae Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 22 Mar 2006 23:00:58 +0000 Subject: [PATCH] remove brightness quad. Add SSystemLayer overlay for doing hacks like that. --- stepmania/src/PrefsManager.cpp | 1 - stepmania/src/PrefsManager.h | 1 - stepmania/src/ScreenSystemLayer.cpp | 10 +++------- stepmania/src/ScreenSystemLayer.h | 3 ++- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index a4e73f6383..07fa7d1ae8 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -272,7 +272,6 @@ PrefsManager::PrefsManager() : m_iCenterImageTranslateY ( "CenterImageTranslateY", 0 ), m_fCenterImageAddWidth ( "CenterImageAddWidth", 0 ), m_fCenterImageAddHeight ( "CenterImageAddHeight", 0 ), - m_fBrightnessAdd ( "BrightnessAdd", 0 ), m_AttractSoundFrequency ( "AttractSoundFrequency", ASF_EVERY_TIME ), m_bAllowExtraStage ( "AllowExtraStage", true ), m_bHideDefaultNoteSkin ( "HideDefaultNoteSkin", false ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 596170a65c..4c28fac601 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -162,7 +162,6 @@ public: Preference m_iCenterImageTranslateY; Preference m_fCenterImageAddWidth; Preference m_fCenterImageAddHeight; - Preference m_fBrightnessAdd; enum AttractSoundFrequency { ASF_NEVER, ASF_EVERY_TIME, ASF_EVERY_2_TIMES, ASF_EVERY_3_TIMES, ASF_EVERY_4_TIMES, ASF_EVERY_5_TIMES }; Preference m_AttractSoundFrequency; Preference m_bAllowExtraStage; diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp index 89b27ccc71..8d1ad547b0 100644 --- a/stepmania/src/ScreenSystemLayer.cpp +++ b/stepmania/src/ScreenSystemLayer.cpp @@ -42,17 +42,13 @@ void ScreenSystemLayer::Init() FOREACH_PlayerNumber( p ) this->AddChild(&m_textCredits[p]); - m_quadBrightnessAdd.StretchTo( RectF(SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) ); - m_quadBrightnessAdd.SetDiffuse( RageColor(1,1,1,PREFSMAN->m_fBrightnessAdd) ); - m_quadBrightnessAdd.SetHidden( PREFSMAN->m_fBrightnessAdd == 0 ); - m_quadBrightnessAdd.SetBlendMode( BLEND_ADD ); - this->AddChild( &m_quadBrightnessAdd ); - - ReloadCreditsText(); /* This will be done when we set up the first screen, after GAMESTATE->Reset has * been called. */ // RefreshCreditsMessages(); + + m_sprOverlay.Load( THEME->GetPathB("ScreenSystemLayer", "overlay") ); + this->AddChild( m_sprOverlay ); } void ScreenSystemLayer::ReloadCreditsText() diff --git a/stepmania/src/ScreenSystemLayer.h b/stepmania/src/ScreenSystemLayer.h index fedf1e9ecb..4bcb93398e 100644 --- a/stepmania/src/ScreenSystemLayer.h +++ b/stepmania/src/ScreenSystemLayer.h @@ -23,7 +23,6 @@ private: AutoActor m_sprMessageFrame; BitmapText m_textMessage; BitmapText m_textCredits[NUM_PLAYERS]; - Quad m_quadBrightnessAdd; RString GetCreditsMessage( PlayerNumber pn ) const; @@ -40,6 +39,8 @@ private: LocalizedString CREDITS_LOAD_FAILED; LocalizedString CREDITS_LOADED_FROM_LAST_GOOD_APPEND; ThemeMetric CREDITS_JOIN_ONLY; + + AutoActor m_sprOverlay; };