From e936fe4126a01dc805594d748e1a6b5e442deabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Wed, 10 Sep 2014 20:44:39 +0200 Subject: [PATCH] Added constructors with STheme*-structs, LoadTextures() will be LoadTheme later and set all needed values from theme-struct to object. --- VocaluxeLib/Menu/CBackground.cs | 8 ++++++++ VocaluxeLib/Menu/CButton.cs | 11 +++++++++++ VocaluxeLib/Menu/CEqualizer.cs | 11 +++++++++++ VocaluxeLib/Menu/CLyric.cs | 13 +++++++++++++ VocaluxeLib/Menu/CNameSelection.cs | 12 ++++++++++++ VocaluxeLib/Menu/CParticle.cs | 14 ++++++++++++++ VocaluxeLib/Menu/CPlaylist.cs | 18 ++++++++++++++++++ VocaluxeLib/Menu/CScreenSetting.cs | 6 ++++++ VocaluxeLib/Menu/CSelectSlide.cs | 14 ++++++++++++++ VocaluxeLib/Menu/CStatic.cs | 8 ++++++++ VocaluxeLib/Menu/CText.cs | 8 ++++++++ .../Menu/SongMenu/CSongMenuFramework.cs | 9 +++++++++ 12 files changed, 132 insertions(+) diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index eabf5758..08659da7 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -90,6 +90,14 @@ namespace VocaluxeLib.Menu Color = new SColorF(0f, 0f, 0f, 1f); } + + public CBackground(SThemeBackground theme, int partyModeID) + { + _Theme = new SThemeBackground(theme); + _PartyModeID = partyModeID; + + LoadTextures(); + } #endregion Constructors #region public diff --git a/VocaluxeLib/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs index f3a8d837..82f0970a 100644 --- a/VocaluxeLib/Menu/CButton.cs +++ b/VocaluxeLib/Menu/CButton.cs @@ -137,6 +137,17 @@ namespace VocaluxeLib.Menu EditMode = false; } + public CButton(SThemeButton theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeButton(theme); + + Selected = false; + EditMode = false; + + LoadTextures(); + } + public CButton(CButton button) { _PartyModeID = button._PartyModeID; diff --git a/VocaluxeLib/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs index ae35dfb3..958db155 100644 --- a/VocaluxeLib/Menu/CEqualizer.cs +++ b/VocaluxeLib/Menu/CEqualizer.cs @@ -121,6 +121,17 @@ namespace VocaluxeLib.Menu ReflectionHeight = 0f; } + public CEqualizer(SThemeEqualizer theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeEqualizer(theme); + + Visible = true; + ScreenHandles = false; + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs index f215e588..bc2418b1 100644 --- a/VocaluxeLib/Menu/CLyric.cs +++ b/VocaluxeLib/Menu/CLyric.cs @@ -128,6 +128,19 @@ namespace VocaluxeLib.Menu LyricStyle = ELyricStyle.Fill; } + public CLyric(SThemeLyrics theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeLyrics(theme); + + _Line = new CSongLine(); + _Text = new CText(_PartyModeID); + + LyricStyle = ELyricStyle.Fill; + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs index 7e2fcbbd..a8d93e17 100644 --- a/VocaluxeLib/Menu/CNameSelection.cs +++ b/VocaluxeLib/Menu/CNameSelection.cs @@ -175,6 +175,18 @@ namespace VocaluxeLib.Menu _UsedProfiles = new List(); } + public CNameSelection(SThemeNameSelection theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeNameSelection(theme); + + _Tiles = new List(); + _VisibleProfiles = new List(); + _UsedProfiles = new List(); + + LoadTextures(); + } + public void Init() { _PrepareTiles(); diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs index 6be85739..7f6aec9a 100644 --- a/VocaluxeLib/Menu/CParticle.cs +++ b/VocaluxeLib/Menu/CParticle.cs @@ -170,6 +170,8 @@ namespace VocaluxeLib.Menu _MaxAge = maxage; _Rotation = (float)(CBase.Game.GetRandomDouble() * 360.0); } + + #endregion Constructors public void Update() @@ -399,6 +401,18 @@ namespace VocaluxeLib.Menu Visible = true; } + public CParticleEffect(SThemeParticleEffect theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeParticleEffect(theme); + _Stars = new List(); + _SpawnTimer = new Stopwatch(); + _NextSpawnTime = 0f; + Visible = true; + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs index d8972b32..e625d539 100644 --- a/VocaluxeLib/Menu/CPlaylist.cs +++ b/VocaluxeLib/Menu/CPlaylist.cs @@ -307,6 +307,24 @@ namespace VocaluxeLib.Menu Selected = false; } + public CPlaylist(SThemePlaylist theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemePlaylist(theme); + + CompleteRect = new SRectF(); + _PlaylistElements = new List(); + _PlaylistElementContents = new List(); + + _Interactions = new CObjectInteractions(); + _ChangeOrderElement = new CPlaylistElement(); + + Visible = false; + Selected = false; + + LoadTextures(); + } + public void Init() { _Interactions.Clear(); diff --git a/VocaluxeLib/Menu/CScreenSetting.cs b/VocaluxeLib/Menu/CScreenSetting.cs index 4adea9f2..2f4e1bf5 100644 --- a/VocaluxeLib/Menu/CScreenSetting.cs +++ b/VocaluxeLib/Menu/CScreenSetting.cs @@ -75,6 +75,12 @@ namespace VocaluxeLib.Menu _ThemeLoaded = false; } + public CScreenSetting(SScreenSetting theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SScreenSetting(theme); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs index 20d96052..4a621ade 100644 --- a/VocaluxeLib/Menu/CSelectSlide.cs +++ b/VocaluxeLib/Menu/CSelectSlide.cs @@ -311,6 +311,20 @@ namespace VocaluxeLib.Menu Visible = slide.Visible; } + public CSelectSlide(SThemeSelectSlide theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeSelectSlide(theme); + + _Selected = false; + _Textures = new List(); + _ValueIndexes = new List(); + _ValueNames = new List(); + _ValuePartyModeIDs = new List(); + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs index f9ee10f5..08cee0b9 100644 --- a/VocaluxeLib/Menu/CStatic.cs +++ b/VocaluxeLib/Menu/CStatic.cs @@ -125,6 +125,14 @@ namespace VocaluxeLib.Menu Rect = rect; } + public CStatic(SThemeStatic theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeStatic(theme); + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { string item = xmlPath + "/" + elementName; diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index cf58092d..1a126d61 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -350,6 +350,14 @@ namespace VocaluxeLib.Menu ReflectionHeight = rheight; } + public CText(SThemeText theme, int partyModeID) + { + _PartyModeID = partyModeID; + _Theme = new SThemeText(theme); + + LoadTextures(); + } + public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader, int skinIndex) { return LoadTheme(xmlPath, elementName, xmlReader, skinIndex, false); diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 98648ed3..05b36cf7 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -266,6 +266,15 @@ namespace VocaluxeLib.Menu.SongMenu }; } + protected CSongMenuFramework(SThemeSongMenu theme, int partyModeID) + { + Visible = true; + _PartyModeID = partyModeID; + _Theme = new SThemeSongMenu(theme); + + LoadTextures(); + } + #region Theme public string GetThemeName() {