diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index b9c4a00415..b1e3450530 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -20,8 +20,6 @@ static RString LIFE_PERCENT_CHANGE_NAME( size_t i ) { return "LifePercentChang LifeMeterBar::LifeMeterBar() { - METER_WIDTH.Load ("LifeMeterBar","MeterWidth"); - METER_HEIGHT.Load ("LifeMeterBar","MeterHeight"); DANGER_THRESHOLD.Load ("LifeMeterBar","DangerThreshold"); INITIAL_VALUE.Load ("LifeMeterBar","InitialValue"); MIN_STAY_ALIVE.Load ("LifeMeterBar","MinStayAlive"); @@ -57,29 +55,29 @@ LifeMeterBar::LifeMeterBar() // set up combotoregainlife m_iComboToRegainLife = 0; - m_sprBackground.Load( THEME->GetPathG(sType,"background") ); - m_sprBackground->SetName( "Background" ); - m_sprBackground->ZoomToWidth( METER_WIDTH ); - m_sprBackground->ZoomToHeight( METER_HEIGHT ); - this->AddChild( m_sprBackground ); - - m_quadDangerGlow.ZoomToWidth( METER_WIDTH ); - m_quadDangerGlow.ZoomToHeight( METER_HEIGHT ); - m_quadDangerGlow.SetEffectDiffuseShift(); - m_quadDangerGlow.SetEffectColor1( RageColor(1,0,0,0.8f) ); - m_quadDangerGlow.SetEffectColor2( RageColor(1,0,0,0) ); - m_quadDangerGlow.SetEffectClock( Actor::CLOCK_BGM_BEAT ); - this->AddChild( &m_quadDangerGlow ); - - m_pStream = new StreamDisplay; bool bExtra = GAMESTATE->IsAnExtraStage(); RString sExtra = bExtra ? "extra " : ""; + + m_sprUnder.Load( THEME->GetPathG(sType,sExtra+"Under") ); + m_sprUnder->SetName( "Under" ); + ActorUtil::LoadAllCommandsAndSetXY( m_sprUnder, sType ); + this->AddChild( m_sprUnder ); + + m_sprDanger.Load( THEME->GetPathG(sType,sExtra+"Danger") ); + m_sprDanger->SetName( "Danger" ); + ActorUtil::LoadAllCommandsAndSetXY( m_sprDanger, sType ); + this->AddChild( m_sprDanger ); + + m_pStream = new StreamDisplay; m_pStream->Load( bExtra ? "StreamDisplayExtra" : "StreamDisplay" ); + m_pStream->SetName( "Stream" ); + ActorUtil::LoadAllCommandsAndSetXY( m_pStream, sType ); this->AddChild( m_pStream ); - m_sprFrame.Load( THEME->GetPathG(sType,sExtra+"frame") ); - m_sprFrame->SetName( "Frame" ); - this->AddChild( m_sprFrame ); + m_sprOver.Load( THEME->GetPathG(sType,sExtra+"Over") ); + m_sprOver->SetName( "Over" ); + ActorUtil::LoadAllCommandsAndSetXY( m_sprOver, sType ); + this->AddChild( m_sprOver ); } LifeMeterBar::~LifeMeterBar() @@ -277,9 +275,9 @@ void LifeMeterBar::Update( float fDeltaTime ) m_pStream->SetHotAlpha( m_fHotAlpha ); if( m_pPlayerState->m_HealthState == HealthState_Danger ) - m_quadDangerGlow.SetDiffuseAlpha( 1 ); + m_sprDanger->SetVisible( true ); else - m_quadDangerGlow.SetDiffuseAlpha( 0 ); + m_sprDanger->SetVisible( false ); } diff --git a/stepmania/src/LifeMeterBar.h b/stepmania/src/LifeMeterBar.h index e632dbe463..af716343fd 100644 --- a/stepmania/src/LifeMeterBar.h +++ b/stepmania/src/LifeMeterBar.h @@ -34,18 +34,16 @@ public: // this function is solely for HowToPlay private: - ThemeMetric METER_WIDTH; - ThemeMetric METER_HEIGHT; ThemeMetric DANGER_THRESHOLD; ThemeMetric INITIAL_VALUE; ThemeMetric MIN_STAY_ALIVE; ThemeMetric1D m_fLifePercentChange; - AutoActor m_sprBackground; - Quad m_quadDangerGlow; + AutoActor m_sprUnder; + AutoActor m_sprDanger; StreamDisplay* m_pStream; - AutoActor m_sprFrame; + AutoActor m_sprOver; float m_fLifePercentage; diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp index 6a3e624cce..9fd419aead 100644 --- a/stepmania/src/ScoreDisplayNormal.cpp +++ b/stepmania/src/ScoreDisplayNormal.cpp @@ -7,19 +7,27 @@ #include "PlayerState.h" #include "StatsManager.h" #include "CommonMetrics.h" +#include "ActorUtil.h" ScoreDisplayNormal::ScoreDisplayNormal() { LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" ); - m_sprFrame.Load( THEME->GetPathG("ScoreDisplayNormal","frame") ); - this->AddChild( &m_sprFrame ); + RString sType = "ScoreDisplayNormal"; + + m_sprFrame.Load( THEME->GetPathG(sType,"Frame") ); + m_sprFrame->SetName( "Frame" ); + ActorUtil::LoadAllCommandsAndSetXY( m_sprFrame, sType ); + this->AddChild( m_sprFrame ); + // init the text - m_text.LoadFromFont( THEME->GetPathF("ScoreDisplayNormal","numbers") ); + m_text.LoadFromFont( THEME->GetPathF("ScoreDisplayNormal","Text") ); + m_text.SetName( "Text" ); m_text.SetShadowLength( 0 ); m_text.UpdateText(); + ActorUtil::LoadAllCommandsAndSetXY( m_text, sType ); this->AddChild( &m_text ); } @@ -28,9 +36,9 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState, const PlayerStag ScoreDisplay::Init( pPlayerState, pPlayerStageStats ); // TODO: Remove use of PlayerNumber. - PlayerNumber pn = pPlayerState->m_PlayerNumber; + //PlayerNumber pn = pPlayerState->m_PlayerNumber; - m_text.RunCommands( CommonMetrics::PLAYER_COLOR.GetValue(pn) ); + //m_text.RunCommands( CommonMetrics::PLAYER_COLOR.GetValue(pn) ); } void ScoreDisplayNormal::SetScore( int iNewScore ) diff --git a/stepmania/src/ScoreDisplayNormal.h b/stepmania/src/ScoreDisplayNormal.h index d4ab30faf0..fadb2e8abe 100644 --- a/stepmania/src/ScoreDisplayNormal.h +++ b/stepmania/src/ScoreDisplayNormal.h @@ -5,7 +5,7 @@ #include "ScoreDisplay.h" #include "RollingNumbers.h" -#include "Sprite.h" +#include "AutoActor.h" class ScoreDisplayNormal : public ScoreDisplay { @@ -18,7 +18,7 @@ public: virtual void SetText( RString s ) { m_text.SetText(s); } protected: - Sprite m_sprFrame; + AutoActor m_sprFrame; RollingNumbers m_text; };