Merge branch 'development'

src/Artemis.Core/Models/Profile/Conditions/Abstract/DataModelConditionPart.cs

@@ -13,6 +13,11 @@ namespace Artemis.Core
     {
         private readonly List<DataModelConditionPart> _children = new();
 
+        protected DataModelConditionPart()
+        {
+            Children = new(_children);
+        }
+
         /// <summary>
         ///     Gets the parent of this part
         /// </summary>
@@ -21,7 +26,7 @@ namespace Artemis.Core
         /// <summary>
         ///     Gets the children of this part
         /// </summary>
-        public ReadOnlyCollection<DataModelConditionPart> Children => _children.AsReadOnly();
+        public ReadOnlyCollection<DataModelConditionPart> Children { get; }
 
         /// <summary>
         ///     Adds a child to the display condition part's <see cref="Children" /> collection

src/Artemis.Core/Models/Profile/DataBindings/Modes/Conditional/ConditionalDataBinding.cs

@@ -18,13 +18,14 @@ namespace Artemis.Core
         {
             DataBinding = dataBinding;
             Entity = entity;
+            Conditions = new(_conditions);
             Load();
         }
 
         /// <summary>
         ///     Gets a list of conditions applied to this data binding
         /// </summary>
-        public ReadOnlyCollection<DataBindingCondition<TLayerProperty, TProperty>> Conditions => _conditions.AsReadOnly();
+        public ReadOnlyCollection<DataBindingCondition<TLayerProperty, TProperty>> Conditions { get; }
 
         internal ConditionalDataBindingEntity Entity { get; }
 

src/Artemis.Core/Models/Profile/DataBindings/Modes/DirectDataBinding.cs

@@ -17,7 +17,7 @@ namespace Artemis.Core
         {
             DataBinding = dataBinding;
             Entity = entity;
-
+            Modifiers = new(_modifiers);
             Load();
         }
 
@@ -29,7 +29,7 @@ namespace Artemis.Core
         /// <summary>
         ///     Gets a list of modifiers applied to this data binding
         /// </summary>
-        public ReadOnlyCollection<DataBindingModifier<TLayerProperty, TProperty>> Modifiers => _modifiers.AsReadOnly();
+        public ReadOnlyCollection<DataBindingModifier<TLayerProperty, TProperty>> Modifiers { get; }
 
         internal DirectDataBindingEntity Entity { get; }
 

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

@@ -306,7 +306,7 @@ namespace Artemis.Core
                 ChildrenList.Add(new Layer(Profile, this, childLayer));
 
             // Ensure order integrity, should be unnecessary but no one is perfect specially me
-            ChildrenList = ChildrenList.OrderBy(c => c.Order).ToList();
+            ChildrenList.Sort((a,b) => a.Order.CompareTo(b.Order));
             for (int index = 0; index < ChildrenList.Count; index++)
                 ChildrenList[index].Order = index + 1;
 

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

@@ -43,6 +43,7 @@ namespace Artemis.Core
             _transform = new LayerTransformProperties();
 
             _leds = new List<ArtemisLed>();
+            Leds = new ReadOnlyCollection<ArtemisLed>(_leds);
 
             Adapter = new LayerAdapter(this);
             Initialize();
@@ -67,6 +68,7 @@ namespace Artemis.Core
             _transform = new LayerTransformProperties();
 
             _leds = new List<ArtemisLed>();
+            Leds = new ReadOnlyCollection<ArtemisLed>(_leds);
 
             Adapter = new LayerAdapter(this);
             Load();
@@ -76,7 +78,7 @@ namespace Artemis.Core
         /// <summary>
         ///     A collection of all the LEDs this layer is assigned to.
         /// </summary>
-        public ReadOnlyCollection<ArtemisLed> Leds => _leds.AsReadOnly();
+        public ReadOnlyCollection<ArtemisLed> Leds { get; private set; }
 
         /// <summary>
         ///     Defines the shape that is rendered by the <see cref="LayerBrush" />.
@@ -679,6 +681,7 @@ namespace Artemis.Core
             }
 
             _leds = leds;
+            Leds = new ReadOnlyCollection<ArtemisLed>(_leds);
             CalculateRenderProperties();
         }
 

src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs

@@ -44,6 +44,7 @@ namespace Artemis.Core
                 _baseValue = default!;
 
             _keyframes = new List<LayerPropertyKeyframe<T>>();
+            Keyframes = new(_keyframes);
         }
 
         /// <summary>
@@ -337,7 +338,7 @@ namespace Artemis.Core
         #region Keyframes
 
         private bool _keyframesEnabled;
-        private List<LayerPropertyKeyframe<T>> _keyframes;
+        private readonly List<LayerPropertyKeyframe<T>> _keyframes;
 
         /// <summary>
         ///     Gets whether keyframes are supported on this type of property
@@ -363,7 +364,7 @@ namespace Artemis.Core
         /// <summary>
         ///     Gets a read-only list of all the keyframes on this layer property
         /// </summary>
-        public ReadOnlyCollection<LayerPropertyKeyframe<T>> Keyframes => _keyframes.AsReadOnly();
+        public ReadOnlyCollection<LayerPropertyKeyframe<T>> Keyframes { get; }
 
         /// <summary>
         ///     Gets the current keyframe in the timeline according to the current progress
@@ -436,7 +437,7 @@ namespace Artemis.Core
         /// </summary>
         internal void SortKeyframes()
         {
-            _keyframes = _keyframes.OrderBy(k => k.Position).ToList();
+            _keyframes.Sort((a, b) => a.Position.CompareTo(b.Position));
         }
 
         private void UpdateKeyframes(Timeline timeline)

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

@@ -37,6 +37,9 @@ namespace Artemis.Core
 
             _layerProperties = new List<ILayerProperty>();
             _layerPropertyGroups = new List<LayerPropertyGroup>();
+
+            LayerProperties = new(_layerProperties);
+            LayerPropertyGroups = new(_layerPropertyGroups);
         }
 
         /// <summary>
@@ -96,12 +99,12 @@ namespace Artemis.Core
         /// <summary>
         ///     A list of all layer properties in this group
         /// </summary>
-        public ReadOnlyCollection<ILayerProperty> LayerProperties => _layerProperties.AsReadOnly();
+        public ReadOnlyCollection<ILayerProperty> LayerProperties { get; }
 
         /// <summary>
         ///     A list of al child groups in this group
         /// </summary>
-        public ReadOnlyCollection<LayerPropertyGroup> LayerPropertyGroups => _layerPropertyGroups.AsReadOnly();
+        public ReadOnlyCollection<LayerPropertyGroup> LayerPropertyGroups { get; }
 
         /// <summary>
         ///     Recursively gets all layer properties on this group and any subgroups

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

@@ -24,12 +24,15 @@ namespace Artemis.Core
         {
             _name = name;
             Entity = new ProfileCategoryEntity();
+            ProfileConfigurations = new(_profileConfigurations);
         }
 
         internal ProfileCategory(ProfileCategoryEntity entity)
         {
             _name = null!;
             Entity = entity;
+            ProfileConfigurations = new(_profileConfigurations);
+
             Load();
         }
 
@@ -73,7 +76,7 @@ namespace Artemis.Core
         /// <summary>
         ///     Gets a read only collection of the profiles inside this category
         /// </summary>
-        public ReadOnlyCollection<ProfileConfiguration> ProfileConfigurations => _profileConfigurations.AsReadOnly();
+        public ReadOnlyCollection<ProfileConfiguration> ProfileConfigurations { get; }
 
         /// <summary>
         ///     Gets the unique ID of this category

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

@@ -18,12 +18,13 @@ namespace Artemis.Core
         private Profile _profile;
         private bool _suspended;
 
-        internal List<ProfileElement> ChildrenList;
+        internal readonly List<ProfileElement> ChildrenList;
 
         internal ProfileElement(Profile profile)
         {
             _profile = profile;
             ChildrenList = new List<ProfileElement>();
+            Children = new(ChildrenList);
         }
 
         /// <summary>
@@ -56,16 +57,7 @@ namespace Artemis.Core
         /// <summary>
         ///     The element's children
         /// </summary>
-        public ReadOnlyCollection<ProfileElement> Children
+        public ReadOnlyCollection<ProfileElement> Children { get; }
-        {
-            get
-            {
-                lock (ChildrenList)
-                {
-                    return ChildrenList.AsReadOnly();
-                }
-            }
-        }
 
         /// <summary>
         ///     The order in which this element appears in the update loop and editor

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

@@ -24,6 +24,7 @@ namespace Artemis.Core
             Timeline = new Timeline();
             ExpandedPropertyGroups = new List<string>();
             LayerEffectsList = new List<BaseLayerEffect>();
+            LayerEffects = new(LayerEffectsList);
 
             LayerEffectStore.LayerEffectAdded += LayerEffectStoreOnLayerEffectAdded;
             LayerEffectStore.LayerEffectRemoved += LayerEffectStoreOnLayerEffectRemoved;
@@ -223,12 +224,12 @@ namespace Artemis.Core
 
         #region Effect management
 
-        internal List<BaseLayerEffect> LayerEffectsList;
+        internal readonly List<BaseLayerEffect> LayerEffectsList;
 
         /// <summary>
         ///     Gets a read-only collection of the layer effects on this entity
         /// </summary>
-        public ReadOnlyCollection<BaseLayerEffect> LayerEffects => LayerEffectsList.AsReadOnly();
+        public ReadOnlyCollection<BaseLayerEffect> LayerEffects { get; }
 
         /// <summary>
         ///     Adds a the layer effect described inthe provided <paramref name="descriptor" />

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

@@ -24,6 +24,7 @@ namespace Artemis.Core
             MainSegmentLength = TimeSpan.FromSeconds(5);
 
             _extraTimelines = new List<Timeline>();
+            ExtraTimelines = new(_extraTimelines);
 
             Save();
         }
@@ -32,6 +33,7 @@ namespace Artemis.Core
         {
             Entity = entity;
             _extraTimelines = new List<Timeline>();
+            ExtraTimelines = new(_extraTimelines);
 
             Load();
         }
@@ -45,6 +47,7 @@ namespace Artemis.Core
             EndSegmentLength = Parent.EndSegmentLength;
 
             _extraTimelines = new List<Timeline>();
+            ExtraTimelines = new(_extraTimelines);
         }
 
         /// <inheritdoc />
@@ -150,7 +153,7 @@ namespace Artemis.Core
         /// <summary>
         ///     Gets a list of extra copies of the timeline applied to this timeline
         /// </summary>
-        public ReadOnlyCollection<Timeline> ExtraTimelines => _extraTimelines.AsReadOnly();
+        public ReadOnlyCollection<Timeline> ExtraTimelines { get; }
 
         /// <summary>
         ///     Gets a boolean indicating whether the timeline has finished its run

src/Artemis.Core/Models/Surface/ArtemisLed.cs

@@ -59,8 +59,18 @@ namespace Artemis.Core
 
         internal void CalculateRectangles()
         {
-            Rectangle = RgbLed.Boundary.ToSKRect();
+            Rectangle = Utilities.CreateScaleCompatibleRect(
-            AbsoluteRectangle = RgbLed.AbsoluteBoundary.ToSKRect();
+                RgbLed.Boundary.Location.X,
+                RgbLed.Boundary.Location.Y,
+                RgbLed.Boundary.Size.Width,
+                RgbLed.Boundary.Size.Height
+            );
+            AbsoluteRectangle = Utilities.CreateScaleCompatibleRect(
+                RgbLed.AbsoluteBoundary.Location.X,
+                RgbLed.AbsoluteBoundary.Location.Y,
+                RgbLed.AbsoluteBoundary.Size.Width,
+                RgbLed.AbsoluteBoundary.Size.Height
+            );
         }
     }
 }

src/Artemis.Core/Plugins/LayerBrushes/LayerBrushProvider.cs

@@ -17,13 +17,14 @@ namespace Artemis.Core.LayerBrushes
         protected LayerBrushProvider()
         {
             _layerBrushDescriptors = new List<LayerBrushDescriptor>();
+            LayerBrushDescriptors = new(_layerBrushDescriptors);
             Disabled += OnDisabled;
         }
 
         /// <summary>
         ///     A read-only collection of all layer brushes added with <see cref="RegisterLayerBrushDescriptor{T}" />
         /// </summary>
-        public ReadOnlyCollection<LayerBrushDescriptor> LayerBrushDescriptors => _layerBrushDescriptors.AsReadOnly();
+        public ReadOnlyCollection<LayerBrushDescriptor> LayerBrushDescriptors { get; }
 
         /// <summary>
         ///     Registers a layer brush descriptor for a given layer brush, so that it appears in the UI.

src/Artemis.Core/Plugins/LayerEffects/LayerEffectProvider.cs

@@ -18,13 +18,14 @@ namespace Artemis.Core.LayerEffects
         protected LayerEffectProvider()
         {
             _layerEffectDescriptors = new List<LayerEffectDescriptor>();
+            LayerEffectDescriptors = new(_layerEffectDescriptors);
             Disabled += OnDisabled;
         }
 
         /// <summary>
         ///     A read-only collection of all layer effects added with <see cref="RegisterLayerEffectDescriptor{T}" />
         /// </summary>
-        public ReadOnlyCollection<LayerEffectDescriptor> LayerEffectDescriptors => _layerEffectDescriptors.AsReadOnly();
+        public ReadOnlyCollection<LayerEffectDescriptor> LayerEffectDescriptors { get; }
 
         /// <summary>
         ///     Adds a layer effect descriptor for a given layer effect, so that it appears in the UI.

src/Artemis.Core/Plugins/Modules/DataModel.cs

@@ -26,6 +26,9 @@ namespace Artemis.Core.Modules
             // These are both set right after construction to keep the constructor of inherited classes clean
             Module = null!;
             DataModelDescription = null!;
+
+            ActivePaths = new(_activePaths);
+            DynamicChildren = new(_dynamicChildren);
         }
 
         /// <summary>
@@ -52,13 +55,13 @@ namespace Artemis.Core.Modules
         ///     Gets an read-only dictionary of all dynamic children
         /// </summary>
         [DataModelIgnore]
-        public ReadOnlyDictionary<string, DynamicChild> DynamicChildren => new(_dynamicChildren);
+        public ReadOnlyDictionary<string, DynamicChild> DynamicChildren { get; }
 
         /// <summary>
         ///     Gets a read-only list of <see cref="DataModelPath" />s targeting this data model
         /// </summary>
         [DataModelIgnore]
-        public ReadOnlyCollection<DataModelPath> ActivePaths => _activePaths.AsReadOnly();
+        public ReadOnlyCollection<DataModelPath> ActivePaths { get; }
 
         /// <summary>
         ///     Returns a read-only collection of all properties in this datamodel that are to be ignored

src/Artemis.Core/Plugins/Modules/Module.cs

@@ -114,6 +114,12 @@ namespace Artemis.Core.Modules
         private readonly List<(DefaultCategoryName, string)> _defaultProfilePaths = new();
         private readonly List<(DefaultCategoryName, string)> _pendingDefaultProfilePaths = new();
 
+        protected Module()
+        {
+            DefaultProfilePaths = new ReadOnlyCollection<(DefaultCategoryName, string)>(_defaultProfilePaths);
+            HiddenProperties = new(HiddenPropertiesList);
+        }
+
         /// <summary>
         ///     Gets a list of all properties ignored at runtime using <c>IgnoreProperty(x => x.y)</c>
         /// </summary>
@@ -122,7 +128,7 @@ namespace Artemis.Core.Modules
         /// <summary>
         ///     Gets a read only collection of default profile paths
         /// </summary>
-        public IReadOnlyCollection<(DefaultCategoryName, string)> DefaultProfilePaths => _defaultProfilePaths.AsReadOnly();
+        public IReadOnlyCollection<(DefaultCategoryName, string)> DefaultProfilePaths { get; }
 
         /// <summary>
         ///     A list of activation requirements
@@ -176,7 +182,7 @@ namespace Artemis.Core.Modules
         /// <summary>
         ///     Gets a list of all properties ignored at runtime using <c>IgnoreProperty(x => x.y)</c>
         /// </summary>
-        public ReadOnlyCollection<PropertyInfo> HiddenProperties => HiddenPropertiesList.AsReadOnly();
+        public ReadOnlyCollection<PropertyInfo> HiddenProperties { get; }
 
         internal DataModel? InternalDataModel { get; set; }
 

src/Artemis.Core/Plugins/Plugin.cs

@@ -30,6 +30,9 @@ namespace Artemis.Core
 
             _features = new List<PluginFeatureInfo>();
             _profilers = new List<Profiler>();
+
+            Features = new(_features);
+            Profilers = new(_profilers);
         }
 
         /// <summary>
@@ -64,12 +67,12 @@ namespace Artemis.Core
         /// <summary>
         ///     Gets a read-only collection of all features this plugin provides
         /// </summary>
-        public ReadOnlyCollection<PluginFeatureInfo> Features => _features.AsReadOnly();
+        public ReadOnlyCollection<PluginFeatureInfo> Features { get; }
 
         /// <summary>
         ///     Gets a read-only collection of profiles running on the plugin
         /// </summary>
-        public ReadOnlyCollection<Profiler> Profilers => _profilers.AsReadOnly();
+        public ReadOnlyCollection<Profiler> Profilers { get; }
 
         /// <summary>
         ///     The assembly the plugin code lives in

src/Artemis.Core/Plugins/ScriptingProviders/ScriptingProvider.cs

@@ -44,6 +44,11 @@ namespace Artemis.Core.ScriptingProviders
     /// </summary>
     public abstract class ScriptingProvider : PluginFeature
     {
+        protected ScriptingProvider()
+        {
+            Scripts = new(InternalScripts);
+        }
+
         /// <summary>
         ///     Gets the name of the scripting language this provider provides
         /// </summary>
@@ -52,7 +57,7 @@ namespace Artemis.Core.ScriptingProviders
         /// <summary>
         ///     Gets a list of all active scripts belonging to this scripting provider
         /// </summary>
-        public ReadOnlyCollection<Script> Scripts => InternalScripts.AsReadOnly();
+        public ReadOnlyCollection<Script> Scripts { get; }
 
         internal abstract Type GlobalScriptType { get; }
         internal abstract Type ProfileScriptType { get; }

src/Artemis.Core/RGB.NET/SKTexture.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using Artemis.Core.SkiaSharp;
 using RGB.NET.Core;
@@ -13,22 +14,36 @@ namespace Artemis.Core
     /// </summary>
     public sealed class SKTexture : PixelTexture<byte>, IDisposable
     {
-        private readonly bool _isScaledDown;
         private readonly SKPixmap _pixelData;
         private readonly IntPtr _pixelDataPtr;
+        private readonly Dictionary<Led, SKRectI> _ledRects;
 
         #region Constructors
 
-        internal SKTexture(IManagedGraphicsContext? graphicsContext, int width, int height, float scale) : base(width, height, DATA_PER_PIXEL, new AverageByteSampler())
+        internal SKTexture(IManagedGraphicsContext? graphicsContext, int width, int height, float scale, IReadOnlyCollection<ArtemisDevice> devices) : base(width, height, DATA_PER_PIXEL,
+            new AverageByteSampler())
         {
             ImageInfo = new SKImageInfo(width, height);
             Surface = graphicsContext == null
                 ? SKSurface.Create(ImageInfo)
                 : SKSurface.Create(graphicsContext.GraphicsContext, true, ImageInfo);
             RenderScale = scale;
-            _isScaledDown = Math.Abs(scale - 1) > 0.001;
             _pixelDataPtr = Marshal.AllocHGlobal(ImageInfo.BytesSize);
             _pixelData = new SKPixmap(ImageInfo, _pixelDataPtr, ImageInfo.RowBytes);
+
+            _ledRects = new Dictionary<Led, SKRectI>();
+            foreach (ArtemisDevice artemisDevice in devices)
+            {
+                foreach (ArtemisLed artemisLed in artemisDevice.Leds)
+                {
+                    _ledRects[artemisLed.RgbLed] = SKRectI.Create(
+                        (int) (artemisLed.AbsoluteRectangle.Left * RenderScale),
+                        (int) (artemisLed.AbsoluteRectangle.Top * RenderScale),
+                        (int) (artemisLed.AbsoluteRectangle.Width * RenderScale),
+                        (int) (artemisLed.AbsoluteRectangle.Height * RenderScale)
+                    );
+                }
+            }
         }
 
         #endregion
@@ -80,63 +95,11 @@ namespace Artemis.Core
         /// <inheritdoc />
         protected override Color GetColor(in ReadOnlySpan<byte> pixel)
         {
-            return new(pixel[2], pixel[1], pixel[0]);
+            return new Color(pixel[2], pixel[1], pixel[0]);
         }
 
         /// <inheritdoc />
-        public override Color this[in Rectangle rectangle]
+        public override Color this[in Rectangle rectangle] => Color.Transparent;
-        {
-            get
-            {
-                if (Data.Length == 0) return Color.Transparent;
-
-                SKRectI skRectI = CreatedFlooredRectI(
-                    Size.Width * rectangle.Location.X.Clamp(0, 1),
-                    Size.Height * rectangle.Location.Y.Clamp(0, 1),
-                    Size.Width * rectangle.Size.Width.Clamp(0, 1),
-                    Size.Height * rectangle.Size.Height.Clamp(0, 1)
-                );
-
-                if (skRectI.Width == 0 || skRectI.Height == 0) return Color.Transparent;
-                if (skRectI.Width == 1 && skRectI.Height == 1) return GetColor(GetPixelData(skRectI.Left, skRectI.Top));
-
-                int bufferSize = skRectI.Width * skRectI.Height * DATA_PER_PIXEL;
-                if (bufferSize <= STACK_ALLOC_LIMIT)
-                {
-                    Span<byte> buffer = stackalloc byte[bufferSize];
-                    GetRegionData(skRectI.Left, skRectI.Top, skRectI.Width, skRectI.Height, buffer);
-
-                    Span<byte> pixelData = stackalloc byte[DATA_PER_PIXEL];
-                    Sampler.Sample(new SamplerInfo<byte>(skRectI.Width, skRectI.Height, buffer), pixelData);
-
-                    return GetColor(pixelData);
-                }
-                else
-                {
-                    byte[] rent = ArrayPool<byte>.Shared.Rent(bufferSize);
-
-                    Span<byte> buffer = new Span<byte>(rent).Slice(0, bufferSize);
-                    GetRegionData(skRectI.Left, skRectI.Top, skRectI.Width, skRectI.Height, buffer);
-
-                    Span<byte> pixelData = stackalloc byte[DATA_PER_PIXEL];
-                    Sampler.Sample(new SamplerInfo<byte>(skRectI.Width, skRectI.Height, buffer), pixelData);
-
-                    ArrayPool<byte>.Shared.Return(rent);
-
-                    return GetColor(pixelData);
-                }
-            }
-        }
-
-        private static SKRectI CreatedFlooredRectI(float x, float y, float width, float height)
-        {
-            return new(
-                width <= 0.0 ? checked((int) Math.Floor(x)) : checked((int) Math.Ceiling(x)),
-                height <= 0.0 ? checked((int) Math.Floor(y)) : checked((int) Math.Ceiling(y)),
-                width >= 0.0 ? checked((int) Math.Floor(x + width)) : checked((int) Math.Ceiling(x + width)),
-                height >= 0.0 ? checked((int) Math.Floor(y + height)) : checked((int) Math.Ceiling(y + height))
-            );
-        }
 
         #endregion
 
@@ -169,5 +132,40 @@ namespace Artemis.Core
         public bool IsInvalid { get; private set; }
 
         #endregion
+
+        internal Color GetColorAtRenderTarget(in RenderTarget renderTarget)
+        {
+            if (Data.Length == 0) return Color.Transparent;
+            SKRectI skRectI = _ledRects[renderTarget.Led];
+
+            if (skRectI.Width <= 0 || skRectI.Height <= 0)
+                return Color.Transparent;
+
+            int bufferSize = skRectI.Width * skRectI.Height * DATA_PER_PIXEL;
+            if (bufferSize <= STACK_ALLOC_LIMIT)
+            {
+                Span<byte> buffer = stackalloc byte[bufferSize];
+                GetRegionData(skRectI.Left, skRectI.Top, skRectI.Width, skRectI.Height, buffer);
+
+                Span<byte> pixelData = stackalloc byte[DATA_PER_PIXEL];
+                Sampler.Sample(new SamplerInfo<byte>(skRectI.Width, skRectI.Height, buffer), pixelData);
+
+                return GetColor(pixelData);
+            }
+            else
+            {
+                byte[] rent = ArrayPool<byte>.Shared.Rent(bufferSize);
+
+                Span<byte> buffer = new Span<byte>(rent).Slice(0, bufferSize);
+                GetRegionData(skRectI.Left, skRectI.Top, skRectI.Width, skRectI.Height, buffer);
+
+                Span<byte> pixelData = stackalloc byte[DATA_PER_PIXEL];
+                Sampler.Sample(new SamplerInfo<byte>(skRectI.Width, skRectI.Height, buffer), pixelData);
+
+                ArrayPool<byte>.Shared.Return(rent);
+
+                return GetColor(pixelData);
+            }
+        }
     }
 }

src/Artemis.Core/RGB.NET/SKTextureBrush.cs

@@ -0,0 +1,44 @@
+using RGB.NET.Core;
+
+namespace Artemis.Core
+{
+    internal class SKTextureBrush : AbstractBrush
+    {
+        #region Properties & Fields
+
+        private SKTexture? _texture;
+        /// <summary>
+        /// Gets or sets the texture drawn by this brush.
+        /// </summary>
+        public SKTexture? Texture
+        {
+            get => _texture;
+            set => SetProperty(ref _texture, value);
+        }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TextureBrush" /> class.
+        /// </summary>
+        /// <param name="texture">The texture drawn by this brush.</param>
+        public SKTextureBrush(SKTexture? texture)
+        {
+            this.Texture = texture;
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <inheritdoc />
+        protected override Color GetColorAtPoint(in Rectangle rectangle, in RenderTarget renderTarget)
+        {
+            return Texture?.GetColorAtRenderTarget(renderTarget) ?? Color.Transparent;
+        }
+
+        #endregion
+    }
+}

src/Artemis.Core/Services/RgbService.cs

@@ -25,7 +25,7 @@ namespace Artemis.Core.Services
         private readonly IPluginManagementService _pluginManagementService;
         private readonly PluginSetting<double> _renderScaleSetting;
         private readonly PluginSetting<int> _targetFrameRateSetting;
-        private readonly TextureBrush _textureBrush = new(ITexture.Empty) {CalculationMode = RenderMode.Absolute};
+        private readonly SKTextureBrush _textureBrush = new(null) {CalculationMode = RenderMode.Absolute};
         private Dictionary<Led, ArtemisLed> _ledMap;
         private ListLedGroup? _surfaceLedGroup;
         private SKTexture? _texture;
@@ -36,9 +36,10 @@ namespace Artemis.Core.Services
             _pluginManagementService = pluginManagementService;
             _deviceRepository = deviceRepository;
             _targetFrameRateSetting = settingsService.GetSetting("Core.TargetFrameRate", 25);
-            _renderScaleSetting = settingsService.GetSetting("Core.RenderScale", 0.5);
+            _renderScaleSetting = settingsService.GetSetting("Core.RenderScale", 0.25);
 
             Surface = new RGBSurface();
+            Utilities.RenderScaleMultiplier = (int) (1 / _renderScaleSetting.Value);
 
             // Let's throw these for now
             Surface.Exception += SurfaceOnException;
@@ -49,10 +50,14 @@ namespace Artemis.Core.Services
             _devices = new List<ArtemisDevice>();
             _ledMap = new Dictionary<Led, ArtemisLed>();
 
+            EnabledDevices = new ReadOnlyCollection<ArtemisDevice>(_enabledDevices);
+            Devices = new ReadOnlyCollection<ArtemisDevice>(_devices);
+            LedMap = new ReadOnlyDictionary<Led, ArtemisLed>(_ledMap);
+
             UpdateTrigger = new TimerUpdateTrigger {UpdateFrequency = 1.0 / _targetFrameRateSetting.Value};
             SetRenderPaused(true);
             Surface.RegisterUpdateTrigger(UpdateTrigger);
-            
+
             Utilities.ShutdownRequested += UtilitiesOnShutdownRequested;
         }
 
@@ -85,10 +90,11 @@ namespace Artemis.Core.Services
             try
             {
                 _ledMap = new Dictionary<Led, ArtemisLed>(_devices.SelectMany(d => d.Leds).ToDictionary(l => l.RgbLed));
+                LedMap = new ReadOnlyDictionary<Led, ArtemisLed>(_ledMap);
 
                 if (_surfaceLedGroup == null)
                 {
-                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) { Brush = _textureBrush };
+                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) {Brush = _textureBrush};
                     OnLedsChanged();
                     return;
                 }
@@ -99,7 +105,7 @@ namespace Artemis.Core.Services
                     _surfaceLedGroup.Detach();
 
                     // Apply the application wide brush and decorator
-                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) { Brush = _textureBrush };
+                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) {Brush = _textureBrush};
                     OnLedsChanged();
                 }
             }
@@ -108,7 +114,6 @@ namespace Artemis.Core.Services
                 if (changedRenderPaused)
                     SetRenderPaused(false);
             }
-            
         }
 
         private void TargetFrameRateSettingOnSettingChanged(object? sender, EventArgs e)
@@ -129,12 +134,17 @@ namespace Artemis.Core.Services
 
         private void RenderScaleSettingOnSettingChanged(object? sender, EventArgs e)
         {
+            Utilities.RenderScaleMultiplier = (int) (1 / _renderScaleSetting.Value);
+            
             _texture?.Invalidate();
+            foreach (ArtemisDevice artemisDevice in Devices)
+                artemisDevice.CalculateRenderProperties();
+            OnLedsChanged();
         }
 
-        public IReadOnlyCollection<ArtemisDevice> EnabledDevices => _enabledDevices.AsReadOnly();
+        public IReadOnlyCollection<ArtemisDevice> EnabledDevices { get; }
-        public IReadOnlyCollection<ArtemisDevice> Devices => _devices.AsReadOnly();
+        public IReadOnlyCollection<ArtemisDevice> Devices { get; }
-        public IReadOnlyDictionary<Led, ArtemisLed> LedMap => new ReadOnlyDictionary<Led, ArtemisLed>(_ledMap);
+        public IReadOnlyDictionary<Led, ArtemisLed> LedMap { get; private set; }
 
         public RGBSurface Surface { get; set; }
         public bool IsRenderPaused { get; set; }
@@ -310,7 +320,7 @@ namespace Artemis.Core.Services
                 int height = Math.Max(1, MathF.Min(evenHeight * renderScale, 4096).RoundToInt());
 
                 _texture?.Dispose();
-                _texture = new SKTexture(graphicsContext, width, height, renderScale);
+                _texture = new SKTexture(graphicsContext, width, height, renderScale, Devices);
                 _textureBrush.Texture = _texture;
 
 

src/Artemis.Core/Services/ScriptingService.cs

@@ -24,6 +24,7 @@ namespace Artemis.Core.Services
             _profileService = profileService;
 
             InternalGlobalScripts = new List<GlobalScript>();
+            GlobalScripts = new(InternalGlobalScripts);
 
             _pluginManagementService.PluginFeatureEnabled += PluginManagementServiceOnPluginFeatureToggled;
             _pluginManagementService.PluginFeatureDisabled += PluginManagementServiceOnPluginFeatureToggled;
@@ -80,7 +81,7 @@ namespace Artemis.Core.Services
                 CreateScriptInstance(profile, scriptConfiguration);
         }
 
-        public ReadOnlyCollection<GlobalScript> GlobalScripts => InternalGlobalScripts.AsReadOnly();
+        public ReadOnlyCollection<GlobalScript> GlobalScripts { get; }
 
         public GlobalScript? CreateScriptInstance(ScriptConfiguration scriptConfiguration)
         {

src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using Artemis.Core.Modules;
+using Artemis.Core.Properties;
 using Artemis.Storage.Entities.Profile;
 using Artemis.Storage.Repositories.Interfaces;
 using Newtonsoft.Json;
@@ -42,8 +43,7 @@ namespace Artemis.Core.Services
             _profileCategoryRepository = profileCategoryRepository;
             _pluginManagementService = pluginManagementService;
             _profileRepository = profileRepository;
-            _profileCategories = new List<ProfileCategory>(_profileCategoryRepository.GetAll()
+            _profileCategories = new List<ProfileCategory>(_profileCategoryRepository.GetAll().Select(c => new ProfileCategory(c)).OrderBy(c => c.Order));
-                .Select(c => new ProfileCategory(c)).OrderBy(c => c.Order));
 
             _rgbService.LedsChanged += RgbServiceOnLedsChanged;
             _pluginManagementService.PluginFeatureEnabled += PluginManagementServiceOnPluginFeatureToggled;

src/Artemis.Core/Utilities/Utilities.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Security.AccessControl;
 using System.Security.Principal;
+using SkiaSharp;
 
 namespace Artemis.Core
 {
@@ -18,8 +19,8 @@ namespace Artemis.Core
         public static void PrepareFirstLaunch()
         {
             CreateAccessibleDirectory(Constants.DataFolder);
-            CreateAccessibleDirectory(Path.Combine(Constants.DataFolder ,"plugins"));
+            CreateAccessibleDirectory(Path.Combine(Constants.DataFolder, "plugins"));
-            CreateAccessibleDirectory(Path.Combine(Constants.DataFolder ,"user layouts"));
+            CreateAccessibleDirectory(Path.Combine(Constants.DataFolder, "user layouts"));
         }
 
         /// <summary>
@@ -102,6 +103,30 @@ namespace Artemis.Core
             RestartRequested?.Invoke(null, e);
         }
 
+        #region Scaling
+
+        internal static int RenderScaleMultiplier { get; set; } = 2;
+
+        internal static SKRectI CreateScaleCompatibleRect(float x, float y, float width, float height)
+        {
+            int roundX = (int) MathF.Floor(x);
+            int roundY = (int) MathF.Floor(y);
+            int roundWidth = (int) MathF.Ceiling(width);
+            int roundHeight = (int) MathF.Ceiling(height);
+
+            if (RenderScaleMultiplier == 1)
+                return SKRectI.Create(roundX, roundY, roundWidth, roundHeight);
+
+            return SKRectI.Create(
+                roundX - (roundX % RenderScaleMultiplier),
+                roundY - (roundY % RenderScaleMultiplier),
+                roundWidth - (roundWidth % RenderScaleMultiplier),
+                roundHeight - (roundHeight % RenderScaleMultiplier)
+            );
+        }
+
+        #endregion
+
         #region Events
 
         /// <summary>

src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -9,15 +11,15 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 using Artemis.Core;
-using Stylet;
 
 namespace Artemis.UI.Shared
 {
     /// <summary>
     ///     Visualizes an <see cref="ArtemisDevice" /> with optional per-LED colors
     /// </summary>
-    public class DeviceVisualizer : FrameworkElement, IDisposable
+    public class DeviceVisualizer : FrameworkElement
     {
         /// <summary>
         ///     The device to visualize
@@ -34,14 +36,16 @@ namespace Artemis.UI.Shared
         /// <summary>
         ///     A list of LEDs to highlight
         /// </summary>
-        public static readonly DependencyProperty HighlightedLedsProperty = DependencyProperty.Register(nameof(HighlightedLeds), typeof(IEnumerable<ArtemisLed>), typeof(DeviceVisualizer),
+        public static readonly DependencyProperty HighlightedLedsProperty = DependencyProperty.Register(nameof(HighlightedLeds), typeof(ObservableCollection<ArtemisLed>), typeof(DeviceVisualizer),
-            new FrameworkPropertyMetadata(default(IEnumerable<ArtemisLed>)));
+            new FrameworkPropertyMetadata(default(ObservableCollection<ArtemisLed>), HighlightedLedsPropertyChanged));
 
         private readonly DrawingGroup _backingStore;
         private readonly List<DeviceVisualizerLed> _deviceVisualizerLeds;
-        private readonly Timer _timer;
+        private readonly DispatcherTimer _timer;
         private BitmapImage? _deviceImage;
         private ArtemisDevice? _oldDevice;
+        private List<DeviceVisualizerLed> _highlightedLeds;
+        private List<DeviceVisualizerLed> _dimmedLeds;
 
         /// <summary>
         ///     Creates a new instance of the <see cref="DeviceVisualizer" /> class
@@ -50,9 +54,10 @@ namespace Artemis.UI.Shared
         {
             _backingStore = new DrawingGroup();
             _deviceVisualizerLeds = new List<DeviceVisualizerLed>();
+            _dimmedLeds = new List<DeviceVisualizerLed>();
 
             // Run an update timer at 25 fps
-            _timer = new Timer(40);
+            _timer = new DispatcherTimer(DispatcherPriority.Render) {Interval = TimeSpan.FromMilliseconds(40)};
 
             MouseLeftButtonUp += OnMouseLeftButtonUp;
             Loaded += OnLoaded;
@@ -80,9 +85,9 @@ namespace Artemis.UI.Shared
         /// <summary>
         ///     Gets or sets a list of LEDs to highlight
         /// </summary>
-        public IEnumerable<ArtemisLed>? HighlightedLeds
+        public ObservableCollection<ArtemisLed>? HighlightedLeds
         {
-            get => (IEnumerable<ArtemisLed>) GetValue(HighlightedLedsProperty);
+            get => (ObservableCollection<ArtemisLed>) GetValue(HighlightedLedsProperty);
             set => SetValue(HighlightedLedsProperty, value);
         }
 
@@ -158,10 +163,9 @@ namespace Artemis.UI.Shared
         protected virtual void Dispose(bool disposing)
         {
             if (disposing)
-                _timer.Dispose();
+                _timer.Stop();
         }
 
-
         private static Size ResizeKeepAspect(Size src, double maxWidth, double maxHeight)
         {
             double scale;
@@ -191,8 +195,10 @@ namespace Artemis.UI.Shared
         private void OnUnloaded(object? sender, RoutedEventArgs e)
         {
             _timer.Stop();
-            _timer.Elapsed -= TimerOnTick;
+            _timer.Tick -= TimerOnTick;
 
+            if (HighlightedLeds != null)
+                HighlightedLeds.CollectionChanged -= HighlightedLedsChanged;
             if (_oldDevice != null)
             {
                 if (Device != null)
@@ -223,16 +229,34 @@ namespace Artemis.UI.Shared
         private void OnLoaded(object? sender, RoutedEventArgs e)
         {
             _timer.Start();
-            _timer.Elapsed += TimerOnTick;
+            _timer.Tick += TimerOnTick;
         }
 
         private void TimerOnTick(object? sender, EventArgs e)
         {
-            Execute.PostToUIThread(() =>
+            if (ShowColors && Visibility == Visibility.Visible)
+                Render();
+        }
+
+        private void Render()
+        {
+            DrawingContext drawingContext = _backingStore.Append();
+
+            if (_highlightedLeds.Any())
             {
-                if (ShowColors && Visibility == Visibility.Visible)
+                foreach (DeviceVisualizerLed deviceVisualizerLed in _highlightedLeds)
-                    Render();
+                    deviceVisualizerLed.RenderColor(_backingStore, drawingContext, false);
-            });
+
+                foreach (DeviceVisualizerLed deviceVisualizerLed in _dimmedLeds)
+                    deviceVisualizerLed.RenderColor(_backingStore, drawingContext, true);
+            }
+            else
+            {
+                foreach (DeviceVisualizerLed deviceVisualizerLed in _deviceVisualizerLeds)
+                    deviceVisualizerLed.RenderColor(_backingStore, drawingContext, false);
+            }
+
+            drawingContext.Close();
         }
 
         private void UpdateTransform()
@@ -241,22 +265,12 @@ namespace Artemis.UI.Shared
             InvalidateMeasure();
         }
 
-        private static void DevicePropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            DeviceVisualizer deviceVisualizer = (DeviceVisualizer) d;
-            deviceVisualizer.Dispatcher.Invoke(() => { deviceVisualizer.SetupForDevice(); });
-        }
-
-        private static void ShowColorsPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            DeviceVisualizer deviceVisualizer = (DeviceVisualizer) d;
-            deviceVisualizer.Dispatcher.Invoke(() => { deviceVisualizer.SetupForDevice(); });
-        }
-
         private void SetupForDevice()
         {
             _deviceImage = null;
             _deviceVisualizerLeds.Clear();
+            _highlightedLeds = new List<DeviceVisualizerLed>();
+            _dimmedLeds = new List<DeviceVisualizerLed>();
 
             if (Device == null)
                 return;
@@ -319,40 +333,47 @@ namespace Artemis.UI.Shared
 
         private void DeviceUpdated(object? sender, EventArgs e)
         {
-            Execute.PostToUIThread(SetupForDevice);
+            Dispatcher.Invoke(SetupForDevice);
         }
 
         private void DevicePropertyChanged(object? sender, PropertyChangedEventArgs e)
         {
-            Execute.PostToUIThread(SetupForDevice);
+            Dispatcher.Invoke(SetupForDevice);
         }
 
-        private void Render()
+        private static void DevicePropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            DrawingContext drawingContext = _backingStore.Append();
+            DeviceVisualizer deviceVisualizer = (DeviceVisualizer) d;
+            deviceVisualizer.Dispatcher.Invoke(() => { deviceVisualizer.SetupForDevice(); });
+        }
 
-            if (HighlightedLeds != null && HighlightedLeds.Any())
+        private static void ShowColorsPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            DeviceVisualizer deviceVisualizer = (DeviceVisualizer) d;
+            deviceVisualizer.Dispatcher.Invoke(() => { deviceVisualizer.SetupForDevice(); });
+        }
+
+        private static void HighlightedLedsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            DeviceVisualizer deviceVisualizer = (DeviceVisualizer) d;
+            if (e.OldValue is ObservableCollection<ArtemisLed> oldCollection)
+                oldCollection.CollectionChanged -= deviceVisualizer.HighlightedLedsChanged;
+            if (e.NewValue is ObservableCollection<ArtemisLed> newCollection)
+                newCollection.CollectionChanged += deviceVisualizer.HighlightedLedsChanged;
+        }
+
+        private void HighlightedLedsChanged(object? sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
+        {
+            if (HighlightedLeds != null)
             {
-                // Faster on large devices, maybe a bit slower on smaller ones but that's ok
+                _highlightedLeds = _deviceVisualizerLeds.Where(l => HighlightedLeds.Contains(l.Led)).ToList();
-                ILookup<ArtemisLed, ArtemisLed> toHighlight = HighlightedLeds.ToLookup(l => l);
+                _dimmedLeds = _deviceVisualizerLeds.Where(l => !HighlightedLeds.Contains(l.Led)).ToList();
-                foreach (DeviceVisualizerLed deviceVisualizerLed in _deviceVisualizerLeds)
-                    deviceVisualizerLed.RenderColor(_backingStore, drawingContext, !toHighlight.Contains(deviceVisualizerLed.Led));
             }
             else
             {
-                foreach (DeviceVisualizerLed deviceVisualizerLed in _deviceVisualizerLeds)
+                _highlightedLeds = new List<DeviceVisualizerLed>();
-                    deviceVisualizerLed.RenderColor(_backingStore, drawingContext, false);
+                _dimmedLeds = new List<DeviceVisualizerLed>();
             }
-
-            drawingContext.Close();
-        }
-
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
         }
     }
 }

src/Artemis.UI.Shared/Services/DataModelUIService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Artemis.Core;
 using Artemis.Core.Modules;
@@ -26,10 +27,13 @@ namespace Artemis.UI.Shared.Services
             _kernel = kernel;
             _registeredDataModelEditors = new List<DataModelVisualizationRegistration>();
             _registeredDataModelDisplays = new List<DataModelVisualizationRegistration>();
+
+            RegisteredDataModelEditors = new ReadOnlyCollection<DataModelVisualizationRegistration>(_registeredDataModelEditors);
+            RegisteredDataModelDisplays = new ReadOnlyCollection<DataModelVisualizationRegistration>(_registeredDataModelDisplays);
         }
 
-        public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelEditors => _registeredDataModelEditors.AsReadOnly();
+        public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelEditors { get; }
-        public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelDisplays => _registeredDataModelDisplays.AsReadOnly();
+        public IReadOnlyCollection<DataModelVisualizationRegistration> RegisteredDataModelDisplays { get; }
 
         public DataModelPropertiesViewModel GetMainDataModelVisualization()
         {

src/Artemis.UI.Shared/Services/ProfileEditorService.cs

@@ -12,7 +12,6 @@ using Ninject.Parameters;
 using Serilog;
 using SkiaSharp;
 using SkiaSharp.Views.WPF;
-using Stylet;
 
 namespace Artemis.UI.Shared.Services
 {
@@ -39,15 +38,19 @@ namespace Artemis.UI.Shared.Services
             _rgbService = rgbService;
             _moduleService = moduleService;
             _registeredPropertyEditors = new List<PropertyInputRegistration>();
+
+            RegisteredPropertyEditors = new(_registeredPropertyEditors);
             coreService.FrameRendered += CoreServiceOnFrameRendered;
             PixelsPerSecond = 100;
         }
 
         private void CoreServiceOnFrameRendered(object? sender, FrameRenderedEventArgs e)
         {
-            if (!_doTick) return;
+            if (!_doTick)
+                return;
             _doTick = false;
-            Execute.PostToUIThread(OnProfilePreviewUpdated);
+
+            OnProfilePreviewUpdated();
         }
 
         private void ReloadProfile()
@@ -103,7 +106,7 @@ namespace Artemis.UI.Shared.Services
             }
         }
 
-        public ReadOnlyCollection<PropertyInputRegistration> RegisteredPropertyEditors => _registeredPropertyEditors.AsReadOnly();
+        public ReadOnlyCollection<PropertyInputRegistration> RegisteredPropertyEditors { get; }
 
         public bool Playing { get; set; }
 
@@ -144,6 +147,7 @@ namespace Artemis.UI.Shared.Services
             {
                 if (_currentTime.Equals(value)) return;
                 _currentTime = value;
+
                 Tick();
                 OnCurrentTimeChanged();
             }

src/Artemis.UI.Shared/Utilities/HitTestUtilities.cs

@@ -25,7 +25,8 @@ namespace Artemis.UI.Shared
             HitTestResultBehavior ResultCallback(HitTestResult r) => HitTestResultBehavior.Continue;
             HitTestFilterBehavior FilterCallback(DependencyObject e)
             {
-                if (e is FrameworkElement fe && fe.DataContext is T context && !result.Contains(context)) result.Add(context);
+                if (e is FrameworkElement fe && fe.DataContext is T context && !result.Contains(context))
+                    result.Add(context);
                 return HitTestFilterBehavior.Continue;
             }
 

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs

@@ -583,30 +583,28 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
                 return;
             }
 
-            Execute.PostToUIThread(() =>
+            TimeSpan newTime = ProfileEditorService.CurrentTime.Add(TimeSpan.FromSeconds(e.DeltaTime));
+            if (SelectedProfileElement != null)
             {
-                TimeSpan newTime = ProfileEditorService.CurrentTime.Add(TimeSpan.FromSeconds(e.DeltaTime));
+                if (Repeating && RepeatTimeline)
-                if (SelectedProfileElement != null)
                 {
-                    if (Repeating && RepeatTimeline)
+                    if (newTime > SelectedProfileElement.Timeline.Length)
-                    {
+                        newTime = TimeSpan.Zero;
-                        if (newTime > SelectedProfileElement.Timeline.Length)
-                            newTime = TimeSpan.Zero;
-                    }
-                    else if (Repeating && RepeatSegment)
-                    {
-                        if (newTime > GetCurrentSegmentEnd())
-                            newTime = GetCurrentSegmentStart();
-                    }
-                    else if (newTime > SelectedProfileElement.Timeline.Length)
-                    {
-                        newTime = SelectedProfileElement.Timeline.Length;
-                        Pause();
-                    }
                 }
+                else if (Repeating && RepeatSegment)
+                {
+                    if (newTime > GetCurrentSegmentEnd())
+                        newTime = GetCurrentSegmentStart();
+                }
+                else if (newTime > SelectedProfileElement.Timeline.Length)
+                {
+                    newTime = SelectedProfileElement.Timeline.Length;
+                    Pause();
+                }
+            }
 
-                ProfileEditorService.CurrentTime = newTime;
+            // Update current time on high priority to keep things buttery smooth as if you're using the mouse ༼ つ ◕_◕ ༽つ
-            });
+            Execute.OnUIThreadSync(() => ProfileEditorService.CurrentTime = newTime);
         }
 
         #endregion

src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileLayerViewModel.cs

@@ -8,6 +8,8 @@ using Artemis.UI.Extensions;
 using Artemis.UI.Screens.Shared;
 using Artemis.UI.Services;
 using Artemis.UI.Shared.Services;
+using SkiaSharp;
+using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
@@ -95,6 +97,16 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             CreateViewportRectangle();
         }
 
+        #region Updating
+
+        private LayerShape _lastShape;
+        private Rect _lastBounds;
+
+        private SKPoint _lastAnchor;
+        private SKPoint _lastPosition;
+        private double _lastRotation;
+        private SKSize _lastScale;
+
         private void CreateShapeGeometry()
         {
             if (Layer.LayerShape == null || !Layer.Leds.Any())
@@ -104,21 +116,22 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             }
 
             Rect bounds = _layerEditorService.GetLayerBounds(Layer);
-            Geometry shapeGeometry = Geometry.Empty;
+
-            switch (Layer.LayerShape)
+            // Only bother the UI thread for both of these if we're sure
+            if (HasShapeChanged(bounds))
             {
-                case EllipseShape _:
+                Execute.OnUIThreadSync(() =>
-                    shapeGeometry = new EllipseGeometry(bounds);
+                {
-                    break;
+                    if (Layer.LayerShape is RectangleShape)
-                case RectangleShape _:
+                        ShapeGeometry = new RectangleGeometry(bounds);
-                    shapeGeometry = new RectangleGeometry(bounds);
+                    if (Layer.LayerShape is EllipseShape)
-                    break;
+                        ShapeGeometry = new EllipseGeometry(bounds);
+                });
+            }
+            if ((Layer.LayerBrush == null || Layer.LayerBrush.SupportsTransformation) && HasTransformationChanged())
+            {
+                Execute.OnUIThreadSync(() => ShapeGeometry.Transform = _layerEditorService.GetLayerTransformGroup(Layer));
             }
-
-            if (Layer.LayerBrush == null || Layer.LayerBrush.SupportsTransformation)
-                shapeGeometry.Transform = _layerEditorService.GetLayerTransformGroup(Layer);
-
-            ShapeGeometry = shapeGeometry;
         }
 
         private void CreateViewportRectangle()
@@ -132,44 +145,30 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             ViewportRectangle = _layerEditorService.GetLayerBounds(Layer);
         }
 
-        private Geometry CreateRectangleGeometry(ArtemisLed led)
+        private bool HasShapeChanged(Rect bounds)
         {
-            Rect rect = led.RgbLed.AbsoluteBoundary.ToWindowsRect(1);
+            bool result = !Equals(_lastBounds, bounds) || !Equals(_lastShape, Layer.LayerShape);
-            return new RectangleGeometry(rect);
+            _lastShape = Layer.LayerShape;
+            _lastBounds = bounds;
+            return result;
         }
 
-        private Geometry CreateCircleGeometry(ArtemisLed led)
+        private bool HasTransformationChanged()
         {
-            Rect rect = led.RgbLed.AbsoluteBoundary.ToWindowsRect(1);
+            bool result = _lastAnchor != Layer.Transform.AnchorPoint.CurrentValue ||
-            return new EllipseGeometry(rect);
+                          _lastPosition != Layer.Transform.Position.CurrentValue ||
+                          _lastRotation != Layer.Transform.Rotation.CurrentValue ||
+                          _lastScale != Layer.Transform.Scale.CurrentValue;
+
+            _lastAnchor = Layer.Transform.AnchorPoint.CurrentValue;
+            _lastPosition = Layer.Transform.Position.CurrentValue;
+            _lastRotation = Layer.Transform.Rotation.CurrentValue;
+            _lastScale = Layer.Transform.Scale.CurrentValue;
+
+            return result;
         }
 
-        private Geometry CreateCustomGeometry(ArtemisLed led, double deflateAmount)
+        #endregion
-        {
-            Rect rect = led.RgbLed.AbsoluteBoundary.ToWindowsRect(1);
-            try
-            {
-                PathGeometry geometry = Geometry.Combine(
-                    Geometry.Empty,
-                    Geometry.Parse(led.RgbLed.ShapeData),
-                    GeometryCombineMode.Union,
-                    new TransformGroup
-                    {
-                        Children = new TransformCollection
-                        {
-                            new ScaleTransform(rect.Width, rect.Height),
-                            new TranslateTransform(rect.X, rect.Y)
-                        }
-                    }
-                );
-
-                return geometry;
-            }
-            catch (Exception)
-            {
-                return CreateRectangleGeometry(led);
-            }
-        }
 
         #region Overrides of Screen
 

src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolViewModel.cs

@@ -51,7 +51,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 
         private void Update()
         {
-            if (!(ProfileEditorService.SelectedProfileElement is Layer layer))
+            if (ProfileEditorService.SelectedProfileElement is not Layer layer)
                 return;
 
             ShapePath = _layerEditorService.GetLayerPath(layer, true, true, true);

src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs

@@ -216,11 +216,11 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
 
         public double RenderScale
         {
-            get => _settingsService.GetSetting("Core.RenderScale", 0.5).Value;
+            get => _settingsService.GetSetting("Core.RenderScale", 0.25).Value;
             set
             {
-                _settingsService.GetSetting("Core.RenderScale", 0.5).Value = value;
+                _settingsService.GetSetting("Core.RenderScale", 0.25).Value = value;
-                _settingsService.GetSetting("Core.RenderScale", 0.5).Save();
+                _settingsService.GetSetting("Core.RenderScale", 0.25).Save();
             }
         }
 

src/Artemis.UI/Screens/Shared/PanZoomViewModel.cs

@@ -152,11 +152,6 @@ namespace Artemis.UI.Screens.Shared
             PanY = rect.Top * -1 * Zoom;
         }
 
-        public Rect TransformContainingRect(Rectangle rect)
-        {
-            return TransformContainingRect(rect.ToWindowsRect(1));
-        }
-
         public Rect TransformContainingRect(Rect rect)
         {
             // Create the same transform group the view is using
@@ -168,6 +163,17 @@ namespace Artemis.UI.Screens.Shared
             return transformGroup.TransformBounds(rect);
         }
 
+        public Rect UnTransformContainingRect(Rect rect)
+        {
+            // Create the same transform group the view is using
+            TransformGroup transformGroup = new();
+            transformGroup.Children.Add(new TranslateTransform(PanX * -1, PanY * -1));
+            transformGroup.Children.Add(new ScaleTransform(1 / Zoom, 1 / Zoom));
+
+            // Apply it to the device rect
+            return transformGroup.TransformBounds(rect);
+        }
+
         public Point GetRelativeMousePosition(object container, MouseEventArgs e)
         {
             // Get the mouse position relative to the panned / zoomed panel, not very MVVM but I can't find a better way

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.xaml

@@ -188,8 +188,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
                     <Canvas>
-                        <Rectangle ClipToBounds="False"
+                        <Rectangle Width="{Binding MaxTextureSize}"
-                                   Width="{Binding MaxTextureSize}"
                                    Height="{Binding MaxTextureSize}"
                                    Stroke="{DynamicResource SecondaryHueMidBrush}"
                                    StrokeThickness="{Binding MaxTextureSizeIndicatorThickness}"

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs

@@ -18,6 +18,7 @@ using Artemis.UI.Screens.SurfaceEditor.Visualization;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using SkiaSharp;
+using SkiaSharp.Views.WPF;
 using Stylet;
 using MouseButton = System.Windows.Input.MouseButton;
 
@@ -107,7 +108,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
             set => SetAndNotify(ref _colorFirstLedOnly, value);
         }
 
-        public double MaxTextureSize => 4096 / _settingsService.GetSetting("Core.RenderScale", 0.5).Value;
+        public double MaxTextureSize => 4096 / _settingsService.GetSetting("Core.RenderScale", 0.25).Value;
         public double MaxTextureSizeIndicatorThickness => 2 / PanZoomViewModel.Zoom;
 
         public void OpenHyperlink(object sender, RequestNavigateEventArgs e)
@@ -305,7 +306,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
             if (e.LeftButton == MouseButtonState.Pressed)
                 StartMouseDrag(sender, position, relative);
             else
-                StopMouseDrag(sender, position);
+                StopMouseDrag(position);
         }
 
         // ReSharper disable once UnusedMember.Global - Called from view
@@ -323,7 +324,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
             if (_mouseDragStatus == MouseDragStatus.Dragging)
                 MoveSelected(relative);
             else if (_mouseDragStatus == MouseDragStatus.Selecting)
-                UpdateSelection(sender, position);
+                UpdateSelection(position);
         }
 
         private void StartMouseDrag(object sender, Point position, Point relative)
@@ -360,17 +361,18 @@ namespace Artemis.UI.Screens.SurfaceEditor
             ApplySurfaceSelection();
         }
 
-        private void StopMouseDrag(object sender, Point position)
+        private void StopMouseDrag(Point position)
         {
             if (_mouseDragStatus != MouseDragStatus.Dragging)
             {
-                RectangleGeometry selectedRect = new(new Rect(_mouseDragStartPoint, position));
+                SKRect hitTestRect = PanZoomViewModel.UnTransformContainingRect(new Rect(_mouseDragStartPoint, position)).ToSKRect();
-                List<SurfaceDeviceViewModel> devices = HitTestUtilities.GetHitViewModels<SurfaceDeviceViewModel>((Visual) sender, selectedRect);
                 foreach (SurfaceDeviceViewModel device in SurfaceDeviceViewModels)
-                    if (devices.Contains(device))
+                {
+                    if (device.Device.Rectangle.IntersectsWith(hitTestRect))
                         device.SelectionStatus = SelectionStatus.Selected;
                     else if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
                         device.SelectionStatus = SelectionStatus.None;
+                }
             }
             else
             {
@@ -382,7 +384,7 @@ namespace Artemis.UI.Screens.SurfaceEditor
             ApplySurfaceSelection();
         }
 
-        private void UpdateSelection(object sender, Point position)
+        private void UpdateSelection(Point position)
         {
             if (IsPanKeyDown())
                 return;
@@ -390,12 +392,14 @@ namespace Artemis.UI.Screens.SurfaceEditor
             Rect selectedRect = new(_mouseDragStartPoint, position);
             SelectionRectangle.Rect = selectedRect;
 
-            List<SurfaceDeviceViewModel> devices = HitTestUtilities.GetHitViewModels<SurfaceDeviceViewModel>((Visual) sender, SelectionRectangle);
+            SKRect hitTestRect = PanZoomViewModel.UnTransformContainingRect(new Rect(_mouseDragStartPoint, position)).ToSKRect();
             foreach (SurfaceDeviceViewModel device in SurfaceDeviceViewModels)
-                if (devices.Contains(device))
+            {
+                if (device.Device.Rectangle.IntersectsWith(hitTestRect))
                     device.SelectionStatus = SelectionStatus.Selected;
                 else if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
                     device.SelectionStatus = SelectionStatus.None;
+            }
 
             ApplySurfaceSelection();
         }

src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceViewModel.cs

@@ -103,7 +103,7 @@ namespace Artemis.UI.Screens.SurfaceEditor.Visualization
             if (x < 0 || y < 0)
                 return false;
 
-            double maxTextureSize = 4096 / _settingsService.GetSetting("Core.RenderScale", 0.5).Value;
+            double maxTextureSize = 4096 / _settingsService.GetSetting("Core.RenderScale", 0.25).Value;
             if (x + Device.Rectangle.Width > maxTextureSize || y + Device.Rectangle.Height > maxTextureSize)
                 return false;
 

src/Artemis.UI/Services/LayerEditorService.cs

@@ -1,9 +1,12 @@
 using System;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 using Artemis.Core;
+using RGB.NET.Core;
 using SkiaSharp;
 using SkiaSharp.Views.WPF;
+using Point = System.Windows.Point;
 
 namespace Artemis.UI.Services
 {
@@ -12,12 +15,15 @@ namespace Artemis.UI.Services
         /// <inheritdoc />
         public Rect GetLayerBounds(Layer layer)
         {
-            // Adjust the render rectangle for the difference in render scale
+            return new Rect(
-            return new(
+                new Point(
-                layer.Bounds.Left,
+                    layer.Leds.Min(l => l.RgbLed.AbsoluteBoundary.Location.X),
-                layer.Bounds.Top,
+                    layer.Leds.Min(l => l.RgbLed.AbsoluteBoundary.Location.Y
-                Math.Max(0, layer.Bounds.Width),
+                    )),
-                Math.Max(0, layer.Bounds.Height)
+                new Point(
+                    layer.Leds.Max(l => l.RgbLed.AbsoluteBoundary.Location.X + l.RgbLed.AbsoluteBoundary.Size.Width),
+                    layer.Leds.Max(l => l.RgbLed.AbsoluteBoundary.Location.Y + l.RgbLed.AbsoluteBoundary.Size.Height
+                    ))
             );
         }
 
@@ -94,15 +100,16 @@ namespace Artemis.UI.Services
         /// <inheritdoc />
         public SKPoint GetScaledPoint(Layer layer, SKPoint point, bool absolute)
         {
+            SKRect bounds = GetLayerBounds(layer).ToSKRect();
             if (absolute)
                 return new SKPoint(
-                    100f / layer.Bounds.Width * (point.X - layer.Bounds.Left) / 100f,
+                    100 / bounds.Width * (point.X - bounds.Left) / 100,
-                    100f / layer.Bounds.Height * (point.Y - layer.Bounds.Top) / 100f
+                    100 / bounds.Height * (point.Y - bounds.Top) / 100
                 );
 
             return new SKPoint(
-                100f / layer.Bounds.Width * point.X / 100f,
+                100 / bounds.Width * point.X / 100,
-                100f / layer.Bounds.Height * point.Y / 100f
+                100 / bounds.Height * point.Y / 100
             );
         }