Layers - Seperated activation and removal of layers/effects

Effects - Added effects UI, order is still a bit messed up and reordering is missed
Effects - Added renaming of effects on the layer

src/Artemis.Core/Models/Profile/Folder.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
-using Artemis.Core.Models.Profile.LayerShapes;
+using Artemis.Core.Plugins.LayerEffect.Abstract;
 using Artemis.Storage.Entities.Profile;
 using SkiaSharp;
 
@@ -8,6 +10,8 @@ namespace Artemis.Core.Models.Profile
 {
     public sealed class Folder : ProfileElement
     {
+        private readonly List<BaseLayerEffect> _layerEffects;
+
         public Folder(Profile profile, ProfileElement parent, string name)
         {
             FolderEntity = new FolderEntity();
@@ -16,6 +20,7 @@ namespace Artemis.Core.Models.Profile
             Profile = profile;
             Parent = parent;
             Name = name;
+            _layerEffects = new List<BaseLayerEffect>();
         }
 
         internal Folder(Profile profile, ProfileElement parent, FolderEntity folderEntity)
@@ -27,6 +32,7 @@ namespace Artemis.Core.Models.Profile
             Parent = parent;
             Name = folderEntity.Name;
             Order = folderEntity.Order;
+            _layerEffects = new List<BaseLayerEffect>();
 
             // TODO: Load conditions
 
@@ -45,6 +51,11 @@ namespace Artemis.Core.Models.Profile
 
         internal FolderEntity FolderEntity { get; set; }
 
+        /// <summary>
+        ///     Gets a read-only collection of the layer effects on this layer
+        /// </summary>
+        public ReadOnlyCollection<BaseLayerEffect> LayerEffects => _layerEffects.AsReadOnly();
+
         public override void Update(double deltaTime)
         {
             // Iterate the children in reverse because that's how they must be rendered too

src/Artemis.Core/Models/Profile/Layer.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using Artemis.Core.Annotations;
 using Artemis.Core.Extensions;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
@@ -23,6 +24,7 @@ namespace Artemis.Core.Models.Profile
     public sealed class Layer : ProfileElement
     {
         private readonly List<string> _expandedPropertyGroups;
+        private readonly List<BaseLayerEffect> _layerEffects;
         private LayerShape _layerShape;
         private List<ArtemisLed> _leds;
         private SKPath _path;
@@ -38,6 +40,7 @@ namespace Artemis.Core.Models.Profile
             General = new LayerGeneralProperties {IsCorePropertyGroup = true};
             Transform = new LayerTransformProperties {IsCorePropertyGroup = true};
 
+            _layerEffects = new List<BaseLayerEffect>();
             _leds = new List<ArtemisLed>();
             _expandedPropertyGroups = new List<string>();
 
@@ -56,6 +59,7 @@ namespace Artemis.Core.Models.Profile
             General = new LayerGeneralProperties {IsCorePropertyGroup = true};
             Transform = new LayerTransformProperties {IsCorePropertyGroup = true};
 
+            _layerEffects = new List<BaseLayerEffect>();
             _leds = new List<ArtemisLed>();
             _expandedPropertyGroups = new List<string>();
             _expandedPropertyGroups.AddRange(layerEntity.ExpandedPropertyGroups);
@@ -65,6 +69,11 @@ namespace Artemis.Core.Models.Profile
 
         internal LayerEntity LayerEntity { get; set; }
 
+        /// <summary>
+        ///     Gets a read-only collection of the layer effects on this layer
+        /// </summary>
+        public ReadOnlyCollection<BaseLayerEffect> LayerEffects => _layerEffects.AsReadOnly();
+
         /// <summary>
         ///     A collection of all the LEDs this layer is assigned to.
         /// </summary>
@@ -116,11 +125,6 @@ namespace Artemis.Core.Models.Profile
         /// </summary>
         public BaseLayerBrush LayerBrush { get; internal set; }
 
-        /// <summary>
-        ///     The layer effect that will apply pre- and/or post-processing to the layer
-        /// </summary>
-        public BaseLayerEffect LayerEffect { get; set; }
-
         public override string ToString()
         {
             return $"[Layer] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
@@ -155,7 +159,22 @@ namespace Artemis.Core.Models.Profile
             General.ApplyToEntity();
             Transform.ApplyToEntity();
             LayerBrush?.BaseProperties.ApplyToEntity();
-            LayerEffect?.BaseProperties.ApplyToEntity();
+
+            // Effects
+            LayerEntity.LayerEffects.Clear();
+            foreach (var layerEffect in LayerEffects)
+            {
+                var layerEffectEntity = new LayerEffectEntity()
+                {
+                    PluginGuid = layerEffect.PluginInfo.Guid,
+                    EffectType = layerEffect.GetType().Name,
+                    Name = layerEffect.Name,
+                    HasBeenRenamed = layerEffect.HasBeenRenamed,
+                    Order = layerEffect.Order
+                };
+                LayerEntity.LayerEffects.Add(layerEffectEntity);
+                layerEffect.BaseProperties.ApplyToEntity();
+            }
 
             // LEDs
             LayerEntity.Leds.Clear();
@@ -226,18 +245,21 @@ namespace Artemis.Core.Models.Profile
                 General.Override(TimeSpan.Zero);
                 Transform.Override(TimeSpan.Zero);
                 LayerBrush.BaseProperties.Override(TimeSpan.Zero);
-                LayerEffect?.BaseProperties?.Override(TimeSpan.Zero);
+                foreach (var baseLayerEffect in LayerEffects)
+                    baseLayerEffect.BaseProperties?.Override(TimeSpan.Zero);
             }
             else
             {
                 General.Update(deltaTime);
                 Transform.Update(deltaTime);
                 LayerBrush.BaseProperties.Update(deltaTime);
-                LayerEffect?.BaseProperties?.Update(deltaTime);
+                foreach (var baseLayerEffect in LayerEffects)
+                    baseLayerEffect.BaseProperties?.Update(deltaTime);
             }
 
             LayerBrush.Update(deltaTime);
-            LayerEffect?.Update(deltaTime);
+            foreach (var baseLayerEffect in LayerEffects)
+                baseLayerEffect.Update(deltaTime);
         }
 
         public void OverrideProgress(TimeSpan timeOverride)
@@ -245,7 +267,8 @@ namespace Artemis.Core.Models.Profile
             General.Override(timeOverride);
             Transform.Override(timeOverride);
             LayerBrush?.BaseProperties?.Override(timeOverride);
-            LayerEffect?.BaseProperties?.Override(timeOverride);
+            foreach (var baseLayerEffect in LayerEffects)
+                baseLayerEffect.BaseProperties?.Override(timeOverride);
         }
 
         /// <inheritdoc />
@@ -266,7 +289,8 @@ namespace Artemis.Core.Models.Profile
                 paint.BlendMode = General.BlendMode.CurrentValue;
                 paint.Color = new SKColor(0, 0, 0, (byte) (Transform.Opacity.CurrentValue * 2.55f));
 
-                LayerEffect?.PreProcess(canvas, canvasInfo, Path, paint);
+                foreach (var baseLayerEffect in LayerEffects)
+                    baseLayerEffect.PreProcess(canvas, canvasInfo, Path, paint);
 
                 if (!LayerBrush.SupportsTransformation)
                     SimpleRender(canvas, canvasInfo, paint);
@@ -275,7 +299,8 @@ namespace Artemis.Core.Models.Profile
                 else if (General.FillType.CurrentValue == LayerFillType.Clip)
                     ClipRender(canvas, canvasInfo, paint);
 
-                LayerEffect?.PostProcess(canvas, canvasInfo, Path, paint);
+                foreach (var baseLayerEffect in LayerEffects)
+                    baseLayerEffect.PostProcess(canvas, canvasInfo, Path, paint);
             }
 
             canvas.Restore();
@@ -382,6 +407,10 @@ namespace Artemis.Core.Models.Profile
 
         #endregion
 
+        #region Effect management
+
+        #endregion
+
         #region LED management
 
         /// <summary>
@@ -423,36 +452,6 @@ namespace Artemis.Core.Models.Profile
             CalculateRenderProperties();
         }
 
-        internal void Deactivate()
-        {
-            DeactivateLayerBrush();
-            DeactivateLayerEffect();
-        }
-
-        internal void DeactivateLayerBrush()
-        {
-            if (LayerBrush == null)
-                return;
-
-            var brush = LayerBrush;
-            LayerBrush = null;
-            brush.Dispose();
-
-            LayerEntity.PropertyEntities.RemoveAll(p => p.PluginGuid == brush.PluginInfo.Guid && p.Path.StartsWith("LayerBrush."));
-        }
-
-        internal void DeactivateLayerEffect()
-        {
-            if (LayerEffect == null)
-                return;
-
-            var effect = LayerEffect;
-            LayerEffect = null;
-            effect.Dispose();
-
-            LayerEntity.PropertyEntities.RemoveAll(p => p.PluginGuid == effect.PluginInfo.Guid && p.Path.StartsWith("LayerEffect."));
-        }
-
         internal void PopulateLeds(ArtemisSurface surface)
         {
             var leds = new List<ArtemisLed>();
@@ -473,12 +472,80 @@ namespace Artemis.Core.Models.Profile
 
         #endregion
 
+        #region Activation
+
+        internal void Deactivate()
+        {
+            DeactivateLayerBrush();
+            var layerEffects = new List<BaseLayerEffect>(LayerEffects);
+            foreach (var baseLayerEffect in layerEffects)
+                DeactivateLayerEffect(baseLayerEffect);
+        }
+
+        private void DeactivateLayerBrush()
+        {
+            if (LayerBrush == null)
+                return;
+
+            var brush = LayerBrush;
+            LayerBrush = null;
+            brush.Dispose();
+        }
+
+        private void DeactivateLayerEffect([NotNull] BaseLayerEffect effect)
+        {
+            if (effect == null) throw new ArgumentNullException(nameof(effect));
+
+            // Remove the effect from the layer and dispose it
+            _layerEffects.Remove(effect);
+            effect.Dispose();
+        }
+
+        internal void RemoveLayerBrush()
+        {
+            if (LayerBrush == null)
+                return;
+            
+            var brush = LayerBrush;
+            DeactivateLayerBrush();
+            LayerEntity.PropertyEntities.RemoveAll(p => p.PluginGuid == brush.PluginInfo.Guid && p.Path.StartsWith("LayerBrush."));
+        }
+
+        internal void RemoveLayerEffect([NotNull] BaseLayerEffect effect)
+        {
+            if (effect == null) throw new ArgumentNullException(nameof(effect));
+
+            DeactivateLayerEffect(effect);
+
+            // Clean up properties
+            LayerEntity.PropertyEntities.RemoveAll(p => p.PluginGuid == effect.PluginInfo.Guid && p.Path.StartsWith(effect.PropertyRootPath));
+
+            // Update the order on the remaining effects
+            var index = 0;
+            foreach (var baseLayerEffect in LayerEffects.OrderBy(e => e.Order))
+            {
+                baseLayerEffect.UpdateOrder(index + 1);
+                index++;
+            }
+
+            OnLayerEffectsUpdated();
+        }
+
+        internal void AddLayerEffect([NotNull] BaseLayerEffect effect)
+        {
+            if (effect == null) throw new ArgumentNullException(nameof(effect));
+            _layerEffects.Add(effect);
+            OnLayerEffectsUpdated();
+        }
+
+        #endregion
+
         #region Events
 
         public event EventHandler RenderPropertiesUpdated;
         public event EventHandler ShapePropertiesUpdated;
         public event EventHandler LayerBrushUpdated;
-        public event EventHandler LayerEffectUpdated;
+        public event EventHandler LayerEffectsUpdated;
 
         private void OnRenderPropertiesUpdated()
         {
@@ -495,9 +562,9 @@ namespace Artemis.Core.Models.Profile
             LayerBrushUpdated?.Invoke(this, EventArgs.Empty);
         }
 
-        internal void OnLayerEffectUpdated()
+        internal void OnLayerEffectsUpdated()
         {
-            LayerEffectUpdated?.Invoke(this, EventArgs.Empty);
+            LayerEffectsUpdated?.Invoke(this, EventArgs.Empty);
         }
 
         #endregion

src/Artemis.Core/Models/Profile/LayerEffectReference.cs

@@ -1,21 +0,0 @@
-using System;
-using Artemis.Core.Plugins.LayerEffect;
-
-namespace Artemis.Core.Models.Profile
-{
-    /// <summary>
-    ///     A reference to a <see cref="LayerEffectDescriptor" />
-    /// </summary>
-    public class LayerEffectReference
-    {
-        /// <summary>
-        ///     The GUID of the plugin the effect descriptor resides in
-        /// </summary>
-        public Guid EffectPluginGuid { get; set; }
-
-        /// <summary>
-        ///     The full type name of the effect descriptor
-        /// </summary>
-        public string EffectType { get; set; }
-    }
-}

src/Artemis.Core/Models/Profile/LayerGeneralProperties.cs

@@ -17,10 +17,7 @@ namespace Artemis.Core.Models.Profile
 
         [PropertyDescription(Name = "Brush type", Description = "The type of brush to use for this layer")]
         public LayerBrushReferenceLayerProperty BrushReference { get; set; }
-
-        [PropertyDescription(Name = "Effect type", Description = "The type of effect to use for this layer")]
-        public LayerEffectReferenceLayerProperty EffectReference { get; set; }
-
+        
         protected override void PopulateDefaults()
         {
             ShapeType.DefaultValue = LayerShapeType.Rectangle;

src/Artemis.Core/Models/Profile/LayerProperties/Types/LayerEffectReferenceLayerProperty.cs

@@ -1,22 +0,0 @@
-using Artemis.Core.Exceptions;
-
-namespace Artemis.Core.Models.Profile.LayerProperties.Types
-{
-    /// <summary>
-    /// A special layer property used to configure the selected layer effect
-    /// </summary>
-    public class LayerEffectReferenceLayerProperty : LayerProperty<LayerEffectReference>
-    {
-        internal LayerEffectReferenceLayerProperty()
-        {
-            KeyframesSupported = false;
-        }
-
-        protected override void UpdateCurrentValue(float keyframeProgress, float keyframeProgressEased)
-        {
-            throw new ArtemisCoreException("Layer effect references do not support keyframes.");
-        }
-
-        public static implicit operator LayerEffectReference(LayerEffectReferenceLayerProperty p) => p.CurrentValue;
-    }
-}

src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs

@@ -233,7 +233,14 @@ namespace Artemis.Core.Models.Profile
 
         private void InitializeProperty(Layer layer, string path, BaseLayerProperty instance)
         {
-            var pluginGuid = IsCorePropertyGroup || instance.IsCoreProperty ? Constants.CorePluginInfo.Guid : layer.LayerBrush.PluginInfo.Guid;
+            Guid pluginGuid;
+            if (IsCorePropertyGroup || instance.IsCoreProperty)
+                pluginGuid = Constants.CorePluginInfo.Guid;
+            else if (instance.Parent.LayerBrush != null)
+                pluginGuid = instance.Parent.LayerBrush.PluginInfo.Guid;
+            else
+                pluginGuid = instance.Parent.LayerEffect.PluginInfo.Guid;
+
             var entity = layer.LayerEntity.PropertyEntities.FirstOrDefault(p => p.PluginGuid == pluginGuid && p.Path == path);
             var fromStorage = true;
             if (entity == null)
@@ -273,5 +280,20 @@ namespace Artemis.Core.Models.Profile
         }
 
         #endregion
+
+        public void UpdateOrder(int oldOrder)
+        {
+            // Expanded state is tied to the path so save it before changing the path
+            var expanded = Layer.IsPropertyGroupExpanded(this);
+            Layer.SetPropertyGroupExpanded(this, false);
+
+            Path = Path.Replace($"LayerEffect.{oldOrder}.", $"LayerEffect.{LayerEffect.Order}.");
+            // Restore the expanded state with the new path
+            Layer.SetPropertyGroupExpanded(this, expanded);
+
+            // Update children
+            foreach (var layerPropertyGroup in LayerPropertyGroups)
+                layerPropertyGroup.UpdateOrder(oldOrder);
+        }
     }
 }