diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs index 1c4d409c..9becda0e 100644 --- a/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs +++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs @@ -162,7 +162,7 @@ namespace VocaluxeLib.PartyModes.Challenge if (player != Data.ScreenConfig.NumPlayer || mics != Data.ScreenConfig.NumPlayerAtOnce) { - int num = CHelper.nCk(Data.ScreenConfig.NumPlayer, Data.ScreenConfig.NumPlayerAtOnce); + int num = CHelper.CombinationCount(Data.ScreenConfig.NumPlayer, Data.ScreenConfig.NumPlayerAtOnce); while (num > _MaxNumRounds) num -= _RoundSteps; Data.ScreenConfig.NumRounds = num; diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs index 60811c80..e8cb01ee 100644 --- a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs +++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs @@ -202,9 +202,9 @@ namespace VocaluxeLib.PartyModes.Challenge UpdateButtonNext(); //Update texture and name PlayerDestinationButtons[added].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[added].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[added].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[added].Texture = chooseAvatarStatic.Texture; - PlayerDestinationButtons[added].STexture = chooseAvatarStatic.Texture; + PlayerDestinationButtons[added].SelTexture = chooseAvatarStatic.Texture; PlayerDestinationButtons[added].Text.Text = CBase.Profiles.GetProfiles()[SelectedPlayerNr].PlayerName; //Update Tiles-List UpdateButtonPlayerChoose(); @@ -342,9 +342,9 @@ namespace VocaluxeLib.PartyModes.Challenge PlayerChooseButtons[i].ProfileID = PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]; PlayerChooseButtons[i].Button.Text.Text = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].PlayerName; PlayerChooseButtons[i].Button.Texture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; - PlayerChooseButtons[i].Button.STexture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; + PlayerChooseButtons[i].Button.SelTexture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; PlayerChooseButtons[i].Button.Color = new SColorF(1, 1, 1, 0.6f); - PlayerChooseButtons[i].Button.SColor = new SColorF(1, 1, 1, 1); + PlayerChooseButtons[i].Button.SelColor = new SColorF(1, 1, 1, 1); PlayerChooseButtons[i].Button.Enabled = true; } else @@ -352,9 +352,9 @@ namespace VocaluxeLib.PartyModes.Challenge PlayerChooseButtons[i].ProfileID = -1; PlayerChooseButtons[i].Button.Text.Text = String.Empty; PlayerChooseButtons[i].Button.Texture = Buttons[ButtonPlayerChoose].Texture; - PlayerChooseButtons[i].Button.STexture = Buttons[ButtonPlayerChoose].STexture; + PlayerChooseButtons[i].Button.SelTexture = Buttons[ButtonPlayerChoose].SelTexture; PlayerChooseButtons[i].Button.Color = Buttons[ButtonPlayerChoose].Color; - PlayerChooseButtons[i].Button.SColor = Buttons[ButtonPlayerChoose].SColor; + PlayerChooseButtons[i].Button.SelColor = Buttons[ButtonPlayerChoose].SelColor; PlayerChooseButtons[i].Button.Enabled = false; } } @@ -409,9 +409,9 @@ namespace VocaluxeLib.PartyModes.Challenge if (Data.ScreenNames.ProfileIDs[i] != -1) { PlayerDestinationButtons[i].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[i].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[i].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[i].Texture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].Avatar.Texture; - PlayerDestinationButtons[i].STexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].Avatar.Texture; + PlayerDestinationButtons[i].SelTexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].Avatar.Texture; PlayerDestinationButtons[i].Text.Text = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].PlayerName; PlayerDestinationButtons[i].Enabled = true; } @@ -419,9 +419,9 @@ namespace VocaluxeLib.PartyModes.Challenge else { PlayerDestinationButtons[i].Color = Buttons[ButtonPlayerDestination].Color; - PlayerDestinationButtons[i].SColor = Buttons[ButtonPlayerDestination].SColor; + PlayerDestinationButtons[i].SelColor = Buttons[ButtonPlayerDestination].SelColor; PlayerDestinationButtons[i].Texture = Buttons[ButtonPlayerDestination].Texture; - PlayerDestinationButtons[i].STexture = Buttons[ButtonPlayerDestination].STexture; + PlayerDestinationButtons[i].SelTexture = Buttons[ButtonPlayerDestination].SelTexture; PlayerDestinationButtons[i].Text.Text = String.Empty; PlayerDestinationButtons[i].Enabled = false; } @@ -452,9 +452,9 @@ namespace VocaluxeLib.PartyModes.Challenge UpdateButtonNext(); //Update texture and name PlayerDestinationButtons[added].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[added].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[added].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[added].Texture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; - PlayerDestinationButtons[added].STexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; + PlayerDestinationButtons[added].SelTexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; PlayerDestinationButtons[added].Text.Text = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].PlayerName; PlayerDestinationButtons[added].Enabled = true; //Update Tiles-List diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs index 4bdecc8d..08fdac7e 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs @@ -162,7 +162,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley if (player != Data.ScreenConfig.NumPlayer || mics != Data.ScreenConfig.NumPlayerAtOnce) { - int num = CHelper.nCk(Data.ScreenConfig.NumPlayer, Data.ScreenConfig.NumPlayerAtOnce); + int num = CHelper.CombinationCount(Data.ScreenConfig.NumPlayer, Data.ScreenConfig.NumPlayerAtOnce); while (num > _MaxNumRounds) num -= _RoundSteps; Data.ScreenConfig.NumRounds = num; diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs index 700bbcaa..e2f24897 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs @@ -202,9 +202,9 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley UpdateButtonNext(); //Update texture and name PlayerDestinationButtons[added].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[added].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[added].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[added].Texture = chooseAvatarStatic.Texture; - PlayerDestinationButtons[added].STexture = chooseAvatarStatic.Texture; + PlayerDestinationButtons[added].SelTexture = chooseAvatarStatic.Texture; PlayerDestinationButtons[added].Text.Text = CBase.Profiles.GetProfiles()[SelectedPlayerNr].PlayerName; //Update Tiles-List UpdateButtonPlayerChoose(); @@ -342,9 +342,9 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley PlayerChooseButtons[i].ProfileID = PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]; PlayerChooseButtons[i].Button.Text.Text = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].PlayerName; PlayerChooseButtons[i].Button.Texture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; - PlayerChooseButtons[i].Button.STexture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; + PlayerChooseButtons[i].Button.SelTexture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; PlayerChooseButtons[i].Button.Color = new SColorF(1, 1, 1, 0.6f); - PlayerChooseButtons[i].Button.SColor = new SColorF(1, 1, 1, 1); + PlayerChooseButtons[i].Button.SelColor = new SColorF(1, 1, 1, 1); PlayerChooseButtons[i].Button.Enabled = true; } else @@ -352,9 +352,9 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley PlayerChooseButtons[i].ProfileID = -1; PlayerChooseButtons[i].Button.Text.Text = String.Empty; PlayerChooseButtons[i].Button.Texture = Buttons[ButtonPlayerChoose].Texture; - PlayerChooseButtons[i].Button.STexture = Buttons[ButtonPlayerChoose].STexture; + PlayerChooseButtons[i].Button.SelTexture = Buttons[ButtonPlayerChoose].SelTexture; PlayerChooseButtons[i].Button.Color = Buttons[ButtonPlayerChoose].Color; - PlayerChooseButtons[i].Button.SColor = Buttons[ButtonPlayerChoose].SColor; + PlayerChooseButtons[i].Button.SelColor = Buttons[ButtonPlayerChoose].SelColor; PlayerChooseButtons[i].Button.Enabled = false; } } @@ -409,9 +409,9 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley if (Data.ScreenNames.ProfileIDs[i] != -1) { PlayerDestinationButtons[i].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[i].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[i].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[i].Texture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].Avatar.Texture; - PlayerDestinationButtons[i].STexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].Avatar.Texture; + PlayerDestinationButtons[i].SelTexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].Avatar.Texture; PlayerDestinationButtons[i].Text.Text = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDs[i]].PlayerName; PlayerDestinationButtons[i].Enabled = true; } @@ -419,9 +419,9 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley else { PlayerDestinationButtons[i].Color = Buttons[ButtonPlayerDestination].Color; - PlayerDestinationButtons[i].SColor = Buttons[ButtonPlayerDestination].SColor; + PlayerDestinationButtons[i].SelColor = Buttons[ButtonPlayerDestination].SelColor; PlayerDestinationButtons[i].Texture = Buttons[ButtonPlayerDestination].Texture; - PlayerDestinationButtons[i].STexture = Buttons[ButtonPlayerDestination].STexture; + PlayerDestinationButtons[i].SelTexture = Buttons[ButtonPlayerDestination].SelTexture; PlayerDestinationButtons[i].Text.Text = String.Empty; PlayerDestinationButtons[i].Enabled = false; } @@ -452,9 +452,9 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley UpdateButtonNext(); //Update texture and name PlayerDestinationButtons[added].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[added].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[added].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[added].Texture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; - PlayerDestinationButtons[added].STexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; + PlayerDestinationButtons[added].SelTexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; PlayerDestinationButtons[added].Text.Text = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].PlayerName; PlayerDestinationButtons[added].Enabled = true; //Update Tiles-List diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs index ece24122..eb8c2216 100644 --- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs +++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs @@ -430,25 +430,25 @@ namespace VocaluxeLib.PartyModes.TicTacToe Fields[i].Button.Enabled = true; Fields[i].Button.Texture = Buttons[ButtonField].Texture; Fields[i].Button.Color = Buttons[ButtonField].Color; - Fields[i].Button.SColor = Buttons[ButtonField].SColor; + Fields[i].Button.SelColor = Buttons[ButtonField].SelColor; Fields[i].Content = GameData.Rounds[i]; if (Fields[i].Content.Finished) { Fields[i].Button.Enabled = false; Fields[i].Button.Texture = CBase.Songs.GetSongByID(Fields[i].Content.SongID).CoverTextureBig; Fields[i].Button.Color = CBase.Theme.GetPlayerColor(Fields[i].Content.Winner); - Fields[i].Button.SColor = CBase.Theme.GetPlayerColor(Fields[i].Content.Winner); + Fields[i].Button.SelColor = CBase.Theme.GetPlayerColor(Fields[i].Content.Winner); } if (Status == EStatus.FieldSelected && SelectedField == i) { Fields[i].Button.Texture = CBase.Songs.GetSongByID(Fields[i].Content.SongID).CoverTextureBig; Fields[i].Button.Color = new SColorF(1, 1, 1, 1); - Fields[i].Button.SColor = new SColorF(1, 1, 1, 1); + Fields[i].Button.SelColor = new SColorF(1, 1, 1, 1); Fields[i].Button.Enabled = false; } if (Status == EStatus.JokerRetry && Fields[i].Content.Finished) { - Fields[i].Button.SColor = CBase.Theme.GetPlayerColor(GameData.Team + 1); + Fields[i].Button.SelColor = CBase.Theme.GetPlayerColor(GameData.Team + 1); Fields[i].Button.Enabled = true; } if (Status == EStatus.JokerRetry && !Fields[i].Content.Finished) diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs index d83987d7..e4fe9478 100644 --- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs +++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs @@ -237,9 +237,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe UpdateButtonNext(); //Update texture and name PlayerDestinationButtons[added].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[added].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[added].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[added].Texture = chooseAvatarStatic.Texture; - PlayerDestinationButtons[added].STexture = chooseAvatarStatic.Texture; + PlayerDestinationButtons[added].SelTexture = chooseAvatarStatic.Texture; PlayerDestinationButtons[added].Text.Text = CBase.Profiles.GetProfiles()[SelectedPlayerNr].PlayerName; PlayerDestinationButtons[added].Enabled = true; //Update Tiles-List @@ -405,9 +405,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe PlayerChooseButtons[i].ProfileID = PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]; PlayerChooseButtons[i].Button.Text.Text = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].PlayerName; PlayerChooseButtons[i].Button.Texture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; - PlayerChooseButtons[i].Button.STexture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; + PlayerChooseButtons[i].Button.SelTexture = CBase.Profiles.GetProfiles()[PlayerChooseButtonsVisibleProfiles[i + Offset * NumButtonPlayerChoose]].Avatar.Texture; PlayerChooseButtons[i].Button.Color = new SColorF(1, 1, 1, 0.6f); - PlayerChooseButtons[i].Button.SColor = new SColorF(1, 1, 1, 1); + PlayerChooseButtons[i].Button.SelColor = new SColorF(1, 1, 1, 1); PlayerChooseButtons[i].Button.Enabled = true; } else @@ -415,9 +415,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe PlayerChooseButtons[i].ProfileID = -1; PlayerChooseButtons[i].Button.Text.Text = String.Empty; PlayerChooseButtons[i].Button.Texture = Buttons[ButtonPlayerChoose].Texture; - PlayerChooseButtons[i].Button.STexture = Buttons[ButtonPlayerChoose].STexture; + PlayerChooseButtons[i].Button.SelTexture = Buttons[ButtonPlayerChoose].SelTexture; PlayerChooseButtons[i].Button.Color = Buttons[ButtonPlayerChoose].Color; - PlayerChooseButtons[i].Button.SColor = Buttons[ButtonPlayerChoose].SColor; + PlayerChooseButtons[i].Button.SelColor = Buttons[ButtonPlayerChoose].SelColor; PlayerChooseButtons[i].Button.Enabled = false; } } @@ -495,9 +495,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe if (Data.ScreenNames.ProfileIDsTeam1[i] != -1) { PlayerDestinationButtons[i].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[i].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[i].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[i].Texture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam1[i]].Avatar.Texture; - PlayerDestinationButtons[i].STexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam1[i]].Avatar.Texture; + PlayerDestinationButtons[i].SelTexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam1[i]].Avatar.Texture; PlayerDestinationButtons[i].Text.Text = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam1[i]].PlayerName; PlayerDestinationButtons[i].Enabled = true; } @@ -505,9 +505,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe else { PlayerDestinationButtons[i].Color = Buttons[ButtonPlayerDestination].Color; - PlayerDestinationButtons[i].SColor = Buttons[ButtonPlayerDestination].SColor; + PlayerDestinationButtons[i].SelColor = Buttons[ButtonPlayerDestination].SelColor; PlayerDestinationButtons[i].Texture = Buttons[ButtonPlayerDestination].Texture; - PlayerDestinationButtons[i].STexture = Buttons[ButtonPlayerDestination].STexture; + PlayerDestinationButtons[i].SelTexture = Buttons[ButtonPlayerDestination].SelTexture; PlayerDestinationButtons[i].Text.Text = String.Empty; PlayerDestinationButtons[i].Enabled = false; } @@ -519,9 +519,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe if (Data.ScreenNames.ProfileIDsTeam2[i] != -1) { PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Texture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam2[i]].Avatar.Texture; - PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].STexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam2[i]].Avatar.Texture; + PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].SelTexture = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam2[i]].Avatar.Texture; PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Text.Text = CBase.Profiles.GetProfiles()[Data.ScreenNames.ProfileIDsTeam2[i]].PlayerName; PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Enabled = true; } @@ -529,9 +529,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe else { PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Color = Buttons[ButtonPlayerDestination].Color; - PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].SColor = Buttons[ButtonPlayerDestination].SColor; + PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].SelColor = Buttons[ButtonPlayerDestination].SelColor; PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Texture = Buttons[ButtonPlayerDestination].Texture; - PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].STexture = Buttons[ButtonPlayerDestination].STexture; + PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].SelTexture = Buttons[ButtonPlayerDestination].SelTexture; PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Text.Text = String.Empty; PlayerDestinationButtons[i + PlayerDestinationButtonsNumH].Enabled = false; } @@ -562,9 +562,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe UpdateButtonNext(); //Update texture and name PlayerDestinationButtons[added].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[added].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[added].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[added].Texture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; - PlayerDestinationButtons[added].STexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; + PlayerDestinationButtons[added].SelTexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; PlayerDestinationButtons[added].Text.Text = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].PlayerName; PlayerDestinationButtons[added].Enabled = true; //Update Tiles-List @@ -579,9 +579,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe UpdateButtonNext(); //Update texture and name PlayerDestinationButtons[added].Color = new SColorF(1, 1, 1, 0.6f); - PlayerDestinationButtons[added].SColor = new SColorF(1, 1, 1, 1); + PlayerDestinationButtons[added].SelColor = new SColorF(1, 1, 1, 1); PlayerDestinationButtons[added].Texture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; - PlayerDestinationButtons[added].STexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; + PlayerDestinationButtons[added].SelTexture = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].Avatar.Texture; PlayerDestinationButtons[added].Text.Text = CBase.Profiles.GetProfiles()[PlayerChooseButtons[i].ProfileID].PlayerName; PlayerDestinationButtons[added].Enabled = true; //Update Tiles-List diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs index b06a93b9..36d2cd9b 100644 --- a/Vocaluxe/Base/CGraphics.cs +++ b/Vocaluxe/Base/CGraphics.cs @@ -588,7 +588,7 @@ namespace Vocaluxe.Base if (KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.F1)) CSettings.GameState = EGameState.EditTheme; else if (KeyEvent.ModALT && (KeyEvent.Key == Keys.Enter)) - CSettings.bFullScreen = !CSettings.bFullScreen; + CSettings.IsFullScreen = !CSettings.IsFullScreen; else if (KeyEvent.ModALT && (KeyEvent.Key == Keys.P)) CDraw.MakeScreenShot(); else @@ -684,7 +684,7 @@ namespace Vocaluxe.Base _Screens[(int)_CurrentScreen].NextInteraction(); } else if (KeyEvent.ModALT && (KeyEvent.Key == Keys.Enter)) - CSettings.bFullScreen = !CSettings.bFullScreen; + CSettings.IsFullScreen = !CSettings.IsFullScreen; else if (KeyEvent.ModALT && (KeyEvent.Key == Keys.P)) CDraw.MakeScreenShot(); else diff --git a/Vocaluxe/Base/CLog.cs b/Vocaluxe/Base/CLog.cs index a74246f7..f107c260 100644 --- a/Vocaluxe/Base/CLog.cs +++ b/Vocaluxe/Base/CLog.cs @@ -65,7 +65,7 @@ namespace Vocaluxe.Base static class CLog { - private const int MAXBenchmarks = 10; + private const int MaxBenchmarks = 10; private static LogFile _ErrorLog; private static LogFile _PerformanceLog; @@ -82,7 +82,7 @@ namespace Vocaluxe.Base _BenchmarkLog = new LogFile(CSettings.sFileBenchmarkLog, "BenchmarkLog"); _NumErrors = 0; - _BenchmarkTimer = new Stopwatch[MAXBenchmarks]; + _BenchmarkTimer = new Stopwatch[MaxBenchmarks]; for (int i = 0; i < _BenchmarkTimer.Length; i++) _BenchmarkTimer[i] = new Stopwatch(); } @@ -115,7 +115,7 @@ namespace Vocaluxe.Base #region LogBenchmark public static void StartBenchmark(int BenchmarkNr, string Text) { - if (BenchmarkNr >= 0 && BenchmarkNr < MAXBenchmarks) + if (BenchmarkNr >= 0 && BenchmarkNr < MaxBenchmarks) { _BenchmarkTimer[BenchmarkNr].Stop(); _BenchmarkTimer[BenchmarkNr].Reset(); @@ -131,7 +131,7 @@ namespace Vocaluxe.Base public static void StopBenchmark(int BenchmarkNr, string Text) { - if (BenchmarkNr >= 0 && BenchmarkNr < MAXBenchmarks) + if (BenchmarkNr >= 0 && BenchmarkNr < MaxBenchmarks) { _BenchmarkTimer[BenchmarkNr].Stop(); diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index 724171f2..4a1f7b13 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -51,7 +51,7 @@ namespace Vocaluxe.Base public static int zNear = -100; public static int zFar = 100; - public static bool bFullScreen = false; + public static bool IsFullScreen = false; public static int iVertexBufferElements = 10000; public const string sIcon = "Vocaluxe.ico"; diff --git a/Vocaluxe/Base/CSound.cs b/Vocaluxe/Base/CSound.cs index aa3c9874..c4ea483a 100644 --- a/Vocaluxe/Base/CSound.cs +++ b/Vocaluxe/Base/CSound.cs @@ -633,7 +633,7 @@ namespace Vocaluxe.Base private float _CurrentTime; private float _OldTime; - private readonly Stopwatch _STimer; + private readonly Stopwatch _Timer; private readonly float _K; private readonly float _T; @@ -642,8 +642,8 @@ namespace Vocaluxe.Base get { double nanosecPerTick = (1000.0 * 1000.0 * 1000.0) / Stopwatch.Frequency; - long ticks = _STimer.ElapsedTicks; - float dt = _STimer.ElapsedMilliseconds / 1000f; + long ticks = _Timer.ElapsedTicks; + float dt = _Timer.ElapsedMilliseconds / 1000f; if (Stopwatch.IsHighResolution && ticks != 0) dt = (float)(ticks * nanosecPerTick / 1000000000.0); @@ -658,8 +658,8 @@ namespace Vocaluxe.Base _CurrentTime = value; _OldTime = value; - _STimer.Reset(); - _STimer.Start(); + _Timer.Reset(); + _Timer.Start(); } } @@ -668,18 +668,18 @@ namespace Vocaluxe.Base _CurrentTime = CurrentTime; _OldTime = CurrentTime; - _STimer = new Stopwatch(); + _Timer = new Stopwatch(); _K = K; _T = T; } public float Update(float NewTime) { - _STimer.Stop(); + _Timer.Stop(); double nanosecPerTick = (1000.0 * 1000.0 * 1000.0) / Stopwatch.Frequency; - long ticks = _STimer.ElapsedTicks; - float dt = _STimer.ElapsedMilliseconds / 1000f; + long ticks = _Timer.ElapsedTicks; + float dt = _Timer.ElapsedMilliseconds / 1000f; if (Stopwatch.IsHighResolution && ticks != 0) dt = (float)(ticks * nanosecPerTick / 1000000000.0); @@ -691,20 +691,20 @@ namespace Vocaluxe.Base _CurrentTime = Ts * (_K * NewTime - _OldTime) + _OldTime; _OldTime = _CurrentTime; - _STimer.Reset(); - _STimer.Start(); + _Timer.Reset(); + _Timer.Start(); return _CurrentTime; } public void Pause() { - _STimer.Stop(); + _Timer.Stop(); } public void Resume() { - _STimer.Start(); + _Timer.Start(); } } } \ No newline at end of file diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs index 5bed9683..400ece84 100644 --- a/Vocaluxe/Lib/Draw/CDirect3D.cs +++ b/Vocaluxe/Lib/Draw/CDirect3D.cs @@ -211,7 +211,7 @@ namespace Vocaluxe.Lib.Draw protected override void OnResize(EventArgs e) { base.OnResize(e); - RResize(); + DoResize(); } protected override void WndProc(ref Message m) @@ -240,7 +240,7 @@ namespace Vocaluxe.Lib.Draw /// /// Resizes the viewport /// - private void RResize() + private void DoResize() { // The window was minimized, so restore it to the last known size if (ClientSize.Width == 0 || ClientSize.Height == 0) @@ -308,11 +308,11 @@ namespace Vocaluxe.Lib.Draw if (WindowState == FormWindowState.Maximized) { WindowState = FormWindowState.Normal; - RResize(); + DoResize(); WindowState = FormWindowState.Maximized; } else - RResize(); + DoResize(); CConfig.SaveConfig(); } @@ -486,13 +486,13 @@ namespace Vocaluxe.Lib.Draw if (CConfig.FullScreen == EOffOn.TR_CONFIG_ON) { - CSettings.bFullScreen = true; + CSettings.IsFullScreen = true; EnterFullScreen(); } //Resize window if aspect ratio is incorrect if (w / (float)h != CSettings.GetRenderAspect()) - RResize(); + DoResize(); while (_Run) { @@ -530,7 +530,7 @@ namespace Vocaluxe.Lib.Draw } } //Apply fullscreen mode - if (CSettings.bFullScreen != _fullscreen) + if (CSettings.IsFullScreen != _fullscreen) { if (!_fullscreen) EnterFullScreen(); diff --git a/Vocaluxe/Lib/Draw/CDrawWinForm.cs b/Vocaluxe/Lib/Draw/CDrawWinForm.cs index fef172ef..7090ad30 100644 --- a/Vocaluxe/Lib/Draw/CDrawWinForm.cs +++ b/Vocaluxe/Lib/Draw/CDrawWinForm.cs @@ -215,7 +215,7 @@ namespace Vocaluxe.Lib.Draw if (CConfig.FullScreen == EOffOn.TR_CONFIG_ON) { - CSettings.bFullScreen = true; + CSettings.IsFullScreen = true; Maximize(this); } @@ -229,7 +229,7 @@ namespace Vocaluxe.Lib.Draw _Run = CGraphics.UpdateGameLogic(_Keys, _Mouse); FlipBuffer(); - if ((CSettings.bFullScreen && !_fullscreen) || (!CSettings.bFullScreen && _fullscreen)) + if ((CSettings.IsFullScreen && !_fullscreen) || (!CSettings.IsFullScreen && _fullscreen)) ToggleFullScreen(); if (CTime.IsRunning()) diff --git a/Vocaluxe/Lib/Draw/COpenGL.cs b/Vocaluxe/Lib/Draw/COpenGL.cs index 69178311..b977064e 100644 --- a/Vocaluxe/Lib/Draw/COpenGL.cs +++ b/Vocaluxe/Lib/Draw/COpenGL.cs @@ -277,11 +277,11 @@ namespace Vocaluxe.Lib.Draw if (WindowState == FormWindowState.Maximized) { WindowState = FormWindowState.Normal; - RResize(); + DoResize(); WindowState = FormWindowState.Maximized; } else - RResize(); + DoResize(); CConfig.SaveConfig(); } @@ -318,7 +318,7 @@ namespace Vocaluxe.Lib.Draw base.OnResize(e); control.ClientSize = ClientSize; - RResize(); + DoResize(); } protected override void WndProc(ref Message m) @@ -399,7 +399,7 @@ namespace Vocaluxe.Lib.Draw } #endregion keyboard event handlers - private void RResize() + private void DoResize() { h = control.Height; w = control.Width; @@ -452,7 +452,7 @@ namespace Vocaluxe.Lib.Draw if (CConfig.FullScreen == EOffOn.TR_CONFIG_ON) { - CSettings.bFullScreen = true; + CSettings.IsFullScreen = true; EnterFullScreen(); } @@ -468,7 +468,7 @@ namespace Vocaluxe.Lib.Draw _Run = CGraphics.UpdateGameLogic(_Keys, _Mouse); control.SwapBuffers(); - if ((CSettings.bFullScreen && !_fullscreen) || (!CSettings.bFullScreen && _fullscreen)) + if ((CSettings.IsFullScreen && !_fullscreen) || (!CSettings.IsFullScreen && _fullscreen)) ToggleFullScreen(); CheckQueque(); diff --git a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs index f7271c59..fcb2347e 100644 --- a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs +++ b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs @@ -69,7 +69,7 @@ namespace Vocaluxe.Lib.Input.WiiMote public struct AccelCalibrationInfo { public byte X0, Y0, Z0; //zero point - public byte XG, YG, ZG; //gravity + public byte GravityX, GravityY, GravityZ; //gravity } public struct Buttons @@ -413,11 +413,11 @@ namespace Vocaluxe.Lib.Input.WiiMote _WiiMoteState.AccelState.RawValues.Z = buff[5]; _WiiMoteState.AccelState.Values.X = ((float)_WiiMoteState.AccelState.RawValues.X - _WiiMoteState.AccelCalibrationInfo.X0) / - ((float)_WiiMoteState.AccelCalibrationInfo.XG - _WiiMoteState.AccelCalibrationInfo.X0); + ((float)_WiiMoteState.AccelCalibrationInfo.GravityX - _WiiMoteState.AccelCalibrationInfo.X0); _WiiMoteState.AccelState.Values.Y = ((float)_WiiMoteState.AccelState.RawValues.Y - _WiiMoteState.AccelCalibrationInfo.Y0) / - ((float)_WiiMoteState.AccelCalibrationInfo.YG - _WiiMoteState.AccelCalibrationInfo.Y0); + ((float)_WiiMoteState.AccelCalibrationInfo.GravityY - _WiiMoteState.AccelCalibrationInfo.Y0); _WiiMoteState.AccelState.Values.Z = ((float)_WiiMoteState.AccelState.RawValues.Z - _WiiMoteState.AccelCalibrationInfo.Z0) / - ((float)_WiiMoteState.AccelCalibrationInfo.ZG - _WiiMoteState.AccelCalibrationInfo.Z0); + ((float)_WiiMoteState.AccelCalibrationInfo.GravityZ - _WiiMoteState.AccelCalibrationInfo.Z0); } private void ParseIR(byte[] buff) @@ -517,9 +517,9 @@ namespace Vocaluxe.Lib.Input.WiiMote _WiiMoteState.AccelCalibrationInfo.X0 = buff[0]; _WiiMoteState.AccelCalibrationInfo.Y0 = buff[1]; _WiiMoteState.AccelCalibrationInfo.Z0 = buff[2]; - _WiiMoteState.AccelCalibrationInfo.XG = buff[4]; - _WiiMoteState.AccelCalibrationInfo.YG = buff[5]; - _WiiMoteState.AccelCalibrationInfo.ZG = buff[6]; + _WiiMoteState.AccelCalibrationInfo.GravityX = buff[4]; + _WiiMoteState.AccelCalibrationInfo.GravityY = buff[5]; + _WiiMoteState.AccelCalibrationInfo.GravityZ = buff[6]; return true; } diff --git a/Vocaluxe/Lib/Sound/COpenALPlay.cs b/Vocaluxe/Lib/Sound/COpenALPlay.cs index 26973171..4d8587b8 100644 --- a/Vocaluxe/Lib/Sound/COpenALPlay.cs +++ b/Vocaluxe/Lib/Sound/COpenALPlay.cs @@ -15,7 +15,7 @@ namespace Vocaluxe.Lib.Sound private readonly List _Decoder = new List(); private CLOSEPROC closeproc; private int _Count = 1; - private AudioContext AC; + private AudioContext _Context; private readonly Object MutexDecoder = new Object(); @@ -31,9 +31,9 @@ namespace Vocaluxe.Lib.Sound if (_Initialized) CloseAll(); - AC = new AudioContext(); + _Context = new AudioContext(); - AC.MakeCurrent(); + _Context.MakeCurrent(); closeproc = close_proc; @@ -344,8 +344,8 @@ namespace Vocaluxe.Lib.Sound public void Dispose() { - AC.Dispose(); - AC = null; + _Context.Dispose(); + _Context = null; } } diff --git a/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs b/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs index 0a41a7e7..c49e0320 100644 --- a/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs +++ b/Vocaluxe/Lib/Sound/Decoder/CAudioDecoderFFmpeg.cs @@ -11,7 +11,7 @@ namespace Vocaluxe.Lib.Sound.Decoder private IntPtr _instance = IntPtr.Zero; private IntPtr _audiodecoder = IntPtr.Zero; - private TAc_instance _Instance; + private AC_instance _Instance; private FormatInfo _FormatInfo; private float _CurrentTime; @@ -35,7 +35,7 @@ namespace Vocaluxe.Lib.Sound.Decoder { _instance = CAcinerella.ac_init(); CAcinerella.ac_open2(_instance, _FileName); - _Instance = (TAc_instance)Marshal.PtrToStructure(_instance, typeof(TAc_instance)); + _Instance = (AC_instance)Marshal.PtrToStructure(_instance, typeof(AC_instance)); } catch (Exception) { @@ -51,11 +51,11 @@ namespace Vocaluxe.Lib.Sound.Decoder } int AudioStreamIndex = -1; - TAc_decoder Audiodecoder; + AC_decoder Audiodecoder; try { _audiodecoder = CAcinerella.ac_create_audio_decoder(_instance); - Audiodecoder = (TAc_decoder)Marshal.PtrToStructure(_audiodecoder, typeof(TAc_decoder)); + Audiodecoder = (AC_decoder)Marshal.PtrToStructure(_audiodecoder, typeof(AC_decoder)); AudioStreamIndex = Audiodecoder.stream_index; } catch (Exception) @@ -169,7 +169,7 @@ namespace Vocaluxe.Lib.Sound.Decoder if (FrameFinished == 1) { - TAc_decoder Decoder = (TAc_decoder)Marshal.PtrToStructure(_audiodecoder, typeof(TAc_decoder)); + AC_decoder Decoder = (AC_decoder)Marshal.PtrToStructure(_audiodecoder, typeof(AC_decoder)); TimeStamp = (float)Decoder.timecode; _CurrentTime = TimeStamp; diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs index 8b5754a0..5a2fc998 100644 --- a/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs +++ b/Vocaluxe/Lib/Sound/Portaudio/PortAudio.cs @@ -236,7 +236,7 @@ namespace PortAudioSharp paOutputUnderflowed, paHostApiNotFound, paInvalidHostApi, - paCanNotReadFromACallbackStream, + paCanNotReadFromCallbackStream, paCanNotWriteToACallbackStream, paCanNotReadFromAnOutputOnlyStream, paCanNotWriteToAnInputOnlyStream, diff --git a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs index 47576c64..594b2a2e 100644 --- a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs +++ b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; namespace Vocaluxe.Lib.Video.Acinerella { - public enum TAc_stream_type : sbyte + public enum AC_stream_type : sbyte { /*The type of the media stream is not known. This kind of stream can not be decoded.*/ @@ -15,7 +15,7 @@ namespace Vocaluxe.Lib.Video.Acinerella } //Defines the type of an Acinerella media decoder. - public enum TAc_decoder_type : byte + public enum AC_decoder_type : byte { //This decoder is used to decode a video stream. AC_DECODER_TYPE_VIDEO = 0, @@ -24,7 +24,7 @@ namespace Vocaluxe.Lib.Video.Acinerella } //Defines the format video/image data is outputted in - public enum TAc_output_format : byte + public enum AC_output_format : byte { AC_OUTPUT_RGB24 = 0, AC_OUTPUT_BGR24 = 1, @@ -35,7 +35,7 @@ namespace Vocaluxe.Lib.Video.Acinerella // Contains information about the whole file/stream that has been opened. Default // values are "" for strings and -1 for integer values. [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public struct TAc_file_info + public struct AC_file_info { public Int64 duration; } @@ -44,7 +44,7 @@ namespace Vocaluxe.Lib.Video.Acinerella // decode one file at once. There can be only 26 Acinerella instances opened at // once. [StructLayout(LayoutKind.Sequential)] - public struct TAc_instance + public struct AC_instance { //If true, the instance currently opened a media file public bool opened; @@ -52,14 +52,14 @@ namespace Vocaluxe.Lib.Video.Acinerella //after calling the ac_open function. public Int32 stream_count; //Set this value to change the image output format - public TAc_output_format output_format; + public AC_output_format output_format; //Contains information about the opened stream/file - public TAc_file_info info; + public AC_file_info info; } // Contains information about an Acinerella audio stream. [StructLayout(LayoutKind.Sequential)] - public struct TAc_audio_stream_info + public struct AC_audio_stream_info { //Samples per second. Default values are 44100 or 48000. public Int32 samples_per_second; @@ -71,7 +71,7 @@ namespace Vocaluxe.Lib.Video.Acinerella // Contains information about an Acinerella video stream. [StructLayout(LayoutKind.Sequential)] - public struct TAc_video_stream_info + public struct AC_video_stream_info { //The width of one frame. public Int32 frame_width; @@ -85,23 +85,23 @@ namespace Vocaluxe.Lib.Video.Acinerella // Contains information about an Acinerella stream. [StructLayout(LayoutKind.Sequential)] - public struct TAc_stream_info + public struct AC_stream_info { //Contains the type of the stream. - public TAc_stream_type stream_type; + public AC_stream_type stream_type; //Additional info about the stream - public TAc_audio_stream_info audio_info; - public TAc_video_stream_info video_info; + public AC_audio_stream_info audio_info; + public AC_video_stream_info video_info; } // Contains information about an Acinerella video/audio decoder. [StructLayout(LayoutKind.Sequential)] - public struct TAc_decoder + public struct AC_decoder { //Pointer on the Acinerella instance - private readonly IntPtr pAcInstance; + private readonly IntPtr ACInstancePtr; //Contains the type of the decoder. - public TAc_decoder_type dec_type; + public AC_decoder_type dec_type; //The timecode of the currently decoded picture in seconds. public double timecode; @@ -109,7 +109,7 @@ namespace Vocaluxe.Lib.Video.Acinerella public double video_clock; //Contains information about the stream the decoder is attached to. - public TAc_stream_info stream_info; + public AC_stream_info stream_info; //The index of the stream the decoder is attached to. public Int32 stream_index; @@ -121,7 +121,7 @@ namespace Vocaluxe.Lib.Video.Acinerella // Contains information about an Acinerella package. [StructLayout(LayoutKind.Sequential)] - public struct TAc_package + public struct AC_package { //The stream the package belongs to. public Int32 stream_index; @@ -131,7 +131,7 @@ namespace Vocaluxe.Lib.Video.Acinerella // the number of bytes read or an value smaller than zero if an error occured. //TAc_read_callback = function(sender: Pointer; byte[] buf, int size): integer; cdecl; [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate Int32 TAc_read_callback( + public delegate Int32 AC_read_callback( IntPtr sender, IntPtr buf, Int32 size @@ -140,14 +140,14 @@ namespace Vocaluxe.Lib.Video.Acinerella // Callback function used to ask the application to seek. return 0 if succeed , -1 on failure. //TAc_seek_callback = function(sender: Pointer; pos: int64; whence: integer): int64; cdecl; [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate Int64 TAc_seek_callback(IntPtr sender, Int64 pos, Int32 whence); + public delegate Int64 AC_seek_callback(IntPtr sender, Int64 pos, Int32 whence); // Callback function that is used to notify the application when the data stream // is opened or closed. For example the file pointer should be resetted to zero // when the "open" function is called. // TAc_openclose_callback = function(sender: Pointer): integer; cdecl; [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate Int32 TAc_openclose_callback(IntPtr sender); + public delegate Int32 AC_openclose_callback(IntPtr sender); public static class CAcinerella { @@ -285,13 +285,13 @@ namespace Vocaluxe.Lib.Video.Acinerella private static extern void _ac_get_stream_info( IntPtr PAc_instance, Int32 nb, - out TAc_stream_info Info + out AC_stream_info Info ); public static void ac_get_stream_info( IntPtr PAc_instance, Int32 nb, - out TAc_stream_info Info + out AC_stream_info Info ) { lock (_lock) diff --git a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs index d553001e..9d867a56 100644 --- a/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs +++ b/Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs @@ -443,13 +443,13 @@ namespace Vocaluxe.Lib.Video private void DoOpen() { bool ok = false; - TAc_instance Instance = new TAc_instance(); + AC_instance Instance = new AC_instance(); try { _instance = CAcinerella.ac_init(); CAcinerella.ac_open2(_instance, _FileName); - Instance = (TAc_instance)Marshal.PtrToStructure(_instance, typeof(TAc_instance)); + Instance = (AC_instance)Marshal.PtrToStructure(_instance, typeof(AC_instance)); ok = Instance.opened; } catch (Exception) @@ -468,11 +468,11 @@ namespace Vocaluxe.Lib.Video _Duration = Instance.info.duration / 1000f; int VideoStreamIndex = -1; - TAc_decoder Videodecoder; + AC_decoder Videodecoder; try { _videodecoder = CAcinerella.ac_create_video_decoder(_instance); - Videodecoder = (TAc_decoder)Marshal.PtrToStructure(_videodecoder, typeof(TAc_decoder)); + Videodecoder = (AC_decoder)Marshal.PtrToStructure(_videodecoder, typeof(AC_decoder)); VideoStreamIndex = Videodecoder.stream_index; } catch (Exception) @@ -622,7 +622,7 @@ namespace Vocaluxe.Lib.Video _BufferFull = true; else { - TAc_decoder Videodecoder = (TAc_decoder)Marshal.PtrToStructure(_videodecoder, typeof(TAc_decoder)); + AC_decoder Videodecoder = (AC_decoder)Marshal.PtrToStructure(_videodecoder, typeof(AC_decoder)); _VideoDecoderTime = (float)Videodecoder.timecode; _FrameBuffer[num].time = _VideoDecoderTime; diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index 3f97f223..ab3175ee 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -8,10 +8,10 @@ namespace VocaluxeLib.Menu public string Name; public string ColorName; - public string SColorName; + public string SelColorName; public string TextureName; - public string STextureName; + public string SelTextureName; } public class CButton : IMenuElement @@ -21,22 +21,22 @@ namespace VocaluxeLib.Menu private readonly int _PartyModeID; public STexture Texture; - public STexture STexture; + public STexture SelTexture; public SRectF Rect; public SColorF Color; - public SColorF SColor; + public SColorF SelColor; - public bool SelText; + public bool IsSelText; public CText Text; - public CText SText; + public CText SelText; public bool Reflection; public float ReflectionSpace; public float ReflectionHeight; - public bool SReflection; - public float SReflectionSpace; - public float SReflectionHeight; + public bool SelReflection; + public float SelReflectionSpace; + public float SelReflectionHeight; public bool Pressed; @@ -46,7 +46,7 @@ namespace VocaluxeLib.Menu set { Text.EditMode = value; - SText.EditMode = value; + SelText.EditMode = value; } } @@ -74,13 +74,13 @@ namespace VocaluxeLib.Menu _Theme = new SThemeButton(); Rect = new SRectF(); Color = new SColorF(); - SColor = new SColorF(); + SelColor = new SColorF(); Texture = new STexture(-1); - STexture = new STexture(-1); + SelTexture = new STexture(-1); - SelText = false; + IsSelText = false; Text = new CText(_PartyModeID); - SText = new CText(_PartyModeID); + SelText = new CText(_PartyModeID); Selected = false; Visible = true; EditMode = false; @@ -90,9 +90,9 @@ namespace VocaluxeLib.Menu ReflectionSpace = 0f; ReflectionHeight = 0f; - SReflection = false; - SReflectionSpace = 0f; - SReflectionHeight = 0f; + SelReflection = false; + SelReflectionSpace = 0f; + SelReflectionHeight = 0f; } public CButton(CButton button) @@ -100,19 +100,19 @@ namespace VocaluxeLib.Menu _PartyModeID = button._PartyModeID; _Theme = new SThemeButton(); _Theme.ColorName = button._Theme.ColorName; - _Theme.SColorName = button._Theme.SColorName; + _Theme.SelColorName = button._Theme.SelColorName; _Theme.TextureName = button._Theme.TextureName; - _Theme.STextureName = button._Theme.STextureName; + _Theme.SelTextureName = button._Theme.SelTextureName; Rect = new SRectF(button.Rect); Color = new SColorF(button.Color); - SColor = new SColorF(button.Color); + SelColor = new SColorF(button.Color); Texture = button.Texture; - STexture = button.STexture; + SelTexture = button.SelTexture; - SelText = false; + IsSelText = false; Text = new CText(button.Text); - SText = new CText(button.SText); + SelText = new CText(button.SelText); Selected = false; Visible = true; EditMode = false; @@ -123,9 +123,9 @@ namespace VocaluxeLib.Menu ReflectionHeight = button.ReflectionHeight; ReflectionSpace = button.ReflectionSpace; - SReflection = button.SReflection; - SReflectionHeight = button.SReflectionHeight; - SReflectionSpace = button.SReflectionSpace; + SelReflection = button.SelReflection; + SelReflectionHeight = button.SelReflectionHeight; + SelReflectionSpace = button.SelReflectionSpace; } public bool LoadTheme(string XmlPath, string ElementName, CXMLReader xmlReader, int SkinIndex) @@ -134,7 +134,7 @@ namespace VocaluxeLib.Menu _ThemeLoaded = true; _ThemeLoaded &= xmlReader.GetValue(item + "/Skin", ref _Theme.TextureName, String.Empty); - _ThemeLoaded &= xmlReader.GetValue(item + "/SkinSelected", ref _Theme.STextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinSelected", ref _Theme.SelTextureName, String.Empty); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); @@ -152,23 +152,23 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SColorName, SkinIndex, out SColor); + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SelColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColorName, SkinIndex, out SelColor); else { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SColor.R); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SColor.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SColor.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SelColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SelColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SelColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SelColor.A); } _ThemeLoaded &= Text.LoadTheme(item, "Text", xmlReader, SkinIndex, true); Text.Z = Rect.Z; if (xmlReader.ItemExists(item + "/SText")) { - SelText = true; - _ThemeLoaded &= SText.LoadTheme(item, "SText", xmlReader, SkinIndex, true); - SText.Z = Rect.Z; + IsSelText = true; + _ThemeLoaded &= SelText.LoadTheme(item, "SText", xmlReader, SkinIndex, true); + SelText.Z = Rect.Z; } @@ -184,12 +184,12 @@ namespace VocaluxeLib.Menu if (xmlReader.ItemExists(item + "/SReflection")) { - SReflection = true; - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Space", ref SReflectionSpace); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Height", ref SReflectionHeight); + SelReflection = true; + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Space", ref SelReflectionSpace); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SReflection/Height", ref SelReflectionHeight); } else - SReflection = false; + SelReflection = false; if (_ThemeLoaded) { @@ -209,7 +209,7 @@ namespace VocaluxeLib.Menu writer.WriteElementString("Skin", _Theme.TextureName); writer.WriteComment(": Texture name for selected button"); - writer.WriteElementString("SkinSelected", _Theme.STextureName); + writer.WriteElementString("SkinSelected", _Theme.SelTextureName); writer.WriteComment(", , , , : Button position, width and height"); writer.WriteElementString("X", Rect.X.ToString("#0")); @@ -232,19 +232,19 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Selected button color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (_Theme.SColorName.Length > 0) - writer.WriteElementString("SColor", _Theme.SColorName); + if (_Theme.SelColorName.Length > 0) + writer.WriteElementString("SColor", _Theme.SelColorName); else { - writer.WriteElementString("SR", SColor.R.ToString("#0.00")); - writer.WriteElementString("SG", SColor.G.ToString("#0.00")); - writer.WriteElementString("SB", SColor.B.ToString("#0.00")); - writer.WriteElementString("SA", SColor.A.ToString("#0.00")); + writer.WriteElementString("SR", SelColor.R.ToString("#0.00")); + writer.WriteElementString("SG", SelColor.G.ToString("#0.00")); + writer.WriteElementString("SB", SelColor.B.ToString("#0.00")); + writer.WriteElementString("SA", SelColor.A.ToString("#0.00")); } Text.SaveTheme(writer); - if (SelText) - SText.SaveTheme(writer); + if (IsSelText) + SelText.SaveTheme(writer); writer.WriteComment(" If exists:"); writer.WriteComment(" : Reflection Space"); @@ -260,7 +260,7 @@ namespace VocaluxeLib.Menu writer.WriteComment(" If exists:"); writer.WriteComment(" : Reflection Space of selected button"); writer.WriteComment(" : Reflection Height of selected button"); - if (SReflection) + if (SelReflection) { writer.WriteStartElement("SReflection"); writer.WriteElementString("Space", ReflectionSpace.ToString("#0")); @@ -309,39 +309,39 @@ namespace VocaluxeLib.Menu else Text.DrawRelative(Rect.X, Rect.Y); } - else if (!SelText) + else if (!IsSelText) { if (Texture.index != -1) texture = Texture; else - texture = CBase.Theme.GetSkinTexture(_Theme.STextureName, _PartyModeID); + texture = CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID); - CBase.Drawing.DrawTexture(texture, Rect, SColor); + CBase.Drawing.DrawTexture(texture, Rect, SelColor); if (Reflection) { - CBase.Drawing.DrawTextureReflection(texture, Rect, SColor, Rect, ReflectionSpace, ReflectionHeight); + CBase.Drawing.DrawTextureReflection(texture, Rect, SelColor, Rect, ReflectionSpace, ReflectionHeight); Text.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H); } else Text.DrawRelative(Rect.X, Rect.Y); } - else if (SelText) + else if (IsSelText) { - if (STexture.index != -1) - texture = STexture; + if (SelTexture.index != -1) + texture = SelTexture; else - texture = CBase.Theme.GetSkinTexture(_Theme.STextureName, _PartyModeID); + texture = CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID); - CBase.Drawing.DrawTexture(texture, Rect, SColor); + CBase.Drawing.DrawTexture(texture, Rect, SelColor); if (Reflection) { - CBase.Drawing.DrawTextureReflection(texture, Rect, SColor, Rect, ReflectionSpace, ReflectionHeight); - SText.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H); + CBase.Drawing.DrawTextureReflection(texture, Rect, SelColor, Rect, ReflectionSpace, ReflectionHeight); + SelText.DrawRelative(Rect.X, Rect.Y, ReflectionSpace, ReflectionHeight, Rect.H); } else - SText.DrawRelative(Rect.X, Rect.Y); + SelText.DrawRelative(Rect.X, Rect.Y); } } @@ -362,8 +362,8 @@ namespace VocaluxeLib.Menu if (_Theme.ColorName.Length > 0) Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); - if (_Theme.SColorName.Length > 0) - SColor = CBase.Theme.GetColor(_Theme.SColorName, _PartyModeID); + if (_Theme.SelColorName.Length > 0) + SelColor = CBase.Theme.GetColor(_Theme.SelColorName, _PartyModeID); } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CHelper.cs b/VocaluxeLib/Menu/CHelper.cs index 4578b7d6..3c2e64b3 100644 --- a/VocaluxeLib/Menu/CHelper.cs +++ b/VocaluxeLib/Menu/CHelper.cs @@ -9,7 +9,7 @@ namespace VocaluxeLib.Menu { public static class CHelper { - public static int nCk(int n, int k) + public static int CombinationCount(int n, int k) { if (k > n) return 0; @@ -24,8 +24,6 @@ namespace VocaluxeLib.Menu k = n - k; long result = n; - long nl = n; - long nk = k; for (long i = 1; i <= k - 1; i++) result = result * (n - i) / (i + 1); diff --git a/VocaluxeLib/Menu/CInteraction.cs b/VocaluxeLib/Menu/CInteraction.cs index f628bde5..586efc60 100644 --- a/VocaluxeLib/Menu/CInteraction.cs +++ b/VocaluxeLib/Menu/CInteraction.cs @@ -2,18 +2,18 @@ { public enum EType { - TBackground, - TButton, - TSelectSlide, - TText, - TStatic, - TSongMenu, - TLyric, - TSingNote, - TNameSelection, - TEqualizer, - TPlaylist, - TParticleEffect + Background, + Button, + SelectSlide, + Text, + Static, + SongMenu, + Lyric, + SingNote, + NameSelection, + Equalizer, + Playlist, + ParticleEffect } class CInteraction @@ -35,15 +35,15 @@ { get { - return _Type == EType.TBackground || - _Type == EType.TNameSelection || - _Type == EType.TText || - _Type == EType.TStatic || - _Type == EType.TSongMenu || - _Type == EType.TLyric || - _Type == EType.TSingNote || - _Type == EType.TEqualizer || - _Type == EType.TPlaylist; + return _Type == EType.Background || + _Type == EType.NameSelection || + _Type == EType.Text || + _Type == EType.Static || + _Type == EType.SongMenu || + _Type == EType.Lyric || + _Type == EType.SingNote || + _Type == EType.Equalizer || + _Type == EType.Playlist; } } diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index ea5fd681..627f02ea 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -20,7 +20,7 @@ namespace VocaluxeLib.Menu public string Name; public string ColorName; - public string SColorName; + public string SelColorName; } public class CLyric : IMenuElement @@ -124,8 +124,8 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SColorName, SkinIndex, out ColorProcessed); + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SelColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColorName, SkinIndex, out ColorProcessed); else { _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref ColorProcessed.R); @@ -170,8 +170,8 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Highlighted lyric color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (_Theme.SColorName.Length > 0) - writer.WriteElementString("SColor", _Theme.SColorName); + if (_Theme.SelColorName.Length > 0) + writer.WriteElementString("SColor", _Theme.SelColorName); else { writer.WriteElementString("SR", ColorProcessed.R.ToString("#0.00")); @@ -535,8 +535,8 @@ namespace VocaluxeLib.Menu if (_Theme.ColorName.Length > 0) Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); - if (_Theme.SColorName.Length > 0) - ColorProcessed = CBase.Theme.GetColor(_Theme.SColorName, _PartyModeID); + if (_Theme.SelColorName.Length > 0) + ColorProcessed = CBase.Theme.GetColor(_Theme.SelColorName, _PartyModeID); } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index b3c81391..516663c7 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -130,9 +130,9 @@ namespace VocaluxeLib.Menu } #region ThemeHandler - protected delegate void DAddElement(T Element, String key); + protected delegate void AddElementHandler(T Element, String key); - private void LoadThemeElement(string[] Elements, DAddElement MAddElement, CXMLReader xmlReader, int SkinIndex) where T : IMenuElement + private void LoadThemeElement(string[] Elements, AddElementHandler AddElementHandler, CXMLReader xmlReader, int SkinIndex) where T : IMenuElement { if (Elements != null) { @@ -140,7 +140,7 @@ namespace VocaluxeLib.Menu { T Element = (T)Activator.CreateInstance(typeof(T), _PartyModeID); if (Element.LoadTheme("//root/" + ThemeName, elName, xmlReader, SkinIndex)) - MAddElement(Element, elName); + AddElementHandler(Element, elName); else CBase.Log.LogError("Can't load " + typeof(T).Name.Substring(1) + " \"" + elName + "\" in screen " + ThemeName); } @@ -595,7 +595,7 @@ namespace VocaluxeLib.Menu { if (keyEvent.Key == Keys.Left) { - if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && keyEvent.Mod != EModifier.Shift) + if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && keyEvent.Mod != EModifier.Shift) keyEvent.Handled = PrevElement(); else keyEvent.Handled = _NextInteraction(keyEvent); @@ -603,7 +603,7 @@ namespace VocaluxeLib.Menu if (keyEvent.Key == Keys.Right) { - if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && keyEvent.Mod != EModifier.Shift) + if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && keyEvent.Mod != EModifier.Shift) keyEvent.Handled = NextElement(); else keyEvent.Handled = _NextInteraction(keyEvent); @@ -828,15 +828,15 @@ namespace VocaluxeLib.Menu for (int i = 0; i < _Interactions.Count; i++) { if (_IsVisible(i) && ( - _Interactions[i].Type == EType.TButton || - _Interactions[i].Type == EType.TSelectSlide || - _Interactions[i].Type == EType.TStatic || - _Interactions[i].Type == EType.TNameSelection || - _Interactions[i].Type == EType.TText || - _Interactions[i].Type == EType.TSongMenu || - _Interactions[i].Type == EType.TEqualizer || - _Interactions[i].Type == EType.TPlaylist || - _Interactions[i].Type == EType.TParticleEffect)) + _Interactions[i].Type == EType.Button || + _Interactions[i].Type == EType.SelectSlide || + _Interactions[i].Type == EType.Static || + _Interactions[i].Type == EType.NameSelection || + _Interactions[i].Type == EType.Text || + _Interactions[i].Type == EType.SongMenu || + _Interactions[i].Type == EType.Equalizer || + _Interactions[i].Type == EType.Playlist || + _Interactions[i].Type == EType.ParticleEffect)) { ZSort zs = new ZSort(); zs.ID = i; @@ -924,62 +924,62 @@ namespace VocaluxeLib.Menu public void AddBackground(CBackground bg, String key) { - _AddInteraction(_Backgrounds.Add(bg, key), EType.TBackground); + _AddInteraction(_Backgrounds.Add(bg, key), EType.Background); } public void AddButton(CButton button, String key) { - _AddInteraction(_Buttons.Add(button, key), EType.TButton); + _AddInteraction(_Buttons.Add(button, key), EType.Button); } public void AddSelectSlide(CSelectSlide slide, String key) { - _AddInteraction(_SelectSlides.Add(slide, key), EType.TSelectSlide); + _AddInteraction(_SelectSlides.Add(slide, key), EType.SelectSlide); } public void AddStatic(CStatic stat, String key) { - _AddInteraction(_Statics.Add(stat, key), EType.TStatic); + _AddInteraction(_Statics.Add(stat, key), EType.Static); } public void AddText(CText text, String key) { - _AddInteraction(_Texts.Add(text, key), EType.TText); + _AddInteraction(_Texts.Add(text, key), EType.Text); } public void AddSongMenu(CSongMenu songmenu, String key) { - _AddInteraction(_SongMenus.Add(songmenu, key), EType.TSongMenu); + _AddInteraction(_SongMenus.Add(songmenu, key), EType.SongMenu); } public void AddLyric(CLyric lyric, String key) { - _AddInteraction(_Lyrics.Add(lyric, key), EType.TLyric); + _AddInteraction(_Lyrics.Add(lyric, key), EType.Lyric); } public void AddSingNote(CSingNotes sn, String key) { - _AddInteraction(_SingNotes.Add(sn, key), EType.TSingNote); + _AddInteraction(_SingNotes.Add(sn, key), EType.SingNote); } public void AddNameSelection(CNameSelection ns, String key) { - _AddInteraction(_NameSelections.Add(ns, key), EType.TNameSelection); + _AddInteraction(_NameSelections.Add(ns, key), EType.NameSelection); } public void AddEqualizer(CEqualizer eq, String key) { - _AddInteraction(_Equalizers.Add(eq, key), EType.TEqualizer); + _AddInteraction(_Equalizers.Add(eq, key), EType.Equalizer); } public void AddPlaylist(CPlaylist pls, String key) { - _AddInteraction(_Playlists.Add(pls, key), EType.TPlaylist); + _AddInteraction(_Playlists.Add(pls, key), EType.Playlist); } public void AddParticleEffect(CParticleEffect pe, String key) { - _AddInteraction(_ParticleEffects.Add(pe, key), EType.TParticleEffect); + _AddInteraction(_ParticleEffects.Add(pe, key), EType.ParticleEffect); } public void AddScreenSetting(CScreenSetting se, String key) @@ -1035,7 +1035,7 @@ namespace VocaluxeLib.Menu { for (int i = 0; i < _Interactions.Count; i++) { - if (_Interactions[i].Type == EType.TButton) + if (_Interactions[i].Type == EType.Button) { if (_Buttons[_Interactions[i].Num] == button) { @@ -1054,7 +1054,7 @@ namespace VocaluxeLib.Menu { for (int i = 0; i < _Interactions.Count; i++) { - if (_Interactions[i].Type == EType.TSelectSlide) + if (_Interactions[i].Type == EType.SelectSlide) { if (_SelectSlides[_Interactions[i].Num] == slide) { @@ -1074,7 +1074,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) { if (_SelectSlides[_Interactions[_Selection].Num].Visible) _SelectSlides[_Interactions[_Selection].Num].ProcessMouseLBClick(x, y); @@ -1088,7 +1088,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) { if (_SelectSlides[_Interactions[_Selection].Num].Visible) _SelectSlides[_Interactions[_Selection].Num].ProcessMouseMove(x, y); @@ -1136,46 +1136,46 @@ namespace VocaluxeLib.Menu { switch (interact.Type) { - case EType.TButton: + case EType.Button: if (CHelper.IsInBounds(_Buttons[interact.Num].Rect, x, y)) return true; break; - case EType.TSelectSlide: + case EType.SelectSlide: if (CHelper.IsInBounds(_SelectSlides[interact.Num].Rect, x, y) || CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowLeft, x, y) || CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowRight, x, y)) return true; break; - case EType.TStatic: + case EType.Static: if (CHelper.IsInBounds(_Statics[interact.Num].Rect, x, y)) return true; break; - case EType.TText: + case EType.Text: RectangleF bounds = CBase.Drawing.GetTextBounds(_Texts[interact.Num]); if (CHelper.IsInBounds(new SRectF(_Texts[interact.Num].X, _Texts[interact.Num].Y, bounds.Width, bounds.Height, _Texts[interact.Num].Z), x, y)) return true; break; - case EType.TSongMenu: + case EType.SongMenu: if (CHelper.IsInBounds(_SongMenus[interact.Num].Rect, x, y)) return true; break; - case EType.TLyric: + case EType.Lyric: if (CHelper.IsInBounds(_Lyrics[interact.Num].Rect, x, y)) return true; break; - case EType.TNameSelection: + case EType.NameSelection: if (CHelper.IsInBounds(_NameSelections[interact.Num].Rect, x, y)) return true; break; - case EType.TEqualizer: + case EType.Equalizer: if (CHelper.IsInBounds(_Equalizers[interact.Num].Rect, x, y)) return true; break; - case EType.TPlaylist: + case EType.Playlist: if (CHelper.IsInBounds(_Playlists[interact.Num].Rect, x, y)) return true; break; - case EType.TParticleEffect: + case EType.ParticleEffect: if (CHelper.IsInBounds(_ParticleEffects[interact.Num].Rect, x, y)) return true; break; @@ -1187,25 +1187,25 @@ namespace VocaluxeLib.Menu { switch (interact.Type) { - case EType.TButton: + case EType.Button: return _Buttons[interact.Num].Rect.Z; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[interact.Num].Rect.Z; - case EType.TStatic: + case EType.Static: return _Statics[interact.Num].Rect.Z; - case EType.TSongMenu: + case EType.SongMenu: return _SongMenus[interact.Num].Rect.Z; - case EType.TText: + case EType.Text: return _Texts[interact.Num].Z; - case EType.TLyric: + case EType.Lyric: return _Lyrics[interact.Num].Rect.Z; - case EType.TNameSelection: + case EType.NameSelection: return _NameSelections[interact.Num].Rect.Z; - case EType.TEqualizer: + case EType.Equalizer: return _Equalizers[interact.Num].Rect.Z; - case EType.TPlaylist: + case EType.Playlist: return _Playlists[interact.Num].Rect.Z; - case EType.TParticleEffect: + case EType.ParticleEffect: return _ParticleEffects[interact.Num].Rect.Z; } return CBase.Settings.GetZFar(); @@ -1498,7 +1498,7 @@ namespace VocaluxeLib.Menu /// True if the next element is selected. False if either there is no next element or the interaction does not provide such a method. private bool _NextElement() { - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) return _SelectSlides[_Interactions[_Selection].Num].NextValue(); return false; @@ -1512,7 +1512,7 @@ namespace VocaluxeLib.Menu /// private bool _PrevElement() { - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) return _SelectSlides[_Interactions[_Selection].Num].PrevValue(); return false; @@ -1522,34 +1522,34 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].Selected = true; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].Selected = true; break; - case EType.TStatic: + case EType.Static: _Statics[_Interactions[_Selection].Num].Selected = true; break; - case EType.TText: + case EType.Text: _Texts[_Interactions[_Selection].Num].Selected = true; break; - case EType.TSongMenu: + case EType.SongMenu: _SongMenus[_Interactions[_Selection].Num].Selected = true; break; - case EType.TLyric: + case EType.Lyric: _Lyrics[_Interactions[_Selection].Num].Selected = true; break; - case EType.TNameSelection: + case EType.NameSelection: _NameSelections[_Interactions[_Selection].Num].Selected = true; break; - case EType.TEqualizer: + case EType.Equalizer: _Equalizers[_Interactions[_Selection].Num].Selected = true; break; - case EType.TPlaylist: + case EType.Playlist: _Playlists[_Interactions[_Selection].Num].Selected = true; break; - case EType.TParticleEffect: + case EType.ParticleEffect: _ParticleEffects[_Interactions[_Selection].Num].Selected = true; break; } @@ -1559,34 +1559,34 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].Selected = false; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].Selected = false; break; - case EType.TStatic: + case EType.Static: _Statics[_Interactions[_Selection].Num].Selected = false; break; - case EType.TText: + case EType.Text: _Texts[_Interactions[_Selection].Num].Selected = false; break; - case EType.TSongMenu: + case EType.SongMenu: _SongMenus[_Interactions[_Selection].Num].Selected = false; break; - case EType.TLyric: + case EType.Lyric: _Lyrics[_Interactions[_Selection].Num].Selected = false; break; - case EType.TNameSelection: + case EType.NameSelection: _NameSelections[_Interactions[_Selection].Num].Selected = false; break; - case EType.TEqualizer: + case EType.Equalizer: _Equalizers[_Interactions[_Selection].Num].Selected = false; break; - case EType.TPlaylist: + case EType.Playlist: _Playlists[_Interactions[_Selection].Num].Selected = false; break; - case EType.TParticleEffect: + case EType.ParticleEffect: _ParticleEffects[_Interactions[_Selection].Num].Selected = false; break; } @@ -1599,28 +1599,28 @@ namespace VocaluxeLib.Menu switch (_Interactions[selection].Type) { - case EType.TButton: + case EType.Button: //_Buttons[_Interactions[selection].Num].Selected = true; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[selection].Num].Highlighted = true; break; - case EType.TStatic: + case EType.Static: //_Statics[_Interactions[selection].Num].Selected = true; break; - case EType.TText: + case EType.Text: //_Texts[_Interactions[selection].Num].Selected = true; break; - case EType.TSongMenu: + case EType.SongMenu: //_SongMenus[_Interactions[selection].Num].Selected = true; break; - case EType.TLyric: + case EType.Lyric: //_Lyrics[_Interactions[selection].Num].Selected = true; break; - case EType.TNameSelection: + case EType.NameSelection: //_NameSelections[_Interactions[selection].Num].Selected = true; break; - case EType.TPlaylist: + case EType.Playlist: //_Playlists[_Interactions[_Selection].Num].Selected = true; break; } @@ -1633,28 +1633,28 @@ namespace VocaluxeLib.Menu switch (_Interactions[selection].Type) { - case EType.TButton: + case EType.Button: //_Buttons[_Interactions[selection].Num].Selected = false; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[selection].Num].Highlighted = false; break; - case EType.TStatic: + case EType.Static: //_Statics[_Interactions[selection].Num].Selected = false; break; - case EType.TText: + case EType.Text: //_Texts[_Interactions[selection].Num].Selected = false; break; - case EType.TSongMenu: + case EType.SongMenu: //_SongMenus[_Interactions[selection].Num].Selected = false; break; - case EType.TLyric: + case EType.Lyric: //_Lyrics[_Interactions[selection].Num].Selected = false; break; - case EType.TNameSelection: + case EType.NameSelection: //_NameSelections[_Interactions[selection].Num].Selected = false; break; - case EType.TPlaylist: + case EType.Playlist: //_Playlists[_Interactions[_Selection].Num].Selected = true; break; } @@ -1665,7 +1665,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) _SelectSlides[_Interactions[_Selection].Num].Highlighted = !_SelectSlides[_Interactions[_Selection].Num].Highlighted; } @@ -1674,7 +1674,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return false; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) return _SelectSlides[_Interactions[_Selection].Num].Highlighted; return false; @@ -1687,34 +1687,34 @@ namespace VocaluxeLib.Menu switch (_Interactions[interaction].Type) { - case EType.TButton: + case EType.Button: return _Buttons[_Interactions[interaction].Num].Visible; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[_Interactions[interaction].Num].Visible; - case EType.TStatic: + case EType.Static: return _Statics[_Interactions[interaction].Num].Visible; - case EType.TText: + case EType.Text: return _Texts[_Interactions[interaction].Num].Visible; - case EType.TSongMenu: + case EType.SongMenu: return _SongMenus[_Interactions[interaction].Num].Visible; - case EType.TLyric: + case EType.Lyric: return _Lyrics[_Interactions[interaction].Num].Visible; - case EType.TNameSelection: + case EType.NameSelection: return _NameSelections[_Interactions[interaction].Num].Visible; - case EType.TEqualizer: + case EType.Equalizer: return _Equalizers[_Interactions[interaction].Num].Visible; - case EType.TPlaylist: + case EType.Playlist: return _Playlists[_Interactions[interaction].Num].Visible; - case EType.TParticleEffect: + case EType.ParticleEffect: return _ParticleEffects[_Interactions[interaction].Num].Visible; } @@ -1728,34 +1728,34 @@ namespace VocaluxeLib.Menu switch (_Interactions[interaction].Type) { - case EType.TButton: + case EType.Button: return _Buttons[_Interactions[interaction].Num].Enabled; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[_Interactions[interaction].Num].Visible; - case EType.TStatic: + case EType.Static: return false; //_Statics[_Interactions[interaction].Num].Visible; - case EType.TText: + case EType.Text: return false; //_Texts[_Interactions[interaction].Num].Visible; - case EType.TSongMenu: + case EType.SongMenu: return _SongMenus[_Interactions[interaction].Num].Visible; - case EType.TLyric: + case EType.Lyric: return false; //_Lyrics[_Interactions[interaction].Num].Visible; - case EType.TNameSelection: + case EType.NameSelection: return _NameSelections[_Interactions[interaction].Num].Visible; - case EType.TEqualizer: + case EType.Equalizer: return false; //_Equalizers[_Interactions[interaction].Num].Visible; - case EType.TPlaylist: + case EType.Playlist: return _Playlists[_Interactions[interaction].Num].Visible; - case EType.TParticleEffect: + case EType.ParticleEffect: return false; //_ParticleEffects[_Interactions[interaction].Num].Visible; } @@ -1767,34 +1767,34 @@ namespace VocaluxeLib.Menu SRectF Result = new SRectF(); switch (_Interactions[interaction].Type) { - case EType.TButton: + case EType.Button: return _Buttons[_Interactions[interaction].Num].Rect; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[_Interactions[interaction].Num].Rect; - case EType.TStatic: + case EType.Static: return _Statics[_Interactions[interaction].Num].Rect; - case EType.TText: + case EType.Text: return _Texts[_Interactions[interaction].Num].Bounds; - case EType.TSongMenu: + case EType.SongMenu: return _SongMenus[_Interactions[interaction].Num].Rect; - case EType.TLyric: + case EType.Lyric: return _Lyrics[_Interactions[interaction].Num].Rect; - case EType.TNameSelection: + case EType.NameSelection: return _NameSelections[_Interactions[interaction].Num].Rect; - case EType.TEqualizer: + case EType.Equalizer: return _Equalizers[_Interactions[interaction].Num].Rect; - case EType.TPlaylist: + case EType.Playlist: return _Playlists[_Interactions[interaction].Num].Rect; - case EType.TParticleEffect: + case EType.ParticleEffect: return _ParticleEffects[_Interactions[interaction].Num].Rect; } @@ -1814,31 +1814,31 @@ namespace VocaluxeLib.Menu { switch (_Interactions[interaction].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[interaction].Num].Draw(); break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[interaction].Num].Draw(); break; - case EType.TStatic: + case EType.Static: _Statics[_Interactions[interaction].Num].Draw(); break; - case EType.TText: + case EType.Text: _Texts[_Interactions[interaction].Num].Draw(); break; - case EType.TSongMenu: + case EType.SongMenu: _SongMenus[_Interactions[interaction].Num].Draw(); break; - case EType.TNameSelection: + case EType.NameSelection: _NameSelections[_Interactions[interaction].Num].Draw(); break; - case EType.TEqualizer: + case EType.Equalizer: if (!_Equalizers[_Interactions[interaction].Num].ScreenHandles) { //TODO: @@ -1847,11 +1847,11 @@ namespace VocaluxeLib.Menu } break; - case EType.TPlaylist: + case EType.Playlist: _Playlists[_Interactions[interaction].Num].Draw(); break; - case EType.TParticleEffect: + case EType.ParticleEffect: _ParticleEffects[_Interactions[interaction].Num].Draw(); break; @@ -1870,43 +1870,43 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TStatic: + case EType.Static: _Statics[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TText: + case EType.Text: _Texts[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TSongMenu: + case EType.SongMenu: _SongMenus[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TLyric: + case EType.Lyric: _Lyrics[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TNameSelection: + case EType.NameSelection: _NameSelections[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TEqualizer: + case EType.Equalizer: _Equalizers[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TPlaylist: + case EType.Playlist: _Playlists[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TParticleEffect: + case EType.ParticleEffect: _ParticleEffects[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; } @@ -1919,43 +1919,43 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TStatic: + case EType.Static: _Statics[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TText: + case EType.Text: _Texts[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TSongMenu: + case EType.SongMenu: _SongMenus[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TLyric: + case EType.Lyric: _Lyrics[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TNameSelection: + case EType.NameSelection: _NameSelections[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TEqualizer: + case EType.Equalizer: _Equalizers[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TPlaylist: + case EType.Playlist: _Playlists[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TParticleEffect: + case EType.ParticleEffect: _ParticleEffects[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; } diff --git a/VocaluxeLib/Menu/CObjectInteractions.cs b/VocaluxeLib/Menu/CObjectInteractions.cs index f5011276..2f67810b 100644 --- a/VocaluxeLib/Menu/CObjectInteractions.cs +++ b/VocaluxeLib/Menu/CObjectInteractions.cs @@ -109,7 +109,7 @@ namespace VocaluxeLib.Menu { if (KeyEvent.Key == Keys.Left) { - if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != EModifier.Shift) + if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && KeyEvent.Mod != EModifier.Shift) KeyEvent.Handled = PrevElement(); else KeyEvent.Handled = _NextInteraction(KeyEvent); @@ -117,7 +117,7 @@ namespace VocaluxeLib.Menu if (KeyEvent.Key == Keys.Right) { - if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != EModifier.Shift) + if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.SelectSlide && KeyEvent.Mod != EModifier.Shift) KeyEvent.Handled = NextElement(); else KeyEvent.Handled = _NextInteraction(KeyEvent); @@ -293,13 +293,13 @@ namespace VocaluxeLib.Menu for (int i = 0; i < _Interactions.Count; i++) { if (_IsVisible(i) && ( - _Interactions[i].Type == EType.TButton || - _Interactions[i].Type == EType.TSelectSlide || - _Interactions[i].Type == EType.TStatic || - _Interactions[i].Type == EType.TNameSelection || - _Interactions[i].Type == EType.TText || - _Interactions[i].Type == EType.TSongMenu || - _Interactions[i].Type == EType.TEqualizer)) + _Interactions[i].Type == EType.Button || + _Interactions[i].Type == EType.SelectSlide || + _Interactions[i].Type == EType.Static || + _Interactions[i].Type == EType.NameSelection || + _Interactions[i].Type == EType.Text || + _Interactions[i].Type == EType.SongMenu || + _Interactions[i].Type == EType.Equalizer)) { ZSort zs = new ZSort(); zs.ID = i; @@ -323,28 +323,28 @@ namespace VocaluxeLib.Menu public int AddStatic(CStatic stat) { _Statics.Add(stat); - _AddInteraction(_Statics.Count - 1, EType.TStatic); + _AddInteraction(_Statics.Count - 1, EType.Static); return _Statics.Count - 1; } public int AddText(CText text) { _Texts.Add(text); - _AddInteraction(_Texts.Count - 1, EType.TText); + _AddInteraction(_Texts.Count - 1, EType.Text); return _Texts.Count - 1; } public int AddButton(CButton button) { _Buttons.Add(button); - _AddInteraction(_Buttons.Count - 1, EType.TButton); + _AddInteraction(_Buttons.Count - 1, EType.Button); return _Buttons.Count - 1; } public int AddSelectSlide(CSelectSlide slide) { _SelectSlides.Add(slide); - _AddInteraction(_SelectSlides.Count - 1, EType.TSelectSlide); + _AddInteraction(_SelectSlides.Count - 1, EType.SelectSlide); return _SelectSlides.Count - 1; } #endregion Elements @@ -390,7 +390,7 @@ namespace VocaluxeLib.Menu { for (int i = 0; i < _Interactions.Count; i++) { - if (_Interactions[i].Type == EType.TButton) + if (_Interactions[i].Type == EType.Button) { if (_Buttons[_Interactions[i].Num].Visible && _Buttons[_Interactions[i].Num] == button) { @@ -409,7 +409,7 @@ namespace VocaluxeLib.Menu { for (int i = 0; i < _Interactions.Count; i++) { - if (_Interactions[i].Type == EType.TSelectSlide) + if (_Interactions[i].Type == EType.SelectSlide) { if (_SelectSlides[_Interactions[i].Num].Visible && _SelectSlides[_Interactions[i].Num] == slide) { @@ -429,7 +429,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) { if (_SelectSlides[_Interactions[_Selection].Num].Visible) _SelectSlides[_Interactions[_Selection].Num].ProcessMouseLBClick(x, y); @@ -443,7 +443,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) { if (_SelectSlides[_Interactions[_Selection].Num].Visible) _SelectSlides[_Interactions[_Selection].Num].ProcessMouseMove(x, y); @@ -491,11 +491,11 @@ namespace VocaluxeLib.Menu { switch (interact.Type) { - case EType.TButton: + case EType.Button: if (CHelper.IsInBounds(_Buttons[interact.Num].Rect, x, y)) return true; break; - case EType.TSelectSlide: + case EType.SelectSlide: if (CHelper.IsInBounds(_SelectSlides[interact.Num].Rect, x, y) || CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowLeft, x, y) || CHelper.IsInBounds(_SelectSlides[interact.Num].RectArrowRight, x, y)) @@ -509,13 +509,13 @@ namespace VocaluxeLib.Menu { switch (interact.Type) { - case EType.TStatic: + case EType.Static: return _Statics[interact.Num].Rect.Z; - case EType.TText: + case EType.Text: return _Texts[interact.Num].Z; - case EType.TButton: + case EType.Button: return _Buttons[interact.Num].Rect.Z; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[interact.Num].Rect.Z; } return CBase.Settings.GetZFar(); @@ -525,13 +525,13 @@ namespace VocaluxeLib.Menu { switch (_Interactions[interaction].Type) { - case EType.TStatic: + case EType.Static: return _Statics[_Interactions[interaction].Num].Rect.Z; - case EType.TText: + case EType.Text: return _Texts[_Interactions[interaction].Num].Z; - case EType.TButton: + case EType.Button: return _Buttons[_Interactions[interaction].Num].Rect.Z; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[_Interactions[interaction].Num].Rect.Z; } @@ -820,7 +820,7 @@ namespace VocaluxeLib.Menu /// True if the next element is selected. False if either there is no next element or the interaction does not provide such a method. private bool _NextElement() { - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) return _SelectSlides[_Interactions[_Selection].Num].NextValue(); return false; @@ -834,7 +834,7 @@ namespace VocaluxeLib.Menu /// private bool _PrevElement() { - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) return _SelectSlides[_Interactions[_Selection].Num].PrevValue(); return false; @@ -844,10 +844,10 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].Selected = true; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].Selected = true; break; } @@ -857,10 +857,10 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].Selected = false; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].Selected = false; break; } @@ -873,28 +873,28 @@ namespace VocaluxeLib.Menu switch (_Interactions[selection].Type) { - case EType.TButton: + case EType.Button: //_Buttons[_Interactions[selection].Num].Selected = true; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[selection].Num].Highlighted = true; break; - case EType.TStatic: + case EType.Static: //_Statics[_Interactions[selection].Num].Selected = true; break; - case EType.TText: + case EType.Text: //_Texts[_Interactions[selection].Num].Selected = true; break; - case EType.TSongMenu: + case EType.SongMenu: //_SongMenus[_Interactions[selection].Num].Selected = true; break; - case EType.TLyric: + case EType.Lyric: //_Lyrics[_Interactions[selection].Num].Selected = true; break; - case EType.TNameSelection: + case EType.NameSelection: //_NameSelections[_Interactions[selection].Num].Selected = true; break; - case EType.TPlaylist: + case EType.Playlist: //_Playlists[_Interactions[_Selection].Num].Selected = true; break; } @@ -907,28 +907,28 @@ namespace VocaluxeLib.Menu switch (_Interactions[selection].Type) { - case EType.TButton: + case EType.Button: //_Buttons[_Interactions[selection].Num].Selected = false; break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[selection].Num].Highlighted = false; break; - case EType.TStatic: + case EType.Static: //_Statics[_Interactions[selection].Num].Selected = false; break; - case EType.TText: + case EType.Text: //_Texts[_Interactions[selection].Num].Selected = false; break; - case EType.TSongMenu: + case EType.SongMenu: //_SongMenus[_Interactions[selection].Num].Selected = false; break; - case EType.TLyric: + case EType.Lyric: //_Lyrics[_Interactions[selection].Num].Selected = false; break; - case EType.TNameSelection: + case EType.NameSelection: //_NameSelections[_Interactions[selection].Num].Selected = false; break; - case EType.TPlaylist: + case EType.Playlist: //_Playlists[_Interactions[_Selection].Num].Selected = true; break; } @@ -939,7 +939,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) _SelectSlides[_Interactions[_Selection].Num].Highlighted = !_SelectSlides[_Interactions[_Selection].Num].Highlighted; } @@ -948,7 +948,7 @@ namespace VocaluxeLib.Menu if (_Selection >= _Interactions.Count || _Selection < 0) return false; - if (_Interactions[_Selection].Type == EType.TSelectSlide) + if (_Interactions[_Selection].Type == EType.SelectSlide) return _SelectSlides[_Interactions[_Selection].Num].Highlighted; return false; @@ -958,16 +958,16 @@ namespace VocaluxeLib.Menu { switch (_Interactions[interaction].Type) { - case EType.TStatic: + case EType.Static: return _Statics[_Interactions[interaction].Num].Visible; - case EType.TText: + case EType.Text: return _Texts[_Interactions[interaction].Num].Visible; - case EType.TButton: + case EType.Button: return _Buttons[_Interactions[interaction].Num].Visible; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[_Interactions[interaction].Num].Visible; } @@ -978,16 +978,16 @@ namespace VocaluxeLib.Menu { switch (_Interactions[interaction].Type) { - case EType.TButton: + case EType.Button: return _Buttons[_Interactions[interaction].Num].Enabled; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[_Interactions[interaction].Num].Visible; - case EType.TStatic: + case EType.Static: return false; //_Statics[_Interactions[interaction].Num].Visible; - case EType.TText: + case EType.Text: return false; //_Texts[_Interactions[interaction].Num].Visible; } @@ -999,10 +999,10 @@ namespace VocaluxeLib.Menu SRectF Result = new SRectF(); switch (_Interactions[interaction].Type) { - case EType.TButton: + case EType.Button: return _Buttons[_Interactions[interaction].Num].Rect; - case EType.TSelectSlide: + case EType.SelectSlide: return _SelectSlides[_Interactions[interaction].Num].Rect; } @@ -1023,15 +1023,15 @@ namespace VocaluxeLib.Menu bool sel = false; switch (_Interactions[interaction].Type) { - case EType.TStatic: + case EType.Static: _Statics[_Interactions[interaction].Num].Draw(); break; - case EType.TText: + case EType.Text: _Texts[_Interactions[interaction].Num].Draw(); break; - case EType.TButton: + case EType.Button: sel = _Buttons[_Interactions[interaction].Num].Selected; if (!Active) _Buttons[_Interactions[interaction].Num].Selected = false; @@ -1039,7 +1039,7 @@ namespace VocaluxeLib.Menu _Buttons[_Interactions[interaction].Num].Selected = sel; break; - case EType.TSelectSlide: + case EType.SelectSlide: sel = _SelectSlides[_Interactions[interaction].Num].Selected; if (!Active) _SelectSlides[_Interactions[interaction].Num].Selected = false; @@ -1057,11 +1057,11 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].MoveElement(stepX, stepY); break; } @@ -1074,11 +1074,11 @@ namespace VocaluxeLib.Menu { switch (_Interactions[_Selection].Type) { - case EType.TButton: + case EType.Button: _Buttons[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; - case EType.TSelectSlide: + case EType.SelectSlide: _SelectSlides[_Interactions[_Selection].Num].ResizeElement(stepW, stepH); break; } diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index 92db3f0c..0500887d 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -41,10 +41,10 @@ namespace VocaluxeLib.Menu public string Name; public string ColorBackgroundName; - public string SColorBackgroundName; + public string SelColorBackgroundName; public string TextureBackgroundName; - public string STextureBackgroundName; + public string SelTextureBackgroundName; public float EntryHeight; @@ -141,7 +141,7 @@ namespace VocaluxeLib.Menu public SRectF CompleteRect; public SRectF Rect; public SColorF BackgroundColor; - public SColorF BackgroundSColor; + public SColorF BackgroundSelColor; public bool Visible; @@ -199,7 +199,7 @@ namespace VocaluxeLib.Menu CompleteRect = new SRectF(); Rect = new SRectF(); BackgroundColor = new SColorF(); - BackgroundSColor = new SColorF(); + BackgroundSelColor = new SColorF(); PlaylistElements = new List(); PlaylistElementContents = new List(); @@ -231,7 +231,7 @@ namespace VocaluxeLib.Menu _ThemeLoaded = true; _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackground", ref _Theme.TextureBackgroundName, String.Empty); - _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackgroundSelected", ref _Theme.STextureBackgroundName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinBackgroundSelected", ref _Theme.SelTextureBackgroundName, String.Empty); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); @@ -247,14 +247,14 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/BackgroundB", ref BackgroundColor.B); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/BackgroundA", ref BackgroundColor.A); } - if (xmlReader.GetValue(item + "/SColorBackground", ref _Theme.SColorBackgroundName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SColorBackgroundName, SkinIndex, out BackgroundSColor); + if (xmlReader.GetValue(item + "/SColorBackground", ref _Theme.SelColorBackgroundName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColorBackgroundName, SkinIndex, out BackgroundSelColor); else { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundR", ref BackgroundSColor.R); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundG", ref BackgroundSColor.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundB", ref BackgroundSColor.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundA", ref BackgroundSColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundR", ref BackgroundSelColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundG", ref BackgroundSelColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundB", ref BackgroundSelColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SBackgroundA", ref BackgroundSelColor.A); } _ThemeLoaded &= _Theme.Text1.LoadTheme(item, "TextPart1", xmlReader, SkinIndex); @@ -347,7 +347,7 @@ namespace VocaluxeLib.Menu writer.WriteElementString("SkinBackground", _Theme.TextureBackgroundName); writer.WriteComment(": Texture name for selected playlist-entry"); - writer.WriteElementString("SkinBackgroundSelected", _Theme.STextureBackgroundName); + writer.WriteElementString("SkinBackgroundSelected", _Theme.SelTextureBackgroundName); writer.WriteComment(": Button color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); @@ -363,14 +363,14 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Selected paylist-entry color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (_Theme.SColorBackgroundName.Length > 0) - writer.WriteElementString("SColorBackground", _Theme.SColorBackgroundName); + if (_Theme.SelColorBackgroundName.Length > 0) + writer.WriteElementString("SColorBackground", _Theme.SelColorBackgroundName); else { - writer.WriteElementString("SBackgroundR", BackgroundSColor.R.ToString("#0.00")); - writer.WriteElementString("SBackgroundG", BackgroundSColor.G.ToString("#0.00")); - writer.WriteElementString("SBackgroundB", BackgroundSColor.B.ToString("#0.00")); - writer.WriteElementString("SBackgroundA", BackgroundSColor.A.ToString("#0.00")); + writer.WriteElementString("SBackgroundR", BackgroundSelColor.R.ToString("#0.00")); + writer.WriteElementString("SBackgroundG", BackgroundSelColor.G.ToString("#0.00")); + writer.WriteElementString("SBackgroundB", BackgroundSelColor.B.ToString("#0.00")); + writer.WriteElementString("SBackgroundA", BackgroundSelColor.A.ToString("#0.00")); } writer.WriteComment("Positions of , , , and are relative to playlist-entry!"); @@ -414,8 +414,8 @@ namespace VocaluxeLib.Menu { if (i == CurrentPlaylistElement && _Selected) { - PlaylistElements[i].Background.Texture = CBase.Theme.GetSkinTexture(_Theme.STextureBackgroundName, _PartyModeID); - PlaylistElements[i].Background.Color = BackgroundSColor; + PlaylistElements[i].Background.Texture = CBase.Theme.GetSkinTexture(_Theme.SelTextureBackgroundName, _PartyModeID); + PlaylistElements[i].Background.Color = BackgroundSelColor; } else { @@ -455,8 +455,8 @@ namespace VocaluxeLib.Menu if (_Theme.ColorBackgroundName.Length > 0) BackgroundColor = CBase.Theme.GetColor(_Theme.ColorBackgroundName, _PartyModeID); - if (_Theme.SColorBackgroundName.Length > 0) - BackgroundSColor = CBase.Theme.GetColor(_Theme.SColorBackgroundName, _PartyModeID); + if (_Theme.SelColorBackgroundName.Length > 0) + BackgroundSelColor = CBase.Theme.GetColor(_Theme.SelColorBackgroundName, _PartyModeID); _Theme.Text1.LoadTextures(); _Theme.ButtonPlaylistClose.LoadTextures(); diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 93745af2..43d08123 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -13,21 +13,21 @@ namespace VocaluxeLib.Menu public string TextureArrowLeftName; public string TextureArrowRightName; - public string STextureName; - public string STextureArrowLeftName; - public string STextureArrowRightName; + public string SelTextureName; + public string SelTextureArrowLeftName; + public string SelTextureArrowRightName; - public string HTextureName; + public string HighlightTextureName; public string ColorName; - public string SColorName; - public string HColorName; + public string SelColorName; + public string HighlightColorName; public string ArrowColorName; - public string SArrowColorName; + public string SelArrowColorName; public string TextColorName; - public string STextColorName; + public string SelTextColorName; public string TextFont; public EStyle TextStyle; @@ -49,14 +49,14 @@ namespace VocaluxeLib.Menu public SRectF RectArrowRight; public SColorF Color; - public SColorF SColor; - public SColorF HColor; + public SColorF SelColor; + public SColorF HighlightColor; public SColorF ColorArrow; - public SColorF SColorArrow; + public SColorF SelColorArrow; public SColorF TextColor; - public SColorF STextColor; + public SColorF SelTextColor; public float TextRelativeX; public float TextRelativeY; @@ -149,13 +149,13 @@ namespace VocaluxeLib.Menu RectArrowRight = new SRectF(); Color = new SColorF(); - SColor = new SColorF(); + SelColor = new SColorF(); ColorArrow = new SColorF(); - SColorArrow = new SColorF(); + SelColorArrow = new SColorF(); TextColor = new SColorF(); - STextColor = new SColorF(); + SelTextColor = new SColorF(); TextH = 1f; MaxW = 0f; @@ -174,21 +174,21 @@ namespace VocaluxeLib.Menu _Theme.TextureArrowLeftName = slide._Theme.TextureArrowLeftName; _Theme.TextureArrowRightName = slide._Theme.TextureArrowRightName; - _Theme.STextureName = slide._Theme.STextureName; - _Theme.STextureArrowLeftName = slide._Theme.STextureArrowLeftName; - _Theme.STextureArrowRightName = slide._Theme.STextureArrowRightName; + _Theme.SelTextureName = slide._Theme.SelTextureName; + _Theme.SelTextureArrowLeftName = slide._Theme.SelTextureArrowLeftName; + _Theme.SelTextureArrowRightName = slide._Theme.SelTextureArrowRightName; - _Theme.HTextureName = slide._Theme.HTextureName; + _Theme.HighlightTextureName = slide._Theme.HighlightTextureName; _Theme.ColorName = slide._Theme.ColorName; - _Theme.SColorName = slide._Theme.SColorName; - _Theme.HColorName = slide._Theme.HColorName; + _Theme.SelColorName = slide._Theme.SelColorName; + _Theme.HighlightColorName = slide._Theme.HighlightColorName; _Theme.ArrowColorName = slide._Theme.ArrowColorName; - _Theme.SArrowColorName = slide._Theme.SArrowColorName; + _Theme.SelArrowColorName = slide._Theme.SelArrowColorName; _Theme.TextColorName = slide._Theme.TextColorName; - _Theme.STextColorName = slide._Theme.STextColorName; + _Theme.SelTextColorName = slide._Theme.SelTextColorName; _Theme.TextFont = slide._Theme.TextFont; _Theme.TextStyle = slide._Theme.TextStyle; @@ -200,13 +200,13 @@ namespace VocaluxeLib.Menu RectArrowRight = new SRectF(slide.RectArrowRight); Color = new SColorF(slide.Color); - SColor = new SColorF(slide.SColor); + SelColor = new SColorF(slide.SelColor); ColorArrow = new SColorF(slide.ColorArrow); - SColorArrow = new SColorF(slide.SColorArrow); + SelColorArrow = new SColorF(slide.SelColorArrow); TextColor = new SColorF(slide.TextColor); - STextColor = new SColorF(slide.STextColor); + SelTextColor = new SColorF(slide.SelTextColor); TextH = slide.TextH; TextRelativeX = slide.TextRelativeX; TextRelativeY = slide.TextRelativeY; @@ -234,11 +234,11 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowLeft", ref _Theme.TextureArrowLeftName, String.Empty); _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowRight", ref _Theme.TextureArrowRightName, String.Empty); - _ThemeLoaded &= xmlReader.GetValue(item + "/SkinSelected", ref _Theme.STextureName, String.Empty); - _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowLeftSelected", ref _Theme.STextureArrowLeftName, String.Empty); - _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowRightSelected", ref _Theme.STextureArrowRightName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinSelected", ref _Theme.SelTextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowLeftSelected", ref _Theme.SelTextureArrowLeftName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinArrowRightSelected", ref _Theme.SelTextureArrowRightName, String.Empty); - _ThemeLoaded &= xmlReader.GetValue(item + "/SkinHighlighted", ref _Theme.HTextureName, String.Empty); + _ThemeLoaded &= xmlReader.GetValue(item + "/SkinHighlighted", ref _Theme.HighlightTextureName, String.Empty); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/X", ref Rect.X); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/Y", ref Rect.Y); @@ -256,24 +256,24 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SColorName, SkinIndex, out SColor); + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SelColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColorName, SkinIndex, out SelColor); else { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SColor.R); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SColor.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SColor.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref SelColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SelColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SelColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SelColor.A); } - if (xmlReader.GetValue(item + "/HColor", ref _Theme.HColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.HColorName, SkinIndex, out HColor); + if (xmlReader.GetValue(item + "/HColor", ref _Theme.HighlightColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.HighlightColorName, SkinIndex, out HighlightColor); else { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HR", ref HColor.R); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HG", ref HColor.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HB", ref HColor.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HA", ref HColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HR", ref HighlightColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HG", ref HighlightColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HB", ref HighlightColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/HA", ref HighlightColor.A); } _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowLeftX", ref RectArrowLeft.X); @@ -298,14 +298,14 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowA", ref ColorArrow.A); } - if (xmlReader.GetValue(item + "/ArrowSColor", ref _Theme.SArrowColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SArrowColorName, SkinIndex, out SColorArrow); + if (xmlReader.GetValue(item + "/ArrowSColor", ref _Theme.SelArrowColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelArrowColorName, SkinIndex, out SelColorArrow); else { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSR", ref SColorArrow.R); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSG", ref SColorArrow.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSB", ref SColorArrow.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSA", ref SColorArrow.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSR", ref SelColorArrow.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSG", ref SelColorArrow.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSB", ref SelColorArrow.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/ArrowSA", ref SelColorArrow.A); } if (xmlReader.GetValue(item + "/TextColor", ref _Theme.TextColorName, String.Empty)) @@ -318,14 +318,14 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextA", ref TextColor.A); } - if (xmlReader.GetValue(item + "/TextSColor", ref _Theme.STextColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.STextColorName, SkinIndex, out STextColor); + if (xmlReader.GetValue(item + "/TextSColor", ref _Theme.SelTextColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelTextColorName, SkinIndex, out SelTextColor); else { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSR", ref STextColor.R); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSG", ref STextColor.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSB", ref STextColor.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSA", ref STextColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSR", ref SelTextColor.R); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSG", ref SelTextColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSB", ref SelTextColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextSA", ref SelTextColor.A); } _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/TextH", ref TextH); @@ -364,16 +364,16 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Texture name for selected SelectSlide"); - writer.WriteElementString("SkinSelected", _Theme.STextureName); + writer.WriteElementString("SkinSelected", _Theme.SelTextureName); writer.WriteComment(": Texture name of selected left arrow"); - writer.WriteElementString("SkinArrowLeftSelected", _Theme.STextureArrowLeftName); + writer.WriteElementString("SkinArrowLeftSelected", _Theme.SelTextureArrowLeftName); writer.WriteComment(": Texture name of selected right arrow"); - writer.WriteElementString("SkinArrowRightSelected", _Theme.STextureArrowRightName); + writer.WriteElementString("SkinArrowRightSelected", _Theme.SelTextureArrowRightName); writer.WriteComment(": Texture name for highlighted SelectSlide"); - writer.WriteElementString("SkinHighlighted", _Theme.HTextureName); + writer.WriteElementString("SkinHighlighted", _Theme.HighlightTextureName); writer.WriteComment(", , , , : SelectSlide position, width and height"); writer.WriteElementString("X", Rect.X.ToString("#0")); @@ -410,26 +410,26 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Selected SelectSlide color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (_Theme.SColorName.Length > 0) - writer.WriteElementString("SColor", _Theme.SColorName); + if (_Theme.SelColorName.Length > 0) + writer.WriteElementString("SColor", _Theme.SelColorName); else { - writer.WriteElementString("SR", SColor.R.ToString("#0.00")); - writer.WriteElementString("SG", SColor.G.ToString("#0.00")); - writer.WriteElementString("SB", SColor.B.ToString("#0.00")); - writer.WriteElementString("SA", SColor.A.ToString("#0.00")); + writer.WriteElementString("SR", SelColor.R.ToString("#0.00")); + writer.WriteElementString("SG", SelColor.G.ToString("#0.00")); + writer.WriteElementString("SB", SelColor.B.ToString("#0.00")); + writer.WriteElementString("SA", SelColor.A.ToString("#0.00")); } writer.WriteComment(": Highlighted SelectSlide color from ColorScheme (high priority)"); writer.WriteComment("or
, , , (lower priority)"); - if (_Theme.HColorName.Length > 0) - writer.WriteElementString("HColor", _Theme.HColorName); + if (_Theme.HighlightColorName.Length > 0) + writer.WriteElementString("HColor", _Theme.HighlightColorName); else { - writer.WriteElementString("HR", HColor.R.ToString("#0.00")); - writer.WriteElementString("HG", HColor.G.ToString("#0.00")); - writer.WriteElementString("HB", HColor.B.ToString("#0.00")); - writer.WriteElementString("HA", HColor.A.ToString("#0.00")); + writer.WriteElementString("HR", HighlightColor.R.ToString("#0.00")); + writer.WriteElementString("HG", HighlightColor.G.ToString("#0.00")); + writer.WriteElementString("HB", HighlightColor.B.ToString("#0.00")); + writer.WriteElementString("HA", HighlightColor.A.ToString("#0.00")); } writer.WriteComment(": Arrow color from ColorScheme (high priority)"); @@ -446,14 +446,14 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Selected arrow color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (_Theme.SArrowColorName.Length > 0) - writer.WriteElementString("ArrowSColor", _Theme.SArrowColorName); + if (_Theme.SelArrowColorName.Length > 0) + writer.WriteElementString("ArrowSColor", _Theme.SelArrowColorName); else { - writer.WriteElementString("ArrowSR", SColorArrow.R.ToString("#0.00")); - writer.WriteElementString("ArrowSG", SColorArrow.G.ToString("#0.00")); - writer.WriteElementString("ArrowSB", SColorArrow.B.ToString("#0.00")); - writer.WriteElementString("ArrowSA", SColorArrow.A.ToString("#0.00")); + writer.WriteElementString("ArrowSR", SelColorArrow.R.ToString("#0.00")); + writer.WriteElementString("ArrowSG", SelColorArrow.G.ToString("#0.00")); + writer.WriteElementString("ArrowSB", SelColorArrow.B.ToString("#0.00")); + writer.WriteElementString("ArrowSA", SelColorArrow.A.ToString("#0.00")); } writer.WriteComment(": Text color from ColorScheme (high priority)"); @@ -470,14 +470,14 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Selected text color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (_Theme.STextColorName.Length > 0) - writer.WriteElementString("TextSColor", _Theme.STextColorName); + if (_Theme.SelTextColorName.Length > 0) + writer.WriteElementString("TextSColor", _Theme.SelTextColorName); else { - writer.WriteElementString("TextSR", STextColor.R.ToString("#0.00")); - writer.WriteElementString("TextSG", STextColor.G.ToString("#0.00")); - writer.WriteElementString("TextSB", STextColor.B.ToString("#0.00")); - writer.WriteElementString("TextSA", STextColor.A.ToString("#0.00")); + writer.WriteElementString("TextSR", SelTextColor.R.ToString("#0.00")); + writer.WriteElementString("TextSG", SelTextColor.G.ToString("#0.00")); + writer.WriteElementString("TextSB", SelTextColor.B.ToString("#0.00")); + writer.WriteElementString("TextSA", SelTextColor.A.ToString("#0.00")); } writer.WriteComment(": Text height"); @@ -687,18 +687,18 @@ namespace VocaluxeLib.Menu STexture TextureArrowLeft = CBase.Theme.GetSkinTexture(_Theme.TextureArrowLeftName, _PartyModeID); STexture TextureArrowRight = CBase.Theme.GetSkinTexture(_Theme.TextureArrowRightName, _PartyModeID); - STexture STexture = CBase.Theme.GetSkinTexture(_Theme.STextureName, _PartyModeID); - STexture STextureArrowLeft = CBase.Theme.GetSkinTexture(_Theme.STextureArrowLeftName, _PartyModeID); - STexture STextureArrowRight = CBase.Theme.GetSkinTexture(_Theme.STextureArrowRightName, _PartyModeID); + STexture selTexture = CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID); + STexture selTextureArrowLeft = CBase.Theme.GetSkinTexture(_Theme.SelTextureArrowLeftName, _PartyModeID); + STexture SelTextureArrowRight = CBase.Theme.GetSkinTexture(_Theme.SelTextureArrowRightName, _PartyModeID); - STexture HTexture = CBase.Theme.GetSkinTexture(_Theme.HTextureName, _PartyModeID); + STexture HighlightTexture = CBase.Theme.GetSkinTexture(_Theme.HighlightTextureName, _PartyModeID); if (Selected) { if (Highlighted) - CBase.Drawing.DrawTexture(HTexture, Rect, HColor); + CBase.Drawing.DrawTexture(HighlightTexture, Rect, HighlightColor); else - CBase.Drawing.DrawTexture(STexture, Rect, SColor); + CBase.Drawing.DrawTexture(selTexture, Rect, SelColor); } else CBase.Drawing.DrawTexture(Texture, Rect, Color); @@ -706,7 +706,7 @@ namespace VocaluxeLib.Menu if (_Selection > 0 || CBase.Settings.GetGameState() == EGameState.EditTheme) { if (_ArrowLeftSelected) - CBase.Drawing.DrawTexture(STextureArrowLeft, RectArrowLeft, SColorArrow); + CBase.Drawing.DrawTexture(selTextureArrowLeft, RectArrowLeft, SelColorArrow); else CBase.Drawing.DrawTexture(TextureArrowLeft, RectArrowLeft, ColorArrow); } @@ -714,7 +714,7 @@ namespace VocaluxeLib.Menu if (_Selection < _ValueNames.Count - 1 || CBase.Settings.GetGameState() == EGameState.EditTheme) { if (_ArrowRightSelected) - CBase.Drawing.DrawTexture(STextureArrowRight, RectArrowRight, SColorArrow); + CBase.Drawing.DrawTexture(SelTextureArrowRight, RectArrowRight, SelColorArrow); else CBase.Drawing.DrawTexture(TextureArrowRight, RectArrowRight, ColorArrow); } @@ -747,7 +747,7 @@ namespace VocaluxeLib.Menu SColorF Alpha = new SColorF(1f, 1f, 1f, 0.35f); if (i + offset == _Selection) { - Text.Color = STextColor; + Text.Color = SelTextColor; Alpha = new SColorF(1f, 1f, 1f, 1f); } @@ -781,23 +781,23 @@ namespace VocaluxeLib.Menu if (_Theme.ColorName.Length > 0) Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); - if (_Theme.SColorName.Length > 0) - SColor = CBase.Theme.GetColor(_Theme.SColorName, _PartyModeID); + if (_Theme.SelColorName.Length > 0) + SelColor = CBase.Theme.GetColor(_Theme.SelColorName, _PartyModeID); - if (_Theme.HColorName.Length > 0) - HColor = CBase.Theme.GetColor(_Theme.HColorName, _PartyModeID); + if (_Theme.HighlightColorName.Length > 0) + HighlightColor = CBase.Theme.GetColor(_Theme.HighlightColorName, _PartyModeID); if (_Theme.ArrowColorName.Length > 0) ColorArrow = CBase.Theme.GetColor(_Theme.ArrowColorName, _PartyModeID); - if (_Theme.SArrowColorName.Length > 0) - SColorArrow = CBase.Theme.GetColor(_Theme.SArrowColorName, _PartyModeID); + if (_Theme.SelArrowColorName.Length > 0) + SelColorArrow = CBase.Theme.GetColor(_Theme.SelArrowColorName, _PartyModeID); if (_Theme.TextColorName.Length > 0) TextColor = CBase.Theme.GetColor(_Theme.TextColorName, _PartyModeID); - if (_Theme.SColorName.Length > 0) - STextColor = CBase.Theme.GetColor(_Theme.STextColorName, _PartyModeID); + if (_Theme.SelColorName.Length > 0) + SelTextColor = CBase.Theme.GetColor(_Theme.SelTextColorName, _PartyModeID); } public void ReloadTextures() diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 2dfe4b20..a35f608f 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -10,14 +10,14 @@ namespace VocaluxeLib.Menu public string Text; public string ColorName; - public string SColorName; //for Buttons + public string SelColorName; //for Buttons } struct STextPosition { public float X; public float Y; - public float tH; + public float textHeight; public float Width; public float Height; @@ -25,7 +25,7 @@ namespace VocaluxeLib.Menu { X = 0f; Y = 0f; - tH = 0f; + textHeight = 0f; Width = 0f; Height = 0f; } @@ -189,7 +189,7 @@ namespace VocaluxeLib.Menu } public SColorF Color; //normal Color - public SColorF SColor; //selected Color for Buttons + public SColorF SelColor; //selected Color for Buttons public bool Reflection = false; public float ReflectionSpace; @@ -273,7 +273,7 @@ namespace VocaluxeLib.Menu _Font = text._Font; Color = new SColorF(text.Color); - SColor = new SColorF(text.SColor); + SelColor = new SColorF(text.SelColor); Reflection = text.Reflection; ReflectionSpace = text.ReflectionSpace; ReflectionHeight = text.ReflectionHeight; @@ -306,7 +306,7 @@ namespace VocaluxeLib.Menu Font = font; Color = new SColorF(r, g, b, a); - SColor = new SColorF(r, g, b, a); + SelColor = new SColorF(r, g, b, a); Text = text; @@ -341,7 +341,7 @@ namespace VocaluxeLib.Menu Font = font; Color = new SColorF(r, g, b, a); - SColor = new SColorF(r, g, b, a); + SelColor = new SColorF(r, g, b, a); Text = text; @@ -374,7 +374,7 @@ namespace VocaluxeLib.Menu Font = font; Color = col; - SColor = new SColorF(col); + SelColor = new SColorF(col); Text = text; @@ -409,7 +409,7 @@ namespace VocaluxeLib.Menu Font = font; Color = col; - SColor = new SColorF(col); + SelColor = new SColorF(col); Text = text; @@ -452,15 +452,15 @@ namespace VocaluxeLib.Menu _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref Color.A); } - if (xmlReader.GetValue(item + "/SColor", ref _Theme.SColorName, String.Empty)) - _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SColorName, SkinIndex, out SColor); + if (xmlReader.GetValue(item + "/SColor", ref _Theme.SelColorName, String.Empty)) + _ThemeLoaded &= CBase.Theme.GetColor(_Theme.SelColorName, SkinIndex, out SelColor); else { - if (xmlReader.TryGetFloatValue(item + "/SR", ref SColor.R)) + if (xmlReader.TryGetFloatValue(item + "/SR", ref SelColor.R)) { - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SColor.G); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SColor.B); - _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SColor.A); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SG", ref SelColor.G); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SB", ref SelColor.B); + _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SA", ref SelColor.A); } } @@ -534,14 +534,14 @@ namespace VocaluxeLib.Menu writer.WriteComment(": Selected Text color from ColorScheme (high priority)"); writer.WriteComment("or , , , (lower priority)"); - if (_Theme.SColorName.Length > 0) - writer.WriteElementString("SColor", _Theme.SColorName); + if (_Theme.SelColorName.Length > 0) + writer.WriteElementString("SColor", _Theme.SelColorName); else { - writer.WriteElementString("SR", SColor.R.ToString("#0.00")); - writer.WriteElementString("SG", SColor.G.ToString("#0.00")); - writer.WriteElementString("SB", SColor.B.ToString("#0.00")); - writer.WriteElementString("SA", SColor.A.ToString("#0.00")); + writer.WriteElementString("SR", SelColor.R.ToString("#0.00")); + writer.WriteElementString("SG", SelColor.G.ToString("#0.00")); + writer.WriteElementString("SB", SelColor.B.ToString("#0.00")); + writer.WriteElementString("SA", SelColor.A.ToString("#0.00")); } writer.WriteComment(": Text align horizontal: " + CHelper.ListStrings(Enum.GetNames(typeof(EAlignment)))); @@ -605,28 +605,28 @@ namespace VocaluxeLib.Menu SColorF CurrentColor = new SColorF(Color); if (Selected) - CurrentColor = new SColorF(SColor); + CurrentColor = new SColorF(SelColor); SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha); - CBase.Fonts.DrawText(_Text, _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color); + CBase.Fonts.DrawText(_Text, _DrawPosition.textHeight, _DrawPosition.X, _DrawPosition.Y, Z, color); if (Reflection) { - float sFactor = 0f; + float factor = 0f; switch (HAlign) { case EHAlignment.Top: - sFactor = (Height - _DrawPosition.tH) * 1.5f; + factor = (Height - _DrawPosition.textHeight) * 1.5f; break; case EHAlignment.Center: - sFactor = (Height - _DrawPosition.tH) * 1.0f; + factor = (Height - _DrawPosition.textHeight) * 1.0f; break; case EHAlignment.Bottom: - sFactor = (Height - _DrawPosition.tH) * 0.5f; + factor = (Height - _DrawPosition.textHeight) * 0.5f; break; } - CBase.Fonts.DrawTextReflection(_Text, _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color, ReflectionSpace + sFactor, ReflectionHeight); + CBase.Fonts.DrawTextReflection(_Text, _DrawPosition.textHeight, _DrawPosition.X, _DrawPosition.Y, Z, color, ReflectionSpace + factor, ReflectionHeight); } if (Selected && (CBase.Settings.GetGameState() == EGameState.EditTheme)) @@ -655,7 +655,7 @@ namespace VocaluxeLib.Menu SColorF CurrentColor = new SColorF(Color); if (Selected) - CurrentColor = new SColorF(SColor); + CurrentColor = new SColorF(SelColor); SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha); @@ -732,7 +732,7 @@ namespace VocaluxeLib.Menu SColorF CurrentColor = new SColorF(Color); if (Selected) - CurrentColor = new SColorF(SColor); + CurrentColor = new SColorF(SelColor); SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha); @@ -760,8 +760,8 @@ namespace VocaluxeLib.Menu if (_Theme.ColorName.Length > 0) Color = CBase.Theme.GetColor(_Theme.ColorName, _PartyModeID); - if (_Theme.SColorName.Length > 0) - SColor = CBase.Theme.GetColor(_Theme.SColorName, _PartyModeID); + if (_Theme.SelColorName.Length > 0) + SelColor = CBase.Theme.GetColor(_Theme.SelColorName, _PartyModeID); } public void ReloadTextures() @@ -831,7 +831,7 @@ namespace VocaluxeLib.Menu _DrawPosition.X = x; _DrawPosition.Y = y; - _DrawPosition.tH = h; + _DrawPosition.textHeight = h; _DrawPosition.Width = bounds.Width; _DrawPosition.Height = bounds.Height; diff --git a/VocaluxeLib/Menu/CXMLReader.cs b/VocaluxeLib/Menu/CXMLReader.cs index 68a43360..64c15abd 100644 --- a/VocaluxeLib/Menu/CXMLReader.cs +++ b/VocaluxeLib/Menu/CXMLReader.cs @@ -18,8 +18,8 @@ namespace VocaluxeLib.Menu private CXMLReader(string uri) { _FileName = uri; - XPathDocument xPathDoc = new XPathDocument(uri); - _Navigator = xPathDoc.CreateNavigator(); + XPathDocument xmlDoc = new XPathDocument(uri); + _Navigator = xmlDoc.CreateNavigator(); } public XPathNavigator Navigator @@ -27,15 +27,15 @@ namespace VocaluxeLib.Menu get { return _Navigator; } } - public static CXMLReader OpenFile(string sFile) + public static CXMLReader OpenFile(string fileName) { try { - return new CXMLReader(sFile); + return new CXMLReader(fileName); } catch (Exception e) { - CBase.Log.LogError("Can't open XML file: " + sFile + ": " + e.Message); + CBase.Log.LogError("Can't open XML file: " + fileName + ": " + e.Message); return null; } } diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs index fcb60f01..b38ceba2 100644 --- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs @@ -670,7 +670,7 @@ namespace VocaluxeLib.Menu.SingNotes _PlayerNotes[n].PerfectLineTwinkle.Add(twinkle); } - private void DrawToneHelper(int n, int BaseLine, float XOffset) + private void DrawToneHelper(int n, int BaseLine, float OffsetX) { int TonePlayer = CBase.Record.GetToneAbs(_PlayerNotes[n].PlayerNr); @@ -682,15 +682,15 @@ namespace VocaluxeLib.Menu.SingNotes while (TonePlayer - BaseLine > 12) TonePlayer -= 12; - if (XOffset < 0f) - XOffset = 0f; + if (OffsetX < 0f) + OffsetX = 0f; - if (XOffset > noteBounds.W) - XOffset = noteBounds.W; + if (OffsetX > noteBounds.W) + OffsetX = noteBounds.W; float dy = noteBounds.H / CBase.Settings.GetNumNoteLines(); SRectF drawRect = new SRectF( - noteBounds.X - dy + XOffset, + noteBounds.X - dy + OffsetX, noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f), dy, dy, @@ -714,7 +714,7 @@ namespace VocaluxeLib.Menu.SingNotes TonePlayer -= 12; drawRect = new SRectF( - noteBounds.X - dy + XOffset, + noteBounds.X - dy + OffsetX, noteBounds.Y + dy * (CBase.Settings.GetNumNoteLines() - 1 - (TonePlayer - BaseLine) / 2f), dy, dy, diff --git a/VocaluxeLib/PartyModes/CScreenPartyDummy.cs b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs index 88b8dbd5..042991d2 100644 --- a/VocaluxeLib/PartyModes/CScreenPartyDummy.cs +++ b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs @@ -21,7 +21,7 @@ namespace VocaluxeLib.PartyModes Warning.Font = "Normal"; Warning.Style = EStyle.Normal; Warning.Color = new SColorF(1f, 0f, 0f, 1f); - Warning.SColor = new SColorF(1f, 0f, 0f, 1f); + Warning.SelColor = new SColorF(1f, 0f, 0f, 1f); Warning.Text = "SOMETHING WENT WRONG!"; AddText(Warning); }