diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml index 1485e4bf..77427a6f 100644 --- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml +++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml @@ -1304,8 +1304,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1323,8 +1323,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1342,8 +1342,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1361,8 +1361,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1380,8 +1380,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1399,8 +1399,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1418,8 +1418,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1437,8 +1437,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1456,8 +1456,8 @@ StaticColor - - TButton + + Star 25,00 @@ -1475,12 +1475,12 @@ StaticColor - - TButton + + Star 25,00 250 - \ No newline at end of file + diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs index f95fdbb8..ed312d59 100644 --- a/Vocaluxe/Screens/CScreenCredits.cs +++ b/Vocaluxe/Screens/CScreenCredits.cs @@ -243,8 +243,8 @@ namespace Vocaluxe.Screens //Little stars for logo int numstars = (int)(logo.Rect.W * 0.25f / 2f); - starsRed = GetNewParticleEffect(numstars, new SColorF(1, 0, 0, 1), new SRectF(logo.Rect.X, logo.Rect.Y, logo.Rect.W, logo.Rect.H, -1), _TexPerfectNoteStar, 35, EParticeType.Star); - starsBlue = GetNewParticleEffect(numstars, new SColorF(0.149f, 0.415f, 0.819f, 1), new SRectF(logo.Rect.X, logo.Rect.Y, logo.Rect.W, logo.Rect.H, -1), _TexPerfectNoteStar, 35, EParticeType.Star); + starsRed = GetNewParticleEffect(numstars, new SColorF(1, 0, 0, 1), new SRectF(logo.Rect.X, logo.Rect.Y, logo.Rect.W, logo.Rect.H, -1), _TexPerfectNoteStar, 35, EParticleType.Star); + starsBlue = GetNewParticleEffect(numstars, new SColorF(0.149f, 0.415f, 0.819f, 1), new SRectF(logo.Rect.X, logo.Rect.Y, logo.Rect.W, logo.Rect.H, -1), _TexPerfectNoteStar, 35, EParticleType.Star); //Credit names _CreditNames = new List(); @@ -254,7 +254,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntryBrunzel = new CCreditName(); CreditEntryBrunzel.image = GetNewStatic(_TexNameBrunzel, new SColorF(1, 1, 1, 1), new SRectF(-450, 580, 400, 120, -4)); CreditEntryBrunzel.particleRect = new SRectF(CreditEntryBrunzel.image.Rect.X + 342, CreditEntryBrunzel.image.Rect.Y + 4, 30, 30, -5); - CreditEntryBrunzel.particle = GetNewParticleEffect(8, new SColorF(1, 0, 0, 1), CreditEntryBrunzel.particleRect, _TexPerfectNoteStar, 35, EParticeType.Star); + CreditEntryBrunzel.particle = GetNewParticleEffect(8, new SColorF(1, 0, 0, 1), CreditEntryBrunzel.particleRect, _TexPerfectNoteStar, 35, EParticleType.Star); CreditEntryBrunzel.active = true; CreditEntryBrunzel.direction = EDirection.Left; _CreditNames.Add(CreditEntryBrunzel); @@ -263,7 +263,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntryDarkice = new CCreditName(); CreditEntryDarkice.image = GetNewStatic(_TexNameDarkice, new SColorF(1, 1, 1, 1), new SRectF(CSettings.iRenderW, 580, 400, 120, -4)); CreditEntryDarkice.particleRect = new SRectF(CreditEntryDarkice.image.Rect.X + 242, CreditEntryDarkice.image.Rect.Y + 23, 30, 30, -5); - CreditEntryDarkice.particle = GetNewParticleEffect(8, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryDarkice.particleRect, _TexPerfectNoteStar, 35, EParticeType.Star); + CreditEntryDarkice.particle = GetNewParticleEffect(8, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryDarkice.particleRect, _TexPerfectNoteStar, 35, EParticleType.Star); CreditEntryDarkice.active = true; CreditEntryDarkice.direction = EDirection.Right; _CreditNames.Add(CreditEntryDarkice); @@ -272,7 +272,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntryFlokuep = new CCreditName(); CreditEntryFlokuep.image = GetNewStatic(_TexNameFlokuep, new SColorF(1, 1, 1, 1), new SRectF(-450, 580, 400, 120, -4)); CreditEntryFlokuep.particleRect = new SRectF(CreditEntryFlokuep.image.Rect.X + 141, CreditEntryFlokuep.image.Rect.Y - 2, 30, 30, -5); - CreditEntryFlokuep.particle = GetNewParticleEffect(8, new SColorF(1, 0, 0, 1), CreditEntryFlokuep.particleRect, _TexPerfectNoteStar, 35, EParticeType.Star); + CreditEntryFlokuep.particle = GetNewParticleEffect(8, new SColorF(1, 0, 0, 1), CreditEntryFlokuep.particleRect, _TexPerfectNoteStar, 35, EParticleType.Star); CreditEntryFlokuep.active = true; CreditEntryFlokuep.direction = EDirection.Left; _CreditNames.Add(CreditEntryFlokuep); @@ -281,7 +281,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntryBohning = new CCreditName(); CreditEntryBohning.image = GetNewStatic(_TexNameBohning, new SColorF(1, 1, 1, 1), new SRectF(CSettings.iRenderW, 580, 350, 110, -4)); CreditEntryBohning.particleRect = new SRectF(CreditEntryBohning.image.Rect.X + 172, CreditEntryBohning.image.Rect.Y + 16, 10, 10, -5); - CreditEntryBohning.particle = GetNewParticleEffect(4, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryBohning.particleRect, _TexPerfectNoteStar, 25, EParticeType.Star); + CreditEntryBohning.particle = GetNewParticleEffect(4, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryBohning.particleRect, _TexPerfectNoteStar, 25, EParticleType.Star); CreditEntryBohning.active = true; CreditEntryBohning.direction = EDirection.Right; _CreditNames.Add(CreditEntryBohning); @@ -290,7 +290,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntryMesand = new CCreditName(); CreditEntryMesand.image = GetNewStatic(_TexNameMesand, new SColorF(1, 1, 1, 1), new SRectF(-450, 580, 350, 110, -4)); CreditEntryMesand.particleRect = new SRectF(CreditEntryMesand.image.Rect.X + 240, CreditEntryMesand.image.Rect.Y - 2, 10, 10, -5); - CreditEntryMesand.particle = GetNewParticleEffect(4, new SColorF(1, 0, 0, 1), CreditEntryMesand.particleRect, _TexPerfectNoteStar, 25, EParticeType.Star); + CreditEntryMesand.particle = GetNewParticleEffect(4, new SColorF(1, 0, 0, 1), CreditEntryMesand.particleRect, _TexPerfectNoteStar, 25, EParticleType.Star); CreditEntryMesand.active = true; CreditEntryMesand.direction = EDirection.Left; _CreditNames.Add(CreditEntryMesand); @@ -299,7 +299,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntryBabene03 = new CCreditName(); CreditEntryBabene03.image = GetNewStatic(_TexNameBabene03, new SColorF(1, 1, 1, 1), new SRectF(CSettings.iRenderW, 580, 350, 110, -4)); CreditEntryBabene03.particleRect = new SRectF(CreditEntryBabene03.image.Rect.X + 7, CreditEntryBabene03.image.Rect.Y + 4, 10, 10, -5); - CreditEntryBabene03.particle = GetNewParticleEffect(4, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryBabene03.particleRect, _TexPerfectNoteStar, 25, EParticeType.Star); + CreditEntryBabene03.particle = GetNewParticleEffect(4, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryBabene03.particleRect, _TexPerfectNoteStar, 25, EParticleType.Star); CreditEntryBabene03.active = true; CreditEntryBabene03.direction = EDirection.Right; _CreditNames.Add(CreditEntryBabene03); @@ -308,7 +308,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntrypantero = new CCreditName(); CreditEntrypantero.image = GetNewStatic(_TexNamePantero, new SColorF(1, 1, 1, 1), new SRectF(-450, 580, 350, 110, -4)); CreditEntrypantero.particleRect = new SRectF(CreditEntrypantero.image.Rect.X + 140, CreditEntrypantero.image.Rect.Y + 15, 10, 10, -5); - CreditEntrypantero.particle = GetNewParticleEffect(4, new SColorF(1, 0, 0, 1), CreditEntrypantero.particleRect, _TexPerfectNoteStar, 25, EParticeType.Star); + CreditEntrypantero.particle = GetNewParticleEffect(4, new SColorF(1, 0, 0, 1), CreditEntrypantero.particleRect, _TexPerfectNoteStar, 25, EParticleType.Star); CreditEntrypantero.active = true; CreditEntrypantero.direction = EDirection.Left; _CreditNames.Add(CreditEntrypantero); @@ -317,7 +317,7 @@ namespace Vocaluxe.Screens CCreditName CreditEntryPinky007 = new CCreditName(); CreditEntryPinky007.image = GetNewStatic(_TexNamePinky007, new SColorF(1, 1, 1, 1), new SRectF(CSettings.iRenderW, 580, 350, 110, -4)); CreditEntryPinky007.particleRect = new SRectF(CreditEntryPinky007.image.Rect.X + 42, CreditEntryPinky007.image.Rect.Y + 15, 10, 10, -5); - CreditEntryPinky007.particle = GetNewParticleEffect(4, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryPinky007.particleRect, _TexPerfectNoteStar, 25, EParticeType.Star); + CreditEntryPinky007.particle = GetNewParticleEffect(4, new SColorF(0.149f, 0.415f, 0.819f, 1), CreditEntryPinky007.particleRect, _TexPerfectNoteStar, 25, EParticleType.Star); CreditEntryPinky007.active = true; CreditEntryPinky007.direction = EDirection.Right; _CreditNames.Add(CreditEntryPinky007); diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index 1812856d..02819864 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -786,7 +786,7 @@ namespace Vocaluxe.Menu return new CPlaylist(_Base, _PartyModeID); } - public CParticleEffect GetNewParticleEffect(int MaxNumber, SColorF Color, SRectF Area, STexture Texture, float Size, EParticeType Type) + public CParticleEffect GetNewParticleEffect(int MaxNumber, SColorF Color, SRectF Area, STexture Texture, float Size, EParticleType Type) { return new CParticleEffect(_Base, _PartyModeID, MaxNumber, Color, Area, Texture, Size, Type); } diff --git a/VocaluxeLib/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs index 2004b3dd..b5fe5499 100644 --- a/VocaluxeLib/Menu/CParticle.cs +++ b/VocaluxeLib/Menu/CParticle.cs @@ -14,7 +14,7 @@ namespace Vocaluxe.Menu public string ColorName; } - public enum EParticeType + public enum EParticleType { Twinkle, Star, @@ -43,7 +43,7 @@ namespace Vocaluxe.Menu private float _Rotation; //start rotation 0..360° private float _Vsize; //size changing speed: period [s] private float _LastTime; - private EParticeType _Type; + private EParticleType _Type; private Stopwatch _Timer; #endregion private vars @@ -94,7 +94,7 @@ namespace Vocaluxe.Menu #endregion public vars #region Constructors - public CParticle(Basic Base, int PartyModeID, string textureName, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type) + public CParticle(Basic Base, int PartyModeID, string textureName, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticleType type) { _PartyModeID = PartyModeID; _Base = Base; @@ -118,7 +118,7 @@ namespace Vocaluxe.Menu _Rotation = (float)(_Base.Game.GetRandomDouble() * 360.0); } - public CParticle(Basic Base, int PartyModeID, STexture texture, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type) + public CParticle(Basic Base, int PartyModeID, STexture texture, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticleType type) { _PartyModeID = PartyModeID; _Base = Base; @@ -161,23 +161,23 @@ namespace Vocaluxe.Menu { switch (_Type) { - case EParticeType.Twinkle: + case EParticleType.Twinkle: _Alpha = 1f - _Age / _MaxAge; break; - case EParticeType.Star: + case EParticleType.Star: _Alpha = 1f - _Age / _MaxAge; break; - case EParticeType.Snow: + case EParticleType.Snow: _Alpha = (float)Math.Sqrt((Math.Sin(_Age / _MaxAge * Math.PI * 2 - 0.5 * Math.PI) + 1) / 2); break; - case EParticeType.Flare: + case EParticleType.Flare: _Alpha = 1f - _Age / _MaxAge; break; - case EParticeType.PerfNoteStar: + case EParticleType.PerfNoteStar: _Alpha = 1f - _Age / _MaxAge; break; @@ -190,17 +190,17 @@ namespace Vocaluxe.Menu // update position switch (_Type) { - case EParticeType.Twinkle: + case EParticleType.Twinkle: X += _Vx * timediff; Y += _Vy * timediff; break; - case EParticeType.Star: + case EParticleType.Star: X += _Vx * timediff; Y += _Vy * timediff; break; - case EParticeType.Snow: + case EParticleType.Snow: int maxy = (int)Math.Round(_Base.Settings.GetRenderH() - _Size * 0.4f); if (Math.Round(Y) < maxy) @@ -217,12 +217,12 @@ namespace Vocaluxe.Menu } break; - case EParticeType.Flare: + case EParticleType.Flare: X += _Vx * timediff; Y += _Vy * timediff; break; - case EParticeType.PerfNoteStar: + case EParticleType.PerfNoteStar: X += _Vx * timediff; Y += _Vy * timediff; break; @@ -238,23 +238,23 @@ namespace Vocaluxe.Menu float size = _Size; switch (_Type) { - case EParticeType.Twinkle: + case EParticleType.Twinkle: size = _Size * (1f - CurrentTime / _Vsize); break; - case EParticeType.Star: + case EParticleType.Star: size = _Size * (1f - CurrentTime / _Vsize); break; - case EParticeType.Snow: + case EParticleType.Snow: size = _Size * (float)Math.Sqrt((Math.Sin(CurrentTime / _Vsize * Math.PI * 2 - 0.5 * Math.PI) + 1) / 2); break; - case EParticeType.Flare: + case EParticleType.Flare: size = _Size * (1f - CurrentTime / _Vsize); break; - case EParticeType.PerfNoteStar: + case EParticleType.PerfNoteStar: size = _Size * (1f - CurrentTime / _Vsize); break; @@ -315,7 +315,7 @@ namespace Vocaluxe.Menu private List _Stars; private int _MaxNumber; private float _Size; - private EParticeType _Type; + private EParticleType _Type; private Stopwatch _SpawnTimer; private float _NextSpawnTime; @@ -345,7 +345,7 @@ namespace Vocaluxe.Menu Visible = true; } - public CParticleEffect(Basic Base, int PartyModeID, int MaxNumber, SColorF Color, SRectF Rect, string TextureName, float Size, EParticeType Type) + public CParticleEffect(Basic Base, int PartyModeID, int MaxNumber, SColorF Color, SRectF Rect, string TextureName, float Size, EParticleType Type) { _PartyModeID = PartyModeID; _Base = Base; @@ -363,7 +363,7 @@ namespace Vocaluxe.Menu Visible = true; } - public CParticleEffect(Basic Base, int PartyModeID, int MaxNumber, SColorF Color, SRectF Rect, STexture Texture, float Size, EParticeType Type) + public CParticleEffect(Basic Base, int PartyModeID, int MaxNumber, SColorF Color, SRectF Rect, STexture Texture, float Size, EParticleType Type) { _PartyModeID = PartyModeID; _Base = Base; @@ -406,7 +406,7 @@ namespace Vocaluxe.Menu _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/A", navigator, ref Color.A); } - _ThemeLoaded &= CHelper.TryGetEnumValueFromXML(item + "/Type", navigator, ref _Type); + _ThemeLoaded &= CHelper.TryGetEnumValueFromXML(item + "/Type", navigator, ref _Type); _ThemeLoaded &= CHelper.TryGetFloatValueFromXML(item + "/Size", navigator, ref _Size); _ThemeLoaded &= CHelper.TryGetIntValueFromXML(item + "/MaxNumber", navigator, ref _MaxNumber); @@ -448,8 +448,8 @@ namespace Vocaluxe.Menu writer.WriteElementString("A", Color.A.ToString("#0.00")); } - writer.WriteComment(": Type of ParticleEffect: " + CHelper.ListStrings(Enum.GetNames(typeof(EType)))); - writer.WriteElementString("Type", Enum.GetName(typeof(EType), _Type)); + writer.WriteComment(": Type of ParticleEffect: " + CHelper.ListStrings(Enum.GetNames(typeof(EParticleType)))); + writer.WriteElementString("Type", Enum.GetName(typeof(EParticleType), _Type)); writer.WriteComment(": Size of particle"); writer.WriteElementString("Size", _Size.ToString("#0.00")); writer.WriteComment(": Max number of drawn particles"); @@ -490,7 +490,7 @@ namespace Vocaluxe.Menu switch (_Type) { - case EParticeType.Twinkle: + case EParticleType.Twinkle: size = _Base.Game.GetRandom((int)_Size / 2) + _Size / 2; lifetime = _Base.Game.GetRandom(500) / 1000f + 0.5f; vx = -_Base.Game.GetRandom(10000) / 50f + 100f; @@ -499,7 +499,7 @@ namespace Vocaluxe.Menu vsize = lifetime * 2f; break; - case EParticeType.Star: + case EParticleType.Star: size = _Base.Game.GetRandom((int)_Size / 2) + _Size / 2; lifetime = _Base.Game.GetRandom(1000) / 500f + 0.2f; vx = -_Base.Game.GetRandom(1000) / 50f + 10f; @@ -508,7 +508,7 @@ namespace Vocaluxe.Menu vsize = lifetime * 2f; break; - case EParticeType.Snow: + case EParticleType.Snow: size = _Base.Game.GetRandom((int)_Size / 2) + _Size / 2; lifetime = _Base.Game.GetRandom(5000) / 50f + 10f; vx = -_Base.Game.GetRandom(1000) / 50f + 10f; @@ -520,7 +520,7 @@ namespace Vocaluxe.Menu DoSpawn = false; break; - case EParticeType.Flare: + case EParticleType.Flare: size = _Base.Game.GetRandom((int)_Size / 2) + _Size / 2; lifetime = _Base.Game.GetRandom(500) / 1000f + 0.1f; vx = -_Base.Game.GetRandom(2000) / 50f; @@ -529,7 +529,7 @@ namespace Vocaluxe.Menu vsize = lifetime * 2f; break; - case EParticeType.PerfNoteStar: + case EParticleType.PerfNoteStar: size = _Base.Game.GetRandom((int)_Size / 2) + _Size / 2; lifetime = _Base.Game.GetRandom(1000) / 500f + 1.2f; vx = 0f; @@ -570,7 +570,7 @@ namespace Vocaluxe.Menu _Stars.Add(star); } - if (_Type == EParticeType.Flare || _Type == EParticeType.PerfNoteStar || _Type == EParticeType.Twinkle) + if (_Type == EParticleType.Flare || _Type == EParticleType.PerfNoteStar || _Type == EParticleType.Twinkle) _NextSpawnTime = -1f; int i = 0; diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs index 0b67e5ed..53ab9c39 100644 --- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs +++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs @@ -615,7 +615,7 @@ namespace Vocaluxe.Menu.SingNotes ); int numstars = (int)(r.W * 0.25f); - CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, numstars, new SColorF(1f, 1f, 0f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Star); + CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, numstars, new SColorF(1f, 1f, 0f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticleType.Star); _PlayerNotes[n].GoldenStars.Add(stars); } } @@ -643,7 +643,7 @@ namespace Vocaluxe.Menu.SingNotes Rect.Z ); - CParticleEffect flares = new CParticleEffect(_Base, _PartyModeID, 15, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticeType.Flare); + CParticleEffect flares = new CParticleEffect(_Base, _PartyModeID, 15, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinGoldenStarName, 20, EParticleType.Flare); _PlayerNotes[n].Flares.Add(flares); } @@ -683,13 +683,13 @@ namespace Vocaluxe.Menu.SingNotes Rect.Z ); - CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, _Base.Game.GetRandom(2) + 1, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinPerfectNoteStarName, 35, EParticeType.PerfNoteStar); + CParticleEffect stars = new CParticleEffect(_Base, _PartyModeID, _Base.Game.GetRandom(2) + 1, new SColorF(1f, 1f, 1f, 1f), r, _Theme.SkinPerfectNoteStarName, 35, EParticleType.PerfNoteStar); _PlayerNotes[n].PerfectNoteEffect.Add(stars); } private void AddPerfectLine(int n) { - CParticleEffect twinkle = new CParticleEffect(_Base, _PartyModeID, 200, _PlayerNotes[n].Color, _PlayerNotes[n].Rect, _Theme.SkinGoldenStarName, 25, EParticeType.Twinkle); + CParticleEffect twinkle = new CParticleEffect(_Base, _PartyModeID, 200, _PlayerNotes[n].Color, _PlayerNotes[n].Rect, _Theme.SkinGoldenStarName, 25, EParticleType.Twinkle); _PlayerNotes[n].PerfectLineTwinkle.Add(twinkle); }