add brightness overlay

This commit is contained in:
Chris Danford
2005-08-18 02:28:54 +00:00
parent a58f3d4f0a
commit e30fcd571d
4 changed files with 16 additions and 5 deletions
+1
View File
@@ -237,6 +237,7 @@ 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 ),
+1
View File
@@ -223,6 +223,7 @@ public:
Preference<int> m_iCenterImageTranslateY;
Preference<int> m_fCenterImageAddWidth;
Preference<int> m_fCenterImageAddHeight;
Preference<float> 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<AttractSoundFrequency> m_AttractSoundFrequency;
Preference<bool> m_bAllowExtraStage;
+12 -4
View File
@@ -11,6 +11,7 @@
#include "RageDisplay.h"
#include "RageLog.h"
#include "Command.h"
#include "ScreenDimensions.h"
REGISTER_SCREEN_CLASS( ScreenSystemLayer );
@@ -60,11 +61,11 @@ void ScreenSystemLayer::Init()
const float SKIP_LEFT = 320.0f, SKIP_TOP = 60.0f,
SKIP_WIDTH = 160.0f, SKIP_Y_DIST = 16.0f;
m_SkipBackground.StretchTo(RectF(SKIP_LEFT-8, SKIP_TOP-8,
m_quadSkipBackground.StretchTo(RectF(SKIP_LEFT-8, SKIP_TOP-8,
SKIP_LEFT+SKIP_WIDTH, SKIP_TOP+SKIP_Y_DIST*NUM_SKIPS_TO_SHOW));
m_SkipBackground.SetDiffuse( RageColor(0,0,0,0.4f) );
m_SkipBackground.SetHidden( !PREFSMAN->m_bTimestamping );
this->AddChild(&m_SkipBackground);
m_quadSkipBackground.SetDiffuse( RageColor(0,0,0,0.4f) );
m_quadSkipBackground.SetHidden( !PREFSMAN->m_bTimestamping );
this->AddChild(&m_quadSkipBackground);
for( int i=0; i<NUM_SKIPS_TO_SHOW; i++ )
{
@@ -81,6 +82,13 @@ void ScreenSystemLayer::Init()
this->AddChild(&m_textSkips[i]);
}
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. */
+2 -1
View File
@@ -30,7 +30,8 @@ private:
BitmapText m_textTime;
BitmapText m_textSkips[NUM_SKIPS_TO_SHOW];
int m_LastSkip;
Quad m_SkipBackground;
Quad m_quadSkipBackground;
Quad m_quadBrightnessAdd;
RageTimer SkipTimer;
void AddTimestampLine( const CString &txt, const RageColor &color );