From 957cb50bb4e86d763180b937305122b7af1d145e Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Sun, 27 Feb 2011 19:45:05 -0800 Subject: [PATCH 1/4] Draw only the amount of musicwheel items needed. The MusicWheel is _slow_. --- Themes/default/metrics.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 29d9ea8bb0..d82452f920 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -162,7 +162,7 @@ ScrollBarOnCommand=visible,false ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; end; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end -NumWheelItems=13 +NumWheelItems=11 MusicWheelSortOnCommand=fov,90; MusicWheelSortOffCommand=fov,90; MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1 From 0e69687e5990ad7bd409b074840b33a72c1bd9a4 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Sun, 27 Feb 2011 19:45:55 -0800 Subject: [PATCH 2/4] speed up MusicWheel switch slightly --- Themes/default/metrics.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index d82452f920..cca7ef73d1 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -140,7 +140,7 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol [MusicWheel] FadeSeconds=1 -SwitchSeconds=0.10 +SwitchSeconds=0.08 RandomPicksLockedSongs=true RouletteSwitchSeconds=0.05 RouletteSlowDownSwitches=5 From d23a718b8bd13fa0e37ed47739fa13ebcd4c489c Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 27 Feb 2011 22:04:14 -0600 Subject: [PATCH 3/4] change this to use the string binding --- Themes/_fallback/Scripts/03 CustomSpeedMods.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua index 3b0a905e6f..87275c6ec2 100644 --- a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua +++ b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua @@ -263,7 +263,7 @@ function SpeedMods() Choices = GetSpeedMods(), LoadSelections = function(self, list, pn) - local pMods = GAMESTATE:GetPlayerState(pn):GetPlayerOptions("ModsLevel_Preferred") + local pMods = GAMESTATE:GetPlayerState(pn):GetPlayerOptionsString("ModsLevel_Preferred") for i = 1,table.getn(self.Choices) do if string.find(pMods, self.Choices[i]) then list[i] = true From d0059135c4efc1502f63158b7b797a1eb871bba0 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 27 Feb 2011 22:05:22 -0600 Subject: [PATCH 4/4] whiny piece of junk --- src/GameState.cpp | 14 +++++++++----- src/GameState.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/GameState.cpp b/src/GameState.cpp index ec68e416a0..08ca8205ea 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -42,7 +42,6 @@ #include #include - GameState* GAMESTATE = NULL; // global and accessable from anywhere in our program #define NAME_BLACKLIST_FILE "/Data/NamesBlacklist.txt" @@ -161,7 +160,7 @@ GameState::GameState() : m_Environment = new LuaTable; // Don't reset yet; let the first screen do it, so we can use PREFSMAN and THEME. -// Reset(); + //Reset(); // Register with Lua. { @@ -254,7 +253,7 @@ void GameState::Reset() m_MultiPlayerStatus[p] = MultiPlayerStatus_NotJoined; FOREACH_PlayerNumber( pn ) MEMCARDMAN->UnlockCard( pn ); -// m_iCoins = 0; // don't reset coin count! + //m_iCoins = 0; // don't reset coin count! m_bMultiplayer = false; m_iNumMultiplayerNoteFields = 1; *m_Environment = LuaTable(); @@ -399,7 +398,7 @@ void GameState::UnjoinPlayer( PlayerNumber pn ) } } -/* handle multiplayer join? */ +/* xxx: handle multiplayer join? -aj */ namespace { @@ -426,7 +425,7 @@ namespace } }; -// Handle an input that can join a player. Return true if the player joined +// Handle an input that can join a player. Return true if the player joined. bool GameState::JoinInput( PlayerNumber pn ) { // When AutoJoin is enabled, join all players on a single start press. @@ -1461,6 +1460,11 @@ void GameState::LoadNoteSkinMetrics( PlayerNumber pn ) RString m_sNoteSkin = m_pPlayerState[pn]->m_PlayerOptions.GetStage().m_sNoteSkin; RString sStepsType = StringConversion::ToString( this->m_pCurSteps[pn]->m_StepsType ); LOG->Trace("Loading Row/Col/Size values for Noteskin %s | StepsType: %s",m_sNoteSkin.c_str(),sStepsType.c_str()); + + //m_iNoteSkinRowSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "RowSpacing" ); + // todo: allow per-column spacing values? -aj + m_iNoteSkinColSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ColSpacing" ); + m_iNoteSkinArrowSize[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ArrowSize" ); } */ diff --git a/src/GameState.h b/src/GameState.h index b749151a4b..2aef08cc0d 100644 --- a/src/GameState.h +++ b/src/GameState.h @@ -215,8 +215,8 @@ public: BroadcastOnChange m_bGameplayLeadIn; // Metricable noteskin things - //void LoadNoteSkinMetrics( PlayerNumber pn ); /* + void LoadNoteSkinMetrics( PlayerNumber pn ); int m_iNoteSkinColSpacing[NUM_PLAYERS]; int m_iNoteSkinArrowSize[NUM_PLAYERS]; */