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

avoid global ThemeMetric<apActorCommands>

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-21 21:42:41 +00:00
parent 74e9540ce7
commit 1ac2e7a351
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -2
View File
@@ -442,7 +442,7 @@ StartX=0
StartY=0
SpacingX=150
CropWidth=146
InitCommand=horizalign,left;vertalign,top;shadowlength,2;zoom,0.5;
TitleInitCommand=horizalign,left;vertalign,top;shadowlength,2;zoom,0.5;
[ScreenInstructions]
Class=ScreenInstructions
@@ -2640,7 +2640,7 @@ RightEdge=SCREEN_RIGHT
BottomEdge=SCREEN_BOTTOM
BlinkDangerAll=1
DangerAllIsOpaque=1
BrightnessFadeCommand=
BrightnessOverlayFadeCommand=
ClampOutputPercent=0
[Judgment]
stepmania/src/Background.cpp
+9 -2
View File
@@ -32,7 +32,6 @@ static ThemeMetric<float> BOTTOM_EDGE ("Background","BottomEdge");
#define RECT_BACKGROUND RectF (LEFT_EDGE,TOP_EDGE,RIGHT_EDGE,BOTTOM_EDGE)
static ThemeMetric<bool> BLINK_DANGER_ALL ("Background","BlinkDangerAll");
static ThemeMetric<bool> DANGER_ALL_IS_OPAQUE ("Background","DangerAllIsOpaque");
static ThemeMetric<apActorCommands> BRIGHTNESS_FADE_COMMAND ("Background","BrightnessFadeCommand");
static ThemeMetric<float> CLAMP_OUTPUT_PERCENT ("Background","ClampOutputPercent");
// Width of the region separating the left and right brightness areas:
@@ -970,8 +969,16 @@ BrightnessOverlay::BrightnessOverlay()
m_quadBGBrightnessFade.StretchTo( RectF(LEFT_EDGE+fQuadWidth,TOP_EDGE,RIGHT_EDGE-fQuadWidth,BOTTOM_EDGE) );
m_quadBGBrightness[1].StretchTo( RectF(RIGHT_EDGE-fQuadWidth,TOP_EDGE,RIGHT_EDGE,BOTTOM_EDGE) );
m_quadBGBrightness[0].SetName( "BrightnessOverlay" );
ActorUtil::LoadAllCommands( m_quadBGBrightness[0], "Background" );
this->AddChild( &m_quadBGBrightness[0] );
m_quadBGBrightness[1].SetName( "BrightnessOverlay" );
ActorUtil::LoadAllCommands( m_quadBGBrightness[1], "Background" );
this->AddChild( &m_quadBGBrightness[1] );
m_quadBGBrightnessFade.SetName( "BrightnessOverlay" );
ActorUtil::LoadAllCommands( m_quadBGBrightnessFade, "Background" );
this->AddChild( &m_quadBGBrightnessFade );
SetActualBrightness();
@@ -1025,7 +1032,7 @@ void BrightnessOverlay::Set( float fBrightness )
void BrightnessOverlay::FadeToActualBrightness()
{
this->RunCommandsOnChildren( BRIGHTNESS_FADE_COMMAND );
this->PlayCommand( "Fade" );
SetActualBrightness();
}
stepmania/src/MusicList.cpp
+4 -2
View File
@@ -4,6 +4,7 @@
#include "ThemeMetric.h"
#include "RageUtil.h"
#include "song.h"
#include "ActorUtil.h"
/* If this actor is used anywhere other than SelectGroup, we
* can add a setting that changes which metric group we pull
@@ -14,7 +15,6 @@ static const ThemeMetric<float> START_X ("MusicList","StartX");
static const ThemeMetric<float> START_Y ("MusicList","StartY");
static const ThemeMetric<float> SPACING_X ("MusicList","SpacingX");
static const ThemeMetric<float> CROP_WIDTH ("MusicList","CropWidth");
static const ThemeMetric<apActorCommands> INIT_COMMAND ("MusicList","InitCommand");
MusicList::MusicList()
{
@@ -25,9 +25,11 @@ void MusicList::Load()
{
for( int i=0; i<NUM_COLUMNS; i++ )
{
m_textTitles[i].SetName( "Title" );
ActorUtil::LoadAllCommands( m_textTitles[i], "MusicList" );
m_textTitles[i].LoadFromFont( THEME->GetPathF("MusicList","titles") );
m_textTitles[i].SetXY( START_X + i*SPACING_X, START_Y );
m_textTitles[i].RunCommands( INIT_COMMAND );
m_textTitles[i].PlayCommand( "Init" );
this->AddChild( &m_textTitles[i] );
}
}
stepmania/src/RoomWheel.cpp
+3 -3
View File
@@ -14,7 +14,6 @@ AutoScreenMessage( SM_RoomInfoDeploy )
ThemeMetric<float> DESC_X;
ThemeMetric<float> DESC_Y;
ThemeMetric<float> DESC_WIDTH;
ThemeMetric<apActorCommands> DESC_ON_COMMAND;
RoomWheel::~RoomWheel()
{
@@ -59,18 +58,19 @@ void RoomWheelItem::Load( RString sType )
DESC_X .Load(sType,"DescX");
DESC_Y .Load(sType,"DescY");
DESC_WIDTH .Load(sType,"DescWidth");
DESC_ON_COMMAND .Load(sType,"DescOnCommand");
TEXT_WIDTH .Load(sType,"TextWidth");
m_text.SetHorizAlignString("left");
m_text.SetMaxWidth(TEXT_WIDTH);
m_Desc.SetName( "Desc" );
ActorUtil::LoadAllCommands( m_Desc, "RoomWheelItem" );
m_Desc.LoadFromFont( THEME->GetPathF("RoomWheel","text") );
m_Desc.SetHorizAlignString("left");
m_Desc.SetShadowLength( 0 );
m_Desc.SetMaxWidth( DESC_WIDTH );
m_Desc.SetXY( DESC_X, DESC_Y);
m_Desc.RunCommands( DESC_ON_COMMAND );
m_Desc.PlayCommand( "On" );
this->AddChild( &m_Desc );
}