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

use graphic for life meter background

Browse Source
This commit is contained in:
Chris Danford
2005-04-10 01:24:00 +00:00
parent 1adbcaa69f
commit ee3764a2ed
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBar.cpp
+17 -11
View File
@@ -10,6 +10,8 @@
#include "StatsManager.h" #include "StatsManager.h"
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "PlayerState.h" #include "PlayerState.h"
#include "Quad.h"
#include "ActorUtil.h"
static ThemeMetric<float> METER_WIDTH ("LifeMeterBar","MeterWidth"); static ThemeMetric<float> METER_WIDTH ("LifeMeterBar","MeterWidth");
@@ -216,8 +218,6 @@ public:
LifeMeterBar::LifeMeterBar() LifeMeterBar::LifeMeterBar()
{ {
m_pStream = new LifeMeterStream;
switch( GAMESTATE->m_SongOptions.m_DrainType ) switch( GAMESTATE->m_SongOptions.m_DrainType )
{ {
case SongOptions::DRAIN_NORMAL: case SongOptions::DRAIN_NORMAL:
@@ -237,17 +237,9 @@ LifeMeterBar::LifeMeterBar()
m_fHotAlpha = 0; m_fHotAlpha = 0;
m_bFailedEarlier = false; m_bFailedEarlier = false;
// set up lifebar
m_fBaseLifeDifficulty = PREFSMAN->m_fLifeDifficultyScale; m_fBaseLifeDifficulty = PREFSMAN->m_fLifeDifficultyScale;
m_fLifeDifficulty = m_fBaseLifeDifficulty; m_fLifeDifficulty = m_fBaseLifeDifficulty;
m_quadBlackBackground.SetDiffuse( RageColor(0,0,0,1) );
m_quadBlackBackground.SetZoomX( (float)METER_WIDTH );
m_quadBlackBackground.SetZoomY( (float)METER_HEIGHT );
this->AddChild( &m_quadBlackBackground );
this->AddChild( m_pStream );
// set up progressive lifebar // set up progressive lifebar
m_iProgressiveLifebar = PREFSMAN->m_iProgressiveLifebar; m_iProgressiveLifebar = PREFSMAN->m_iProgressiveLifebar;
m_iMissCombo = 0; m_iMissCombo = 0;
@@ -255,6 +247,20 @@ LifeMeterBar::LifeMeterBar()
// set up combotoregainlife // set up combotoregainlife
m_iComboToRegainLife = 0; m_iComboToRegainLife = 0;
m_sprBackground.Load( THEME->GetPathG("LifeMeterBar","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.SetDiffuse( RageColor(1,0,0,1) );
this->AddChild( &m_quadDangerGlow );
m_pStream = new LifeMeterStream;
this->AddChild( m_pStream );
AfterLifeChanged(); AfterLifeChanged();
} }
@@ -526,7 +532,7 @@ void LifeMeterBar::DrawPrimitives()
fPercentRed = 0; fPercentRed = 0;
else if( m_fTrailingLifePercentage<DANGER_THRESHOLD ) else if( m_fTrailingLifePercentage<DANGER_THRESHOLD )
fPercentRed = RageFastSin( RageTimer::GetTimeSinceStartFast()*PI*4 )/2+0.5f; fPercentRed = RageFastSin( RageTimer::GetTimeSinceStartFast()*PI*4 )/2+0.5f;
m_quadBlackBackground.SetDiffuse( RageColor(fPercentRed*0.8f,0,0,1) ); m_quadDangerGlow.SetDiffuseAlpha( fPercentRed*0.8f );
ActorFrame::DrawPrimitives(); ActorFrame::DrawPrimitives();
} }
stepmania/src/LifeMeterBar.h
+3 -1
View File
@@ -3,6 +3,7 @@
#include "LifeMeter.h" #include "LifeMeter.h"
#include "Sprite.h" #include "Sprite.h"
#include "AutoActor.h"
#include "Quad.h" #include "Quad.h"
class LifeMeterStream; class LifeMeterStream;
@@ -36,7 +37,8 @@ public:
private: private:
void ResetBarVelocity(); void ResetBarVelocity();
Quad m_quadBlackBackground; AutoActor m_sprBackground;
Quad m_quadDangerGlow;
LifeMeterStream* m_pStream; LifeMeterStream* m_pStream;
float m_fLifePercentage; float m_fLifePercentage;