WIP - Added a BitmapBrush to replace the GraphicsDecorator

src/Artemis.Core/Services/CoreService.cs

@@ -89,14 +89,17 @@ namespace Artemis.Core.Services
                         module.Update(args.DeltaTime);
                 }
 
-                // If there is no ready graphics decorator, skip the frame
-                lock (_rgbService.GraphicsDecorator)
+                // If there is no ready bitmap brush, skip the frame
+                if (_rgbService.BitmapBrush == null)
+                    return;
+
+                lock (_rgbService.BitmapBrush)
                 {
-                    if (_rgbService.GraphicsDecorator?.Bitmap == null)
+                    if (_rgbService.BitmapBrush.Bitmap == null)
                         return;
 
                     // Render all active modules
-                    using (var canvas = new SKCanvas(_rgbService.GraphicsDecorator.Bitmap))
+                    using (var canvas = new SKCanvas(_rgbService.BitmapBrush.Bitmap))
                     {
                         canvas.Clear(new SKColor(0, 0, 0));
                         lock (_modules)
@@ -117,7 +120,7 @@ namespace Artemis.Core.Services
 
         private void SurfaceOnUpdated(UpdatedEventArgs args)
         {
-            OnFrameRendered(new FrameRenderedEventArgs(_rgbService.GraphicsDecorator, _rgbService.Surface));
+            OnFrameRendered(new FrameRenderedEventArgs(_rgbService.BitmapBrush, _rgbService.Surface));
         }
 
         protected virtual void OnFrameRendering(FrameRenderingEventArgs e)

src/Artemis.Core/Services/Interfaces/IRgbService.cs

@@ -9,7 +9,7 @@ namespace Artemis.Core.Services.Interfaces
     public interface IRgbService : IArtemisService
     {
         RGBSurface Surface { get; set; }
-        GraphicsDecorator GraphicsDecorator { get; }
+        BitmapBrush BitmapBrush { get; }
         IReadOnlyCollection<IRGBDevice> LoadedDevices { get; }
 
         void AddDeviceProvider(IRGBDeviceProvider deviceProvider);
@@ -25,6 +25,6 @@ namespace Artemis.Core.Services.Interfaces
         /// </summary>
         event EventHandler<DeviceEventArgs> DeviceReloaded;
 
-        void UpdateGraphicsDecorator();
+        void UpdateSurfaceLedGroup();
     }
 }

src/Artemis.Core/Services/RgbService.cs

@@ -21,7 +21,7 @@ namespace Artemis.Core.Services
         private readonly PluginSetting<double> _renderScaleSetting;
         private readonly PluginSetting<int> _targetFrameRateSetting;
         private readonly TimerUpdateTrigger _updateTrigger;
-        private ListLedGroup _background;
+        private ListLedGroup _surfaceLedGroup;
 
         internal RgbService(ILogger logger, ISettingsService settingsService)
         {
@@ -30,7 +30,6 @@ namespace Artemis.Core.Services
             _targetFrameRateSetting = settingsService.GetSetting("Core.TargetFrameRate", 25);
 
             Surface = RGBSurface.Instance;
-            GraphicsDecorator = new GraphicsDecorator(new ListLedGroup(), 1);
 
             // Let's throw these for now
             Surface.Exception += SurfaceOnException;
@@ -44,7 +43,7 @@ namespace Artemis.Core.Services
         /// <inheritdoc />
         public RGBSurface Surface { get; set; }
 
-        public GraphicsDecorator GraphicsDecorator { get; private set; }
+        public BitmapBrush BitmapBrush { get; private set; }
 
         public IReadOnlyCollection<IRGBDevice> LoadedDevices => _loadedDevices.AsReadOnly();
 
@@ -57,7 +56,7 @@ namespace Artemis.Core.Services
                 _logger.Warning("RgbDevice provider {deviceProvider} has no devices", deviceProvider.GetType().Name);
                 return;
             }
-            
+
             foreach (var surfaceDevice in deviceProvider.Devices)
             {
                 if (!_loadedDevices.Contains(surfaceDevice))
@@ -80,7 +79,7 @@ namespace Artemis.Core.Services
 
         private void RenderScaleSettingOnSettingChanged(object sender, EventArgs e)
         {
-            UpdateGraphicsDecorator();
+            UpdateSurfaceLedGroup();
         }
 
         private void TargetFrameRateSettingOnSettingChanged(object sender, EventArgs e)
@@ -99,23 +98,28 @@ namespace Artemis.Core.Services
         public event EventHandler<DeviceEventArgs> DeviceLoaded;
         public event EventHandler<DeviceEventArgs> DeviceReloaded;
 
-        public void UpdateGraphicsDecorator()
+        public void UpdateSurfaceLedGroup()
         {
-            lock (GraphicsDecorator)
+            if (_surfaceLedGroup == null)
             {
-                // Clean up the old background if present
-                if (_background != null)
-                {
-                    _background.Brush?.RemoveAllDecorators();
-                    _background.Detach();
-                }
+                // Apply the application wide brush and decorator
+                BitmapBrush = new BitmapBrush(new Scale(_renderScaleSetting.Value));
+                _surfaceLedGroup = new ListLedGroup(Surface.Leds) { Brush = BitmapBrush };
+                return;
+            }
+
+            lock (_surfaceLedGroup)
+            {
+                // Clean up the old background
+                _surfaceLedGroup.Detach();
 
                 // Apply the application wide brush and decorator
-                _background = new ListLedGroup(Surface.Leds) {Brush = new SolidColorBrush(new Color(255, 255, 255, 255))};
-                GraphicsDecorator = new GraphicsDecorator(_background, _renderScaleSetting.Value);
-                _background.Brush.RemoveAllDecorators();
-
-                _background.Brush.AddDecorator(GraphicsDecorator);
+                BitmapBrush.Scale = new Scale(_renderScaleSetting.Value);
+                _surfaceLedGroup = new ListLedGroup(Surface.Leds) { Brush = BitmapBrush };
+            }
+            lock (BitmapBrush)
+            {
+                
             }
         }
 

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

@@ -93,7 +93,7 @@ namespace Artemis.Core.Services.Storage
             }
 
             // Update the RGB service's graphics decorator to work with the new surface entity
-            _rgbService.UpdateGraphicsDecorator();
+            _rgbService.UpdateSurfaceLedGroup();
             OnActiveSurfaceConfigurationChanged(new SurfaceConfigurationEventArgs(ActiveSurface));
         }
 
@@ -111,7 +111,7 @@ namespace Artemis.Core.Services.Storage
             }
 
             _surfaceRepository.Save(surface.SurfaceEntity);
-            _rgbService.UpdateGraphicsDecorator();
+            _rgbService.UpdateSurfaceLedGroup();
             OnSurfaceConfigurationUpdated(new SurfaceConfigurationEventArgs(surface));
         }