From 63cb6d211eb106b551b2fed2a2606d259cd3322a Mon Sep 17 00:00:00 2001
From: SpoinkyNL <mail@rbeekman.nl>
Date: Thu, 18 Jun 2020 22:35:04 +0200
Subject: [PATCH] Filter effects - Moved all to post processing

---
 .../Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs     | 5 ++---
 .../Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs   | 3 ---
 .../Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs    | 8 ++++----
 .../ErodeEffectProperties.cs                              | 1 -
 .../Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs     | 1 -
 .../GrayScaleEffect.cs                                    | 8 ++++----
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs
index eeea51b60..100844314 100644
--- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs
+++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/BlurEffect.cs
@@ -6,9 +6,9 @@ namespace Artemis.Plugins.LayerEffects.Filter
 {
     public class BlurEffect : LayerEffect<BlurEffectProperties>
     {
-        private double _lastWidth;
-        private double _lastHeight;
         private SKImageFilter _imageFilter;
+        private double _lastHeight;
+        private double _lastWidth;
 
         public override void EnableLayerEffect()
         {
@@ -39,7 +39,6 @@ namespace Artemis.Plugins.LayerEffects.Filter
 
         public override void PreProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
         {
-          
         }
 
         public override void PostProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs
index 70c392d44..5acfd32f7 100644
--- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs
+++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/DilateEffect.cs
@@ -19,9 +19,6 @@ namespace Artemis.Plugins.LayerEffects.Filter
 
         public override void PreProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
         {
-            var visualizationPath = new SKPath();
-            visualizationPath.AddOval(SKRect.Create(0, 0, renderBounds.Bounds.Width / 2, renderBounds.Bounds.Height / 2));
-            canvas.ClipPath(visualizationPath);
         }
 
         public override void PostProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs
index d671639a2..8a7dc4edf 100644
--- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs
+++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffect.cs
@@ -18,6 +18,10 @@ namespace Artemis.Plugins.LayerEffects.Filter
         }
 
         public override void PreProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
+        {
+        }
+
+        public override void PostProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
         {
             paint.ImageFilter = SKImageFilter.CreateErode(
                 (int) Properties.ErodeRadius.CurrentValue.Width,
@@ -25,9 +29,5 @@ namespace Artemis.Plugins.LayerEffects.Filter
                 paint.ImageFilter
             );
         }
-
-        public override void PostProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
-        {
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffectProperties.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffectProperties.cs
index 84fad6aff..7ac09e4a7 100644
--- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffectProperties.cs
+++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/ErodeEffectProperties.cs
@@ -1,7 +1,6 @@
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
 using Artemis.Core.Models.Profile.LayerProperties.Types;
-using SkiaSharp;
 
 namespace Artemis.Plugins.LayerEffects.Filter
 {
diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs
index 214c390db..ca2308bda 100644
--- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs
+++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GlowEffect.cs
@@ -19,7 +19,6 @@ namespace Artemis.Plugins.LayerEffects.Filter
 
         public override void PreProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
         {
-            
         }
 
         public override void PostProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
diff --git a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs
index 44cd83b26..fe0274023 100644
--- a/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs
+++ b/src/Plugins/Artemis.Plugins.LayerEffects.Filter/GrayScaleEffect.cs
@@ -18,6 +18,10 @@ namespace Artemis.Plugins.LayerEffects.Filter
         }
 
         public override void PreProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
+        {
+        }
+
+        public override void PostProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
         {
             paint.ImageFilter = SKImageFilter.CreateColorFilter(SKColorFilter.CreateColorMatrix(new[]
             {
@@ -27,9 +31,5 @@ namespace Artemis.Plugins.LayerEffects.Filter
                 0, 0, 0, 1, 0
             }), paint.ImageFilter);
         }
-
-        public override void PostProcess(SKCanvas canvas, SKImageInfo canvasInfo, SKPath renderBounds, SKPaint paint)
-        {
-        }
     }
 }
\ No newline at end of file