[MusicWheel] Added EmptyColor metric.

This commit is contained in:
AJ Kelly
2012-05-27 12:55:31 -05:00
parent ad568055d1
commit 44523f0c48
4 changed files with 11 additions and 4 deletions
+4
View File
@@ -8,6 +8,10 @@ ________________________________________________________________________________
StepMania 5.0 ???? ?? | 20120???
--------------------------------------------------------------------------------
2012/05/27
----------
* [MusicWheel] Added EmptyColor metric.
2012/05/21
----------
* [NotesLoaderBMS] Support for #BMP based background changes. [theDtTvB]
+1
View File
@@ -936,6 +936,7 @@ SortMenuColor=color("1,1,1,1")
RouletteColor=color("1,0,0,1")
RandomColor=color("1,0,0,1")
PortalColor=color("1,0,0,1")
EmptyColor=color("1,0,0,1")
SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Artist", "SortOrder_Genre" }
# SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" }
+5 -4
View File
@@ -99,9 +99,10 @@ void MusicWheel::Load( RString sType )
CUSTOM_CHOICES.Load(sType,CUSTOM_WHEEL_ITEM_NAME,vsCustomItemNames);
CUSTOM_CHOICE_COLORS.Load(sType,CUSTOM_WHEEL_ITEM_COLOR,vsCustomItemNames);
ROULETTE_COLOR .Load(sType,"RouletteColor");
RANDOM_COLOR .Load(sType,"RandomColor");
PORTAL_COLOR .Load(sType,"PortalColor");
ROULETTE_COLOR .Load(sType,"RouletteColor");
RANDOM_COLOR .Load(sType,"RandomColor");
PORTAL_COLOR .Load(sType,"PortalColor");
EMPTY_COLOR .Load(sType,"EmptyColor");
WheelBase::Load( sType );
@@ -1050,7 +1051,7 @@ void MusicWheel::FilterWheelItemDatas(vector<MusicWheelItemData *> &aUnFilteredD
// If we've filtered all items, insert a dummy.
if( aFilteredData.empty() )
aFilteredData.push_back( new MusicWheelItemData(WheelItemDataType_Section, NULL, EMPTY_STRING, NULL, RageColor(1,0,0,1), 0) );
aFilteredData.push_back( new MusicWheelItemData(WheelItemDataType_Section, NULL, EMPTY_STRING, NULL, EMPTY_COLOR, 0) );
}
void MusicWheel::UpdateSwitch()
+1
View File
@@ -91,6 +91,7 @@ protected:
ThemeMetric<RageColor> ROULETTE_COLOR;
ThemeMetric<RageColor> RANDOM_COLOR;
ThemeMetric<RageColor> PORTAL_COLOR;
ThemeMetric<RageColor> EMPTY_COLOR;
vector <int> m_viWheelPositions;
ThemeMetric<RString> CUSTOM_WHEEL_ITEM_NAMES;
ThemeMetricMap<RString> CUSTOM_CHOICES;