DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-11 19:36:28 +00:00
Code Issues Releases Wiki Activity

Nearly fully implemented surface rearranging

Browse Source
This commit is contained in:
SpoinkyNL committed 2019-08-25 22:26:10 +02:00
1 parent 5106195450
commit 8951e61bd9
9 files changed
+175 -547
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.Plugins.Modules.General/Artemis.Plugins.Modules.General.csproj
+2 -1
View File
@@ -95,6 +95,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>(robocopy $(TargetDir) $(SolutionDir)\Artemis.UI\$(OutDir)\Plugins\$(ProjectName) /E /NFL /NDL /NJH /NJS /nc /ns /np) ^&amp; IF %25ERRORLEVEL%25 LEQ 4 exit /B 0</PostBuildEvent>
<PostBuildEvent>echo Copying plugin to Artemis.UI output directory
XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y</PostBuildEvent>
</PropertyGroup>
</Project>
src/Artemis.Plugins.Modules.General/GeneralModule.cs
+2 -74
View File
@@ -1,18 +1,13 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using Artemis.Core;
using Artemis.Core.Extensions;
using Artemis.Core.Plugins.Abstract;
using Artemis.Core.Plugins.Models;
using Artemis.Core.Services.Interfaces;
using Artemis.Plugins.Modules.General.ViewModels;
using QRCoder;
using RGB.NET.Core;
using Stylet;
using Color = System.Drawing.Color;
using Rectangle = System.Drawing.Rectangle;
namespace Artemis.Plugins.Modules.General
{
@@ -20,8 +15,6 @@ namespace Artemis.Plugins.Modules.General
{
private readonly PluginSettings _settings;
private readonly RGBSurface _surface;
private Dictionary<Led, Color> _colors;
private double _circlePosition;
private Color _color;
public GeneralModule(PluginInfo pluginInfo, IRgbService rgbService, PluginSettings settings) : base(pluginInfo)
@@ -31,10 +24,6 @@ namespace Artemis.Plugins.Modules.General
ExpandsMainDataModel = true;
_surface = rgbService.Surface;
_colors = new Dictionary<Led, Color>();
rgbService.DeviceLoaded += (sender, args) => PopulateColors();
rgbService.DeviceReloaded += (sender, args) => PopulateColors();
var testSetting = _settings.GetSetting("TestSetting", DateTime.Now);
_color = ColorHelpers.GetRandomRainbowColor();
@@ -42,8 +31,6 @@ namespace Artemis.Plugins.Modules.General
public override void EnablePlugin()
{
var qrGenerator = new QRCodeGenerator();
PopulateColors();
}
public override void DisablePlugin()
@@ -52,56 +39,16 @@ namespace Artemis.Plugins.Modules.General
public override void Update(double deltaTime)
{
if (_colors == null)
return;
foreach (var surfaceLed in _surface.Leds)
UpdateLedColor(surfaceLed, deltaTime);
_color = ColorHelpers.ShiftColor(_color, (int) (deltaTime * 200));
}
public override void Render(double deltaTime, RGBSurface surface, Graphics graphics)
{
_circlePosition += deltaTime * 50;
if (_circlePosition > 600)
{
_circlePosition = -200;
_color = ColorHelpers.GetRandomRainbowColor();
}
var rect = new Rectangle((int) _circlePosition * 4, 0, 200, (int) surface.Leds.Max(l => l.AbsoluteLedRectangle.Y + l.AbsoluteLedRectangle.Height));
graphics.FillRectangle(new SolidBrush(_color), rect);
// // Lets do this in the least performant way possible
// foreach (var surfaceLed in _surface.Leds)
// {
// var rectangle = surfaceLed.AbsoluteLedRectangle.ToDrawingRectangle();
// if (surfaceLed.Id == LedId.Fan1)
// {
// graphics.FillRectangle(new SolidBrush(Color.Red), rectangle);
// }
// if (surfaceLed.Id == LedId.Fan2)
// {
// graphics.FillRectangle(new SolidBrush(Color.Blue), rectangle);
// }
// if (surfaceLed.Id == LedId.Fan3)
// {
// graphics.FillRectangle(new SolidBrush(Color.Green), rectangle);
// }
// }
return;
// Lets do this in the least performant way possible
foreach (var surfaceLed in _surface.Leds)
{
if (!_colors.ContainsKey(surfaceLed))
continue;
var brush = new SolidBrush(_colors[surfaceLed]);
var rectangle = surfaceLed.AbsoluteLedRectangle.ToDrawingRectangle();
graphics.FillRectangle(brush, rectangle);
UpdateLedColor(surfaceLed, deltaTime);
graphics.FillRectangle(new SolidBrush(_color), rectangle);
}
}
@@ -112,25 +59,6 @@ namespace Artemis.Plugins.Modules.General
public override void Dispose()
{
_colors = null;
}
private void UpdateLedColor(Led led, double deltaTime)
{
if (_colors.ContainsKey(led))
_colors[led] = ColorHelpers.ShiftColor(_colors[led], (int) (deltaTime * 200));
else
_colors[led] = ColorHelpers.GetRandomRainbowColor();
}
private void PopulateColors()
{
lock (_colors)
{
_colors = new Dictionary<Led, Color>();
foreach (var surfaceLed in _surface.Leds)
_colors.Add(surfaceLed, ColorHelpers.GetRandomRainbowColor());
}
}
}
}