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

make wheel item locked color a metric

Browse Source
This commit is contained in:
Chris Danford
2006-04-25 08:46:43 +00:00
parent c3f0cd20c7
commit 61955f3266
6 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -2283,6 +2283,7 @@ WheelItemOnDelayCenter=0
WheelItemOnDelayOffset=0.04 WheelItemOnDelayOffset=0.04
WheelItemOffDelayCenter=0 WheelItemOffDelayCenter=0
WheelItemOffDelayOffset=0.04 WheelItemOffDelayOffset=0.04
WheelItemLockedColor=0,0,0,0.5
NumSectionColors=7 NumSectionColors=7
SectionColor1=0.8,0.1,0.6,1 // pink SectionColor1=0.8,0.1,0.6,1 // pink
SectionColor2=0.6,0.4,0.8,1 // purple SectionColor2=0.6,0.4,0.8,1 // purple
stepmania/src/MusicWheelItem.cpp
-1
View File
@@ -62,7 +62,6 @@ MusicWheelItem::MusicWheelItem( RString sType ):
m_sprSortBar.Load( THEME->GetPathG(sType,"sort") ); m_sprSortBar.Load( THEME->GetPathG(sType,"sort") );
this->AddChild( &m_sprSortBar ); this->AddChild( &m_sprSortBar );
m_fPercentGray = 0;
m_WheelNotifyIcon.SetXY( ICON_X, ICON_Y ); m_WheelNotifyIcon.SetXY( ICON_X, ICON_Y );
m_WheelNotifyIcon.RunCommands( ICON_ON_COMMAND ); m_WheelNotifyIcon.RunCommands( ICON_ON_COMMAND );
this->AddChild( &m_WheelNotifyIcon ); this->AddChild( &m_WheelNotifyIcon );
stepmania/src/WheelBase.cpp
+13 -13
View File
@@ -17,7 +17,6 @@
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
const int MAX_WHEEL_SOUND_SPEED = 15; const int MAX_WHEEL_SOUND_SPEED = 15;
WheelBase::WheelBase() WheelBase::WheelBase()
@@ -59,24 +58,25 @@ void WheelBase::Load( RString sType )
void WheelBase::LoadFromMetrics( RString sType ) void WheelBase::LoadFromMetrics( RString sType )
{ {
SWITCH_SECONDS .Load(sType,"SwitchSeconds"); SWITCH_SECONDS .Load(sType,"SwitchSeconds");
LOCKED_INITIAL_VELOCITY .Load(sType,"LockedInitialVelocity"); LOCKED_INITIAL_VELOCITY .Load(sType,"LockedInitialVelocity");
SCROLL_BAR_X .Load(sType,"ScrollBarX"); SCROLL_BAR_X .Load(sType,"ScrollBarX");
SCROLL_BAR_HEIGHT .Load(sType,"ScrollBarHeight"); SCROLL_BAR_HEIGHT .Load(sType,"ScrollBarHeight");
ITEM_CURVE_X .Load(sType,"ItemCurveX"); ITEM_CURVE_X .Load(sType,"ItemCurveX");
USE_LINEAR_WHEEL .Load(sType,"NoCurving"); USE_LINEAR_WHEEL .Load(sType,"NoCurving");
ITEM_SPACING_Y .Load(sType,"ItemSpacingY"); ITEM_SPACING_Y .Load(sType,"ItemSpacingY");
WHEEL_3D_RADIUS .Load(sType,"Wheel3DRadius"); WHEEL_3D_RADIUS .Load(sType,"Wheel3DRadius");
CIRCLE_PERCENT .Load(sType,"CirclePercent"); CIRCLE_PERCENT .Load(sType,"CirclePercent");
USE_3D .Load(sType,"Use3D"); USE_3D .Load(sType,"Use3D");
NUM_WHEEL_ITEMS_TO_DRAW .Load(sType,"NumWheelItems"); NUM_WHEEL_ITEMS_TO_DRAW .Load(sType,"NumWheelItems");
WHEEL_ITEM_ON_DELAY_CENTER .Load(sType,"WheelItemOnDelayCenter"); WHEEL_ITEM_ON_DELAY_CENTER .Load(sType,"WheelItemOnDelayCenter");
WHEEL_ITEM_ON_DELAY_OFFSET .Load(sType,"WheelItemOnDelayOffset"); WHEEL_ITEM_ON_DELAY_OFFSET .Load(sType,"WheelItemOnDelayOffset");
WHEEL_ITEM_OFF_DELAY_CENTER .Load(sType,"WheelItemOffDelayCenter"); WHEEL_ITEM_OFF_DELAY_CENTER .Load(sType,"WheelItemOffDelayCenter");
WHEEL_ITEM_OFF_DELAY_OFFSET .Load(sType,"WheelItemOffDelayOffset"); WHEEL_ITEM_OFF_DELAY_OFFSET .Load(sType,"WheelItemOffDelayOffset");
WHEEL_ITEM_LOCKED_COLOR .Load(sType,"WheelItemLockedColor");
m_soundChangeMusic.Load( THEME->GetPathS(sType,"change"), true ); m_soundChangeMusic.Load( THEME->GetPathS(sType,"change"), true );
m_soundLocked.Load( THEME->GetPathS(sType,"locked"), true ); m_soundLocked.Load( THEME->GetPathS(sType,"locked"), true );
m_sprHighlight.Load( THEME->GetPathG(sType,"highlight") ); m_sprHighlight.Load( THEME->GetPathG(sType,"highlight") );
m_sprHighlight->SetName( "Highlight" ); m_sprHighlight->SetName( "Highlight" );
@@ -177,9 +177,9 @@ void WheelBase::DrawItem( int i, WheelItemBase *display, const float fThisBanner
} }
if( m_WheelState == STATE_LOCKED && i != NUM_WHEEL_ITEMS/2 ) if( m_WheelState == STATE_LOCKED && i != NUM_WHEEL_ITEMS/2 )
display->m_fPercentGray = 0.5f; display->m_colorLocked = WHEEL_ITEM_LOCKED_COLOR.GetValue();
else else
display->m_fPercentGray = 0; display->m_colorLocked = RageColor(0,0,0,0);
display->Draw(); display->Draw();
} }
stepmania/src/WheelBase.h
+23 -22
View File
@@ -67,25 +67,25 @@ protected:
virtual void BuildWheelItemsData( vector<WheelItemBaseData *> &arrayWheelItemDatas ); virtual void BuildWheelItemsData( vector<WheelItemBaseData *> &arrayWheelItemDatas );
int FirstVisibleIndex(); int FirstVisibleIndex();
ScrollBar m_ScrollBar; ScrollBar m_ScrollBar;
AutoActor m_sprHighlight; AutoActor m_sprHighlight;
vector<WheelItemBaseData *> m_WheelBaseItemsData; vector<WheelItemBaseData *> m_WheelBaseItemsData;
vector<WheelItemBase *> m_WheelBaseItems; vector<WheelItemBase *> m_WheelBaseItems;
WheelItemBaseData* m_LastSelection; WheelItemBaseData* m_LastSelection;
bool m_isEmpty; bool m_isEmpty;
int m_iSelection; // index into m_CurWheelItemBaseData int m_iSelection; // index into m_CurWheelItemBaseData
RString m_sExpandedSectionName; RString m_sExpandedSectionName;
int m_iSwitchesLeftInSpinDown; int m_iSwitchesLeftInSpinDown;
float m_fLockedWheelVelocity; float m_fLockedWheelVelocity;
/* 0 = none; -1 or 1 = up/down */ /* 0 = none; -1 or 1 = up/down */
int m_Moving; int m_Moving;
RageTimer m_MovingSoundTimer; RageTimer m_MovingSoundTimer;
float m_TimeBeforeMovingBegins; float m_TimeBeforeMovingBegins;
float m_SpinSpeed; float m_SpinSpeed;
enum WheelState { enum WheelState {
STATE_SELECTING, STATE_SELECTING,
STATE_FLYING_OFF_BEFORE_NEXT_SORT, STATE_FLYING_OFF_BEFORE_NEXT_SORT,
@@ -98,9 +98,9 @@ protected:
STATE_RANDOM_SPINNING, STATE_RANDOM_SPINNING,
STATE_LOCKED, STATE_LOCKED,
}; };
WheelState m_WheelState; WheelState m_WheelState;
float m_fTimeLeftInState; float m_fTimeLeftInState;
float m_fPositionOffsetFromSelection; float m_fPositionOffsetFromSelection;
RageSound m_soundChangeMusic; RageSound m_soundChangeMusic;
RageSound m_soundExpand; RageSound m_soundExpand;
@@ -111,20 +111,21 @@ protected:
void UpdateScrollbar(unsigned int size); void UpdateScrollbar(unsigned int size);
ThemeMetric<float> SWITCH_SECONDS; ThemeMetric<float> SWITCH_SECONDS;
ThemeMetric<float> LOCKED_INITIAL_VELOCITY; ThemeMetric<float> LOCKED_INITIAL_VELOCITY;
ThemeMetric<float> SCROLL_BAR_X; ThemeMetric<float> SCROLL_BAR_X;
ThemeMetric<int> SCROLL_BAR_HEIGHT; ThemeMetric<int> SCROLL_BAR_HEIGHT;
ThemeMetric<float> ITEM_CURVE_X; ThemeMetric<float> ITEM_CURVE_X;
ThemeMetric<bool> USE_LINEAR_WHEEL; ThemeMetric<bool> USE_LINEAR_WHEEL;
ThemeMetric<float> ITEM_SPACING_Y; ThemeMetric<float> ITEM_SPACING_Y;
ThemeMetric<float> WHEEL_3D_RADIUS; ThemeMetric<float> WHEEL_3D_RADIUS;
ThemeMetric<float> CIRCLE_PERCENT; ThemeMetric<float> CIRCLE_PERCENT;
ThemeMetric<bool> USE_3D; ThemeMetric<bool> USE_3D;
ThemeMetric<float> NUM_WHEEL_ITEMS_TO_DRAW; ThemeMetric<float> NUM_WHEEL_ITEMS_TO_DRAW;
ThemeMetric<float> WHEEL_ITEM_ON_DELAY_CENTER; ThemeMetric<float> WHEEL_ITEM_ON_DELAY_CENTER;
ThemeMetric<float> WHEEL_ITEM_ON_DELAY_OFFSET; ThemeMetric<float> WHEEL_ITEM_ON_DELAY_OFFSET;
ThemeMetric<float> WHEEL_ITEM_OFF_DELAY_CENTER; ThemeMetric<float> WHEEL_ITEM_OFF_DELAY_CENTER;
ThemeMetric<float> WHEEL_ITEM_OFF_DELAY_OFFSET; ThemeMetric<float> WHEEL_ITEM_OFF_DELAY_OFFSET;
ThemeMetric<RageColor> WHEEL_ITEM_LOCKED_COLOR;
}; };
#endif #endif
stepmania/src/WheelItemBase.cpp
+3 -3
View File
@@ -39,7 +39,7 @@ void WheelItemBase::Load( RString sType )
TEXT_Y .Load(sType,"TextY"); TEXT_Y .Load(sType,"TextY");
TEXT_ON_COMMAND .Load(sType,"TextOnCommand"); TEXT_ON_COMMAND .Load(sType,"TextOnCommand");
m_fPercentGray = 0; m_colorLocked = RageColor(0,0,0,0);
m_sprBar.Load( THEME->GetPathG(sType,"bar") ); m_sprBar.Load( THEME->GetPathG(sType,"bar") );
m_sprBar.SetXY( 0, 0 ); m_sprBar.SetXY( 0, 0 );
@@ -77,13 +77,13 @@ void WheelItemBase::LoadFromWheelItemBaseData( WheelItemBaseData* pWID )
void WheelItemBase::DrawGrayBar( Actor& bar ) void WheelItemBase::DrawGrayBar( Actor& bar )
{ {
if( m_fPercentGray == 0 ) if( m_colorLocked.a == 0 )
return; return;
RageColor glow = bar.GetGlow(); RageColor glow = bar.GetGlow();
RageColor diffuse = bar.GetDiffuse(); RageColor diffuse = bar.GetDiffuse();
bar.SetGlow( RageColor(0,0,0,m_fPercentGray) ); bar.SetGlow( m_colorLocked );
bar.SetDiffuse( RageColor(0,0,0,0) ); bar.SetDiffuse( RageColor(0,0,0,0) );
bar.Draw(); bar.Draw();
stepmania/src/WheelItemBase.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual void LoadFromWheelItemBaseData( WheelItemBaseData* pWID ); virtual void LoadFromWheelItemBaseData( WheelItemBaseData* pWID );
float m_fPercentGray; RageColor m_colorLocked;
protected: protected:
void SetGrayBar( Actor *pBar ) { m_pBar = pBar; } void SetGrayBar( Actor *pBar ) { m_pBar = pBar; }