Merge branch 'development' into RGB.NET-Update

src/Artemis.Core/MVVM/CorePropertyChanged.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Artemis.Core.Properties;
 
@@ -26,7 +27,7 @@ public abstract class CorePropertyChanged : INotifyPropertyChanged
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     protected bool RequiresUpdate<T>(ref T storage, T value)
     {
-        return !Equals(storage, value);
+        return !EqualityComparer<T>.Default.Equals(storage, value);
     }
 
     /// <summary>

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

@@ -28,6 +28,8 @@ public abstract class PerLedLayerBrush<T> : PropertiesLayerBrush<T> where T : La
     /// <returns>The color the LED will receive</returns>
     public abstract SKColor GetColor(ArtemisLed led, SKPoint renderPoint);
 
+    private readonly SKPoint[] _points = new SKPoint[2];
+    
     internal override void InternalRender(SKCanvas canvas, SKRect bounds, SKPaint paint)
     {
         // We don't want rotation on this canvas because that'll displace the LEDs, translations are applied to the points of each LED instead
@@ -37,25 +39,21 @@ public abstract class PerLedLayerBrush<T> : PropertiesLayerBrush<T> where T : La
         using SKPath pointsPath = new();
         foreach (ArtemisLed artemisLed in Layer.Leds)
         {
-            pointsPath.AddPoly(new[]
+            _points[0] = new SKPoint(0, 0);
-            {
+            _points[1] = new SKPoint(artemisLed.AbsoluteRectangle.Left - Layer.Bounds.Left, artemisLed.AbsoluteRectangle.Top - Layer.Bounds.Top);
-                new SKPoint(0, 0),
+            pointsPath.AddPoly(_points);
-                new SKPoint(artemisLed.AbsoluteRectangle.Left - Layer.Bounds.Left, artemisLed.AbsoluteRectangle.Top - Layer.Bounds.Top)
-            });
         }
 
         // Apply the translation to the points of each LED instead
         if (Layer.General.TransformMode.CurrentValue == LayerTransformMode.Normal && SupportsTransformation)
             pointsPath.Transform(Layer.GetTransformMatrix(true, true, true, true).Invert());
 
-        SKPoint[] points = pointsPath.Points;
-
         TryOrBreak(() =>
         {
             for (int index = 0; index < Layer.Leds.Count; index++)
             {
                 ArtemisLed artemisLed = Layer.Leds[index];
-                SKPoint renderPoint = points[index * 2 + 1];
+                SKPoint renderPoint = pointsPath.GetPoint(index * 2 + 1);
                 if (!float.IsFinite(renderPoint.X) || !float.IsFinite(renderPoint.Y))
                     continue;
 

src/Artemis.Core/Stores/LogStore.cs

@@ -10,12 +10,25 @@ namespace Artemis.Core;
 /// </summary>
 public static class LogStore
 {
+    private static readonly object _lock = new();
+    
     private static readonly LinkedList<LogEvent> LinkedList = new();
 
     /// <summary>
     ///     Gets a list containing the last 500 log events.
     /// </summary>
-    public static List<LogEvent> Events => LinkedList.ToList();
+    public static List<LogEvent> Events
+    {
+        get
+        {
+            List<LogEvent> events;
+            
+            lock (_lock)
+                events = LinkedList.ToList();
+            
+            return events;
+        }
+    }
 
     /// <summary>
     ///     Occurs when a new <see cref="LogEvent" /> was received.
@@ -24,9 +37,13 @@ public static class LogStore
 
     internal static void Emit(LogEvent logEvent)
     {
-        LinkedList.AddLast(logEvent);
+        lock (_lock)
-        while (LinkedList.Count > 500)
+        {
-            LinkedList.RemoveFirst();
+            LinkedList.AddLast(logEvent);
+            while (LinkedList.Count > 500)
+                LinkedList.RemoveFirst();
+        }
+
 
         OnEventAdded(new LogEventEventArgs(logEvent));
     }

src/Artemis.UI.Shared/Services/NodeEditor/Commands/DuplicateNode.cs

@@ -56,7 +56,7 @@ public class DuplicateNode : INodeEditorCommand, IDisposable
             if (targetCollection == null)
                 continue;
             while (targetCollection.Count() < sourceCollection.Count())
-                targetCollection.CreatePin();
+                targetCollection.Add(targetCollection.CreatePin());
         }
 
         // Copy the storage

src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugView.axaml.cs

@@ -14,7 +14,7 @@ namespace Artemis.UI.Screens.Debugger.Logs;
 public class LogsDebugView : ReactiveUserControl<LogsDebugViewModel>
 {
     private int _lineCount;
-    private TextEditor _textEditor;
+    private TextEditor? _textEditor;
 
     public LogsDebugView()
     {
@@ -31,7 +31,7 @@ public class LogsDebugView : ReactiveUserControl<LogsDebugViewModel>
     protected override void OnInitialized()
     {
         base.OnInitialized();
-        Dispatcher.UIThread.Post(() => _textEditor.ScrollToEnd(), DispatcherPriority.ApplicationIdle);
+        Dispatcher.UIThread.Post(() => _textEditor?.ScrollToEnd(), DispatcherPriority.ApplicationIdle);
     }
 
     private void OnTextChanged(object? sender, EventArgs e)

src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs

@@ -48,8 +48,11 @@ public class LogsDebugViewModel : ActivatableViewModelBase
         });
     }
 
-    private void AddLogEvent(LogEvent logEvent)
+    private void AddLogEvent(LogEvent? logEvent)
     {
+        if (logEvent is null)
+            return;
+
         using StringWriter writer = new();
         _formatter.Format(logEvent, writer);
         string line = writer.ToString();
@@ -60,7 +63,7 @@ public class LogsDebugViewModel : ActivatableViewModelBase
 
     private void RemoveOldestLine()
     {
-        int firstNewLine = Document.Text.IndexOf('\n');
+        int firstNewLine = Document.IndexOf('\n', 0, Document.TextLength);
         if (firstNewLine == -1)
         {
             //this should never happen.

src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs

@@ -52,7 +52,7 @@ public class StartupWizardViewModel : DialogViewModelBase<bool>
         DeviceProviders = new ObservableCollection<PluginViewModel>(pluginManagementService.GetAllPlugins()
             .Where(p => p.Info.IsCompatible && p.Features.Any(f => f.AlwaysEnabled && f.FeatureType.IsAssignableTo(typeof(DeviceProvider))))
             .OrderBy(p => p.Info.Name)
-            .Select(p => settingsVmFactory.PluginViewModel(p, null)));
+            .Select(p => settingsVmFactory.PluginViewModel(p, ReactiveCommand.Create(() => new Unit()))));
 
         CurrentStep = 1;
         SetupButtons();

src/Artemis.VisualScripting/Nodes/Color/HslSKColorNode.cs

@@ -3,7 +3,7 @@ using SkiaSharp;
 
 namespace Artemis.VisualScripting.Nodes.Color;
 
-[Node("HSL Color", "Creates a color from hue, saturation and lightness values", "Color", InputType = typeof(Numeric), OutputType = typeof(SKColor))]
+[Node("HSL Color", "Creates a color from hue, saturation and lightness numbers", "Color", InputType = typeof(Numeric), OutputType = typeof(SKColor))]
 public class HslSKColorNode : Node
 {
     public HslSKColorNode()

src/Artemis.VisualScripting/Nodes/Color/HsvSKColorNode.cs

@@ -0,0 +1,31 @@
+using Artemis.Core;
+using SkiaSharp;
+
+namespace Artemis.VisualScripting.Nodes.Color;
+
+[Node("HSV Color", "Creates a color from hue, saturation and value numbers", "Color", InputType = typeof(Numeric), OutputType = typeof(SKColor))]
+public class HsvSKColorNode : Node
+{
+    public HsvSKColorNode()
+    {
+        H = CreateInputPin<Numeric>("H");
+        S = CreateInputPin<Numeric>("S");
+        V = CreateInputPin<Numeric>("V");
+        Output = CreateOutputPin<SKColor>();
+    }
+
+    public InputPin<Numeric> H { get; set; }
+    public InputPin<Numeric> S { get; set; }
+    public InputPin<Numeric> V { get; set; }
+    public OutputPin<SKColor> Output { get; }
+
+    #region Overrides of Node
+
+    /// <inheritdoc />
+    public override void Evaluate()
+    {
+        Output.Value = SKColor.FromHsv(H.Value, S.Value, V.Value);
+    }
+
+    #endregion
+}

src/Artemis.VisualScripting/Nodes/Color/SkColorHsl.cs

@@ -0,0 +1,36 @@
+using Artemis.Core;
+using SkiaSharp;
+
+namespace Artemis.VisualScripting.Nodes.Color;
+
+[Node("Color to HSL", "Outputs H, S and L values from a color", "Color", InputType = typeof(SKColor), OutputType = typeof(Numeric))]
+public class SkColorHsl : Node
+{
+    
+    public SkColorHsl()
+    {
+        Input = CreateInputPin<SKColor>();
+        H = CreateOutputPin<Numeric>("H");
+        S = CreateOutputPin<Numeric>("S");
+        L = CreateOutputPin<Numeric>("L");
+    }
+    
+    public InputPin<SKColor> Input { get; }
+    public OutputPin<Numeric> H { get; }
+    public OutputPin<Numeric> S { get; }
+    public OutputPin<Numeric> L { get; }
+    
+    #region Overrides of Node
+
+    /// <inheritdoc />
+    public override void Evaluate()
+    {
+        Input.Value.ToHsl(out float h, out float s, out float l);
+        
+        H.Value = h;
+        S.Value = s;
+        L.Value = l;
+    }
+
+    #endregion
+}

src/Artemis.VisualScripting/Nodes/Color/SkColorHsv.cs

@@ -0,0 +1,36 @@
+using Artemis.Core;
+using SkiaSharp;
+
+namespace Artemis.VisualScripting.Nodes.Color;
+
+[Node("Color to HSV", "Outputs H, S and L values from a color", "Color", InputType = typeof(SKColor), OutputType = typeof(Numeric))]
+public class SkColorHsv : Node
+{
+    
+    public SkColorHsv()
+    {
+        Input = CreateInputPin<SKColor>();
+        H = CreateOutputPin<Numeric>("H");
+        S = CreateOutputPin<Numeric>("S");
+        V = CreateOutputPin<Numeric>("V");
+    }
+    
+    public InputPin<SKColor> Input { get; }
+    public OutputPin<Numeric> H { get; }
+    public OutputPin<Numeric> S { get; }
+    public OutputPin<Numeric> V { get; }
+    
+    #region Overrides of Node
+
+    /// <inheritdoc />
+    public override void Evaluate()
+    {
+        Input.Value.ToHsv(out float h, out float s, out float v);
+        
+        H.Value = h;
+        S.Value = s;
+        V.Value = v;
+    }
+
+    #endregion
+}

src/Artemis.VisualScripting/Nodes/Conversion/ConvertToNumericNode.cs

@@ -1,4 +1,4 @@
-using Artemis.Core;
+using Artemis.Core;
 
 namespace Artemis.VisualScripting.Nodes.Conversion;
 
@@ -33,6 +33,7 @@ public class ConvertToNumericNode : Node
             double input => new Numeric(input),
             float input => new Numeric(input),
             byte input => new Numeric(input),
+            bool input => new Numeric(input ? 1 : 0),
             _ => TryParse(Input.Value)
         };
     }
@@ -44,4 +45,4 @@ public class ConvertToNumericNode : Node
     }
 
     #endregion
-}
+}