fix memory leak on unoptimized layers

Author: Aytackydln

Project-Aurora/Project-Aurora/EffectsEngine/EffectLayer.cs

@@ -3,9 +3,11 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
+using System.Windows;
 using Aurora.Devices;
 using Aurora.Settings;
 using Aurora.Utils;
+using Point = System.Drawing.Point;
 
 namespace Aurora.EffectsEngine
 {
@@ -14,8 +16,8 @@ namespace Aurora.EffectsEngine
     /// </summary>
     public class EffectLayer : IDisposable
     {
-        private static readonly Lazy<EffectLayer> _emptyLayerFactory = new();
-        public static EffectLayer EmptyLayer => _emptyLayerFactory.Value;
+        private static readonly Lazy<EffectLayer> EmptyLayerFactory = new();
+        public static EffectLayer EmptyLayer => EmptyLayerFactory.Value;
 
         private readonly string _name;
         private Bitmap _colormap;
@@ -46,7 +48,6 @@ internal TextureBrush TextureBrush
 
                 return _textureBrush;
             }
-            
         }
 
         private Color _peripheral;
@@ -66,7 +67,7 @@ public EffectLayer()
         {
             _name = "Unknown Layer";
             _colormap = new Bitmap(Effects.CanvasWidth, Effects.CanvasHeight);
-            Effects.CanvasChanged += Invalidate;
+            WeakEventManager<Effects, CanvasChangedArgs>.AddHandler(null, "CanvasChanged", InvalidateColorMap);
             _textureBrush = new TextureBrush(_colormap);
             Dimension = new Rectangle(0, 0, _colormap.Width, _colormap.Height);
             _peripheral = Color.Empty;
@@ -84,10 +85,9 @@ public EffectLayer(EffectLayer anotherLayer)
             var graphicsUnit = anotherLayer.GetGraphics().PageUnit;
             var rectangleF = anotherLayer._colormap.GetBounds(ref graphicsUnit);
             _colormap = anotherLayer._colormap.Clone(rectangleF, anotherLayer._colormap.PixelFormat);
-            Effects.CanvasChanged += Invalidate;
+            WeakEventManager<Effects, CanvasChangedArgs>.AddHandler(null, "CanvasChanged", InvalidateColorMap);
             _textureBrush = new TextureBrush(_colormap);
             Dimension = new Rectangle(0, 0, _colormap.Width, _colormap.Height);
-            Graphics.FromImage(_colormap);
             _peripheral = anotherLayer._peripheral;
 
             _needsRender = anotherLayer._needsRender;
@@ -101,10 +101,9 @@ public EffectLayer(string name)
         {
             _name = name;
             _colormap = new Bitmap(Effects.CanvasWidth, Effects.CanvasHeight);
-            Effects.CanvasChanged += Invalidate;
+            WeakEventManager<Effects, CanvasChangedArgs>.AddHandler(null, "CanvasChanged", InvalidateColorMap);
             _textureBrush = new TextureBrush(_colormap);
             Dimension = new Rectangle(0, 0, _colormap.Width, _colormap.Height);
-            Graphics.FromImage(_colormap);
             _peripheral = Color.Empty;
 
             FillOver(Color.FromArgb(0, 1, 1, 1));
@@ -119,10 +118,9 @@ public EffectLayer(string name, Color color)
         {
             _name = name;
             _colormap = new Bitmap(Effects.CanvasWidth, Effects.CanvasHeight);
-            Effects.CanvasChanged += Invalidate;
+            WeakEventManager<Effects, CanvasChangedArgs>.AddHandler(null, "CanvasChanged", InvalidateColorMap);
             _textureBrush = new TextureBrush(_colormap);
             Dimension = new Rectangle(0, 0, _colormap.Width, _colormap.Height);
-            Graphics.FromImage(_colormap);
             _peripheral = color;
 
             FillOver(color);
@@ -140,10 +138,9 @@ public EffectLayer(string name, Color color)
         {
             _name = name;
             _colormap = new Bitmap(Effects.CanvasWidth, Effects.CanvasHeight);
-            Effects.CanvasChanged += Invalidate;
+            WeakEventManager<Effects, CanvasChangedArgs>.AddHandler(null, "CanvasChanged", InvalidateColorMap);
             _textureBrush = new TextureBrush(_colormap);
             Dimension = new Rectangle(0, 0, _colormap.Width, _colormap.Height);
-            Graphics.FromImage(_colormap);
             _peripheral = new Color();
             Brush brush;
             var shift = 0.0f;
@@ -342,7 +339,7 @@ public void Dispose()
             _textureBrush.Dispose();
             _textureBrush = null;
             _colormap.Dispose();
-            Effects.CanvasChanged -= Invalidate;
+            WeakEventManager<Effects, CanvasChangedArgs>.RemoveHandler(null, "CanvasChanged", InvalidateColorMap);
         }
 
         /// <summary>
@@ -789,7 +786,7 @@ public void Add(EffectLayer other)
         }
 
         private KeySequenceType _previousSequenceType;
-        
+
         /// <summary>
         /// Draws a percent effect on the layer bitmap using a KeySequence with solid colors.
         /// </summary>
@@ -1053,9 +1050,9 @@ private void Invalidate()
             _needsRender = true;
             _keyColors.Clear();
         }
-        private void Invalidate(object sender, object args)
+        private void InvalidateColorMap(object sender, EventArgs args)
         {
-            _colormap.Dispose();
+            _colormap?.Dispose();
             _colormap = new Bitmap(Effects.CanvasWidth, Effects.CanvasHeight);
             Dimension.Height = Effects.CanvasHeight;
             Dimension.Width = Effects.CanvasWidth;

Project-Aurora/Project-Aurora/EffectsEngine/Effects.cs

@@ -2,10 +2,13 @@
 using System.Collections;
 using Aurora.EffectsEngine;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using Aurora.Devices;
 using System.Drawing;
 using System.Timers;
+using System.Windows;
+using Aurora.Profiles;
 
 namespace Aurora
 {
@@ -90,7 +93,7 @@ public override int GetHashCode()
 
     public delegate void NewLayerRendered(Bitmap bitmap);
 
-    public class CanvasChangedArgs
+    public class CanvasChangedArgs: EventArgs
     {
         public EffectLayer EffectLayer { get; }
 
@@ -194,6 +197,7 @@ public class Effects
         private Bitmap _forcedFrame;
 
         public event NewLayerRendered NewLayerRender = delegate { };
+        public static event EventHandler<CanvasChangedArgs> CanvasChanged;
 
         private static int _canvasWidth = 1;
         public static int CanvasWidth
@@ -227,10 +231,6 @@ private set
         public static float EditorToCanvasHeight => CanvasHeight / grid_height;
         public static int CanvasBiggest => CanvasWidth > CanvasHeight ? CanvasWidth : CanvasHeight;
 
-        public static event SampleEventHandler CanvasChanged;
-
-        public delegate void SampleEventHandler(object sender, CanvasChangedArgs e);
-
         /// <summary>
         /// Creates a new FreeFormObject that perfectly occupies the entire canvas.
         /// </summary>

Project-Aurora/Project-Aurora/Profiles/Generic_Application/Event_GenericApplication.cs

@@ -42,12 +42,5 @@ public override void UpdateLights(EffectFrame frame)
 
             frame.AddLayers(layers.ToArray());
         }
-
-        public void UpdateLights(EffectFrame frame, Application profile)
-        {
-            this.Application = profile;
-
-            UpdateLights(frame);
-        }
     }
 }

Project-Aurora/Project-Aurora/Profiles/LightingStateManager.cs

@@ -427,7 +427,6 @@ private void UpdateIdleEffects(EffectsEngine.EffectFrame newFrame)
 
         private void UpdateEvent(ILightEvent @event, EffectsEngine.EffectFrame frame)
         {
-            Stopwatch stopwatch = new Stopwatch();
             StartEvent(@event);
             @event.UpdateLights(frame);
         }

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

@@ -209,7 +209,7 @@ public LayerHandler()
 
         public virtual EffectLayer Render(IGameState gamestate)
         {
-            throw new NotImplementedException();
+            return EffectLayer.EmptyLayer;
         }
 
         public virtual void SetGameState(IGameState gamestate)