Merge branch 'master' of https://github.com/Aurora-RGB/Aurora

Author: Aytackydln

Project-Aurora/Project-Aurora/Settings/Layers/BreathingLayerHandler.cs

@@ -1,13 +1,11 @@
-using Aurora.EffectsEngine;
-using Aurora.Profiles;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Controls;
+using Aurora.EffectsEngine;
+using Aurora.Profiles;
+using Aurora.Settings.Overrides;
+using Aurora.Utils;
+using Newtonsoft.Json;
 
 namespace Aurora.Settings.Layers
 {
@@ -16,38 +14,40 @@ public class BreathingLayerHandlerProperties : LayerHandlerProperties2Color<Brea
         public bool? _RandomPrimaryColor { get; set; }
 
         [JsonIgnore]
-        public bool RandomPrimaryColor { get { return Logic._RandomPrimaryColor ?? _RandomPrimaryColor ?? false; } }
+        public bool RandomPrimaryColor => Logic._RandomPrimaryColor ?? _RandomPrimaryColor ?? false;
 
         public bool? _RandomSecondaryColor { get; set; }
 
         [JsonIgnore]
-        public bool RandomSecondaryColor { get { return Logic._RandomSecondaryColor ?? _RandomSecondaryColor ?? false; } }
+        public bool RandomSecondaryColor => Logic._RandomSecondaryColor ?? _RandomSecondaryColor ?? false;
 
-        [Overrides.LogicOverridable("Effect Speed")]
+        [LogicOverridable("Effect Speed")]
         public float? _EffectSpeed { get; set; }
 
         [JsonIgnore]
-        public float EffectSpeed { get { return Logic._EffectSpeed ?? _EffectSpeed ?? 0.0f; } }
+        public float EffectSpeed => Logic._EffectSpeed ?? _EffectSpeed ?? 0.0f;
 
-        public BreathingLayerHandlerProperties() : base() { }
+        public BreathingLayerHandlerProperties()
+        { }
 
         public BreathingLayerHandlerProperties(bool assign_default = false) : base(assign_default) { }
 
         public override void Default()
         {
             base.Default();
-            this._RandomPrimaryColor = false;
-            this._RandomSecondaryColor = false;
-            this._EffectSpeed = 1.0f;
+            _RandomPrimaryColor = false;
+            _RandomSecondaryColor = false;
+            _EffectSpeed = 1.0f;
         }
     }
 
     public class BreathingLayerHandler : LayerHandler<BreathingLayerHandlerProperties>
     {
-        private float current_sine = 0.0f;
+        EffectLayer breathing_layer = new("Breathing Layer");
+        private float _currentSine;
 
-        private Color current_primary_color = Color.Transparent;
-        private Color current_secondary_color = Color.Transparent;
+        private Color _currentPrimaryColor = Color.Transparent;
+        private Color _currentSecondaryColor = Color.Transparent;
 
         protected override UserControl CreateControl()
         {
@@ -56,20 +56,19 @@ protected override UserControl CreateControl()
 
         public override EffectLayer Render(IGameState gamestate)
         {
-            current_sine = (float)Math.Pow(Math.Sin((double)((Utils.Time.GetMillisecondsSinceEpoch() % 10000L) / 10000.0f) * 2 * Math.PI * Properties.EffectSpeed), 2);
+            _currentSine = (float)Math.Pow(Math.Sin((double)((Time.GetMillisecondsSinceEpoch() % 10000L) / 10000.0f) * 2 * Math.PI * Properties.EffectSpeed), 2);
 
-            if (current_sine <= 0.0025f * Properties.EffectSpeed && Properties.RandomSecondaryColor)
-                current_secondary_color = Utils.ColorUtils.GenerateRandomColor();
+            if (_currentSine <= 0.0025f * Properties.EffectSpeed && Properties.RandomSecondaryColor)
+                _currentSecondaryColor = ColorUtils.GenerateRandomColor();
             else if(!Properties.RandomSecondaryColor)
-                current_secondary_color = Properties.SecondaryColor;
+                _currentSecondaryColor = Properties.SecondaryColor;
 
-            if (current_sine >= 1.0f - (0.0025f * Properties.EffectSpeed) && Properties.RandomPrimaryColor)
-                current_primary_color = Utils.ColorUtils.GenerateRandomColor();
+            if (_currentSine >= 1.0f - (0.0025f * Properties.EffectSpeed) && Properties.RandomPrimaryColor)
+                _currentPrimaryColor = ColorUtils.GenerateRandomColor();
             else if (!Properties.RandomPrimaryColor)
-                current_primary_color = Properties.PrimaryColor;
+                _currentPrimaryColor = Properties.PrimaryColor;
 
-            EffectLayer breathing_layer = new EffectLayer();
-            breathing_layer.Set(Properties.Sequence, Utils.ColorUtils.BlendColors(current_primary_color, current_secondary_color, current_sine));
+            breathing_layer.Set(Properties.Sequence, ColorUtils.BlendColors(_currentPrimaryColor, _currentSecondaryColor, _currentSine));
 
             return breathing_layer;
         }