From 49e6dbf09b6470becf7213154c6cbfcacf73b4de Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 23 Oct 2019 20:10:02 +0200 Subject: [PATCH] Working on render logic --- src/Artemis.Core/RGB.NET/GraphicsDecorator.cs | 20 ++++++++++----- src/Artemis.Core/Services/CoreService.cs | 5 ++++ .../Services/Interfaces/IRgbService.cs | 2 ++ src/Artemis.Core/Services/RgbService.cs | 25 ++++++++++++++----- .../Services/Storage/SurfaceService.cs | 2 +- .../SurfaceEditor/SurfaceDeviceViewModel.cs | 4 +-- src/Artemis.UI/ViewModels/PanZoomViewModel.cs | 9 ++++--- .../Screens/SurfaceEditorViewModel.cs | 2 ++ 8 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs b/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs index fb6979876..de5ee5225 100644 --- a/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs +++ b/src/Artemis.Core/RGB.NET/GraphicsDecorator.cs @@ -14,16 +14,24 @@ namespace Artemis.Core.RGB.NET public GraphicsDecorator(ListLedGroup ledGroup) { - var width = ledGroup.GetLeds().Max(l => l.AbsoluteLedRectangle.X + l.AbsoluteLedRectangle.Width); - var height = ledGroup.GetLeds().Max(l => l.AbsoluteLedRectangle.Y + l.AbsoluteLedRectangle.Height); + var leds = ledGroup.GetLeds().ToList(); + if (!leds.Any()) + { + _bitmap = null; + } + else + { + var width = leds.Max(l => l.AbsoluteLedRectangle.X + l.AbsoluteLedRectangle.Width); + var height = leds.Max(l => l.AbsoluteLedRectangle.Y + l.AbsoluteLedRectangle.Height); - _bitmap = new DirectBitmap((int) width, (int) height); + _bitmap = new DirectBitmap((int) width, (int) height); + } } public Color ManipulateColor(Rectangle rectangle, BrushRenderTarget renderTarget, Color color) { - var point = renderTarget.Point; - if (_bitmap.Width - 1 >= point.X && _bitmap.Height - 1 >= point.Y) + var point = renderTarget.Led.AbsoluteLedRectangle.Center; + if (_bitmap != null && _bitmap.Width - 1 >= point.X && _bitmap.Height - 1 >= point.Y) { var pixel = _bitmap.GetPixel((int) point.X, (int) point.Y); return new Color(pixel.A, pixel.R, pixel.G, pixel.B); @@ -34,7 +42,7 @@ namespace Artemis.Core.RGB.NET public Graphics GetGraphics() { - return Graphics.FromImage(_bitmap.Bitmap); + return _bitmap == null ? null : Graphics.FromImage(_bitmap.Bitmap); } } } \ No newline at end of file diff --git a/src/Artemis.Core/Services/CoreService.cs b/src/Artemis.Core/Services/CoreService.cs index 965bf0f7d..be72126ef 100644 --- a/src/Artemis.Core/Services/CoreService.cs +++ b/src/Artemis.Core/Services/CoreService.cs @@ -64,12 +64,17 @@ namespace Artemis.Core.Services foreach (var module in modules) module.Update(args.DeltaTime); + // If there is no graphics decorator, skip the frame if (_rgbService.GraphicsDecorator == null) return; // Render all active modules using (var g = _rgbService.GraphicsDecorator.GetGraphics()) { + // If there are no graphics, skip the frame + if (g == null) + return; + g.Clear(Color.Black); foreach (var module in modules) module.Render(args.DeltaTime, _rgbService.Surface, g); diff --git a/src/Artemis.Core/Services/Interfaces/IRgbService.cs b/src/Artemis.Core/Services/Interfaces/IRgbService.cs index 62317bff2..f0946dc07 100644 --- a/src/Artemis.Core/Services/Interfaces/IRgbService.cs +++ b/src/Artemis.Core/Services/Interfaces/IRgbService.cs @@ -25,5 +25,7 @@ namespace Artemis.Core.Services.Interfaces /// Occurs when a single device has reloaded /// event EventHandler DeviceReloaded; + + void UpdateGraphicsDecorator(); } } \ No newline at end of file diff --git a/src/Artemis.Core/Services/RgbService.cs b/src/Artemis.Core/Services/RgbService.cs index 5d33d3b6a..2cbb51c79 100644 --- a/src/Artemis.Core/Services/RgbService.cs +++ b/src/Artemis.Core/Services/RgbService.cs @@ -19,6 +19,7 @@ namespace Artemis.Core.Services private readonly List _loadedDevices; private readonly ILogger _logger; private readonly TimerUpdateTrigger _updateTrigger; + private ListLedGroup _background; internal RgbService(ILogger logger) { @@ -58,7 +59,7 @@ namespace Artemis.Core.Services _logger.Warning("Device provider {deviceProvider} has no devices", deviceProvider.GetType().Name); return; } - + lock (_loadedDevices) { foreach (var surfaceDevice in deviceProvider.Devices) @@ -74,11 +75,6 @@ namespace Artemis.Core.Services } } } - - // Apply the application wide brush and decorator - var background = new ListLedGroup(Surface.Leds) {Brush = new SolidColorBrush(new Color(255, 255, 255, 255))}; - GraphicsDecorator = new GraphicsDecorator(background); - background.Brush.AddDecorator(GraphicsDecorator); } public void Dispose() @@ -99,6 +95,23 @@ namespace Artemis.Core.Services public event EventHandler DeviceLoaded; public event EventHandler DeviceReloaded; + public void UpdateGraphicsDecorator() + { + // Clean up the old background if present + if (_background != null) + { + _background.RemoveAllDecorators(); + _background.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); + _background.Brush.RemoveAllDecorators(); + + _background.Brush.AddDecorator(GraphicsDecorator); + } + private void OnDeviceLoaded(DeviceEventArgs e) { DeviceLoaded?.Invoke(this, e); diff --git a/src/Artemis.Core/Services/Storage/SurfaceService.cs b/src/Artemis.Core/Services/Storage/SurfaceService.cs index a8d46663f..d1cc90715 100644 --- a/src/Artemis.Core/Services/Storage/SurfaceService.cs +++ b/src/Artemis.Core/Services/Storage/SurfaceService.cs @@ -58,7 +58,7 @@ namespace Artemis.Core.Services.Storage deviceConfiguration.ApplyToDevice(); } // Update the RGB service's graphics decorator to work with the new surface configuration - _rgbService.GraphicsDecorator.UpdateBitmap(); + _rgbService.UpdateGraphicsDecorator(); OnActiveSurfaceConfigurationChanged(new SurfaceConfigurationEventArgs(_activeSurfaceConfiguration)); } diff --git a/src/Artemis.UI/ViewModels/Controls/SurfaceEditor/SurfaceDeviceViewModel.cs b/src/Artemis.UI/ViewModels/Controls/SurfaceEditor/SurfaceDeviceViewModel.cs index b6bf054cb..c591f7176 100644 --- a/src/Artemis.UI/ViewModels/Controls/SurfaceEditor/SurfaceDeviceViewModel.cs +++ b/src/Artemis.UI/ViewModels/Controls/SurfaceEditor/SurfaceDeviceViewModel.cs @@ -63,8 +63,8 @@ namespace Artemis.UI.ViewModels.Controls.SurfaceEditor { var roundedX = Math.Round((mousePosition.X + _dragOffsetX) / 10, 0, MidpointRounding.AwayFromZero) * 10; var roundedY = Math.Round((mousePosition.Y + _dragOffsetY) / 10, 0, MidpointRounding.AwayFromZero) * 10; - X = roundedX; - Y = roundedY; + X = Math.Max(0, roundedX); + Y = Math.Max(0, roundedY); } // ReSharper disable once UnusedMember.Global - Called from view diff --git a/src/Artemis.UI/ViewModels/PanZoomViewModel.cs b/src/Artemis.UI/ViewModels/PanZoomViewModel.cs index dfc04370b..4a88d7781 100644 --- a/src/Artemis.UI/ViewModels/PanZoomViewModel.cs +++ b/src/Artemis.UI/ViewModels/PanZoomViewModel.cs @@ -42,8 +42,8 @@ namespace Artemis.UI.ViewModels Zoom = Math.Max(0.1, Math.Min(4, Zoom)); // Update the PanX/Y to enable zooming relative to cursor - PanX = absoluteX - relative.X * Zoom; - PanY = absoluteY - relative.Y * Zoom; + PanX = Math.Min(0, absoluteX - relative.X * Zoom); + PanY = Math.Min(0, absoluteY - relative.Y * Zoom); } public void ProcessMouseMove(object sender, MouseEventArgs e) @@ -60,9 +60,10 @@ namespace Artemis.UI.ViewModels var position = e.GetPosition((IInputElement) sender); var delta = _lastPanPosition - position; - PanX -= delta.Value.X; - PanY -= delta.Value.Y; + PanX = Math.Min(0, PanX - delta.Value.X); + PanY = Math.Min(0, PanY - delta.Value.Y); + _lastPanPosition = position; } diff --git a/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs b/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs index 5f77630bd..a077ed44a 100644 --- a/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs +++ b/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs @@ -105,6 +105,8 @@ namespace Artemis.UI.ViewModels.Screens Devices.Add(viewModel); }); }); + + _surfaceService.ActiveSurfaceConfiguration = SelectedSurfaceConfiguration; } #region Overrides of Screen