DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Robert 2023-05-13 11:06:18 +02:00
commit 5a36bc33ff
4 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Artemis.Core/Artemis.Core.csproj
View File

@ -43,9 +43,9 @@
<PackageReference Include="LiteDB" Version="5.0.16" /> <PackageReference Include="LiteDB" Version="5.0.16" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" /> <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.45" /> <PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.53" />
<PackageReference Include="RGB.NET.Layout" Version="2.0.0-prerelease.45" /> <PackageReference Include="RGB.NET.Layout" Version="2.0.0-prerelease.53" />
<PackageReference Include="RGB.NET.Presets" Version="2.0.0-prerelease.45" /> <PackageReference Include="RGB.NET.Presets" Version="2.0.0-prerelease.53" />
<PackageReference Include="Serilog" Version="2.12.0" /> <PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" /> <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />

36
src/Artemis.Core/RGB.NET/SKTexture.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using System.Buffers;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Artemis.Core.SkiaSharp; using Artemis.Core.SkiaSharp;
using RGB.NET.Core; using RGB.NET.Core;
@ -56,31 +56,12 @@ public sealed class SKTexture : PixelTexture<byte>, IDisposable
if (skRectI.Width <= 0 || skRectI.Height <= 0) if (skRectI.Width <= 0 || skRectI.Height <= 0)
return Color.Transparent; return Color.Transparent;
int bufferSize = skRectI.Width * skRectI.Height * DATA_PER_PIXEL; SamplerInfo<byte> samplerInfo = new(skRectI.Left, skRectI.Top, skRectI.Width, skRectI.Height, Stride, DataPerPixel, Data);
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]; Span<byte> pixelData = stackalloc byte[DATA_PER_PIXEL];
Sampler.Sample(new SamplerInfo<byte>(skRectI.Width, skRectI.Height, buffer), pixelData); Sampler.Sample(samplerInfo, pixelData);
return GetColor(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 void ReleaseUnmanagedResources() private void ReleaseUnmanagedResources()
@ -106,7 +87,6 @@ public sealed class SKTexture : PixelTexture<byte>, IDisposable
#region Constants #region Constants
private const int STACK_ALLOC_LIMIT = 1024;
private const int DATA_PER_PIXEL = 4; private const int DATA_PER_PIXEL = 4;
#endregion #endregion
@ -128,10 +108,8 @@ public sealed class SKTexture : PixelTexture<byte>, IDisposable
} }
/// <inheritdoc /> /// <inheritdoc />
protected override Color GetColor(in ReadOnlySpan<byte> pixel) [MethodImpl(MethodImplOptions.AggressiveInlining)]
{ protected override Color GetColor(in ReadOnlySpan<byte> pixel) => new(pixel[2], pixel[1], pixel[0]);
return new Color(pixel[2], pixel[1], pixel[0]);
}
/// <inheritdoc /> /// <inheritdoc />
public override Color this[in Rectangle rectangle] => Color.Transparent; public override Color this[in Rectangle rectangle] => Color.Transparent;

2
src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
View File

@ -20,7 +20,7 @@
<PackageReference Include="Material.Icons.Avalonia" Version="2.0.0-preview3" /> <PackageReference Include="Material.Icons.Avalonia" Version="2.0.0-preview3" />
<PackageReference Include="ReactiveUI" Version="18.4.26" /> <PackageReference Include="ReactiveUI" Version="18.4.26" />
<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" /> <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
<PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.45" /> <PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.53" />
<PackageReference Include="SkiaSharp" Version="2.88.3" /> <PackageReference Include="SkiaSharp" Version="2.88.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
src/Artemis.UI/Artemis.UI.csproj
View File

@ -33,8 +33,8 @@
<PackageReference Include="Octopus.Octodiff" Version="2.0.261" /> <PackageReference Include="Octopus.Octodiff" Version="2.0.261" />
<PackageReference Include="ReactiveUI" Version="18.4.26" /> <PackageReference Include="ReactiveUI" Version="18.4.26" />
<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" /> <PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
<PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.45" /> <PackageReference Include="RGB.NET.Core" Version="2.0.0-prerelease.53" />
<PackageReference Include="RGB.NET.Layout" Version="2.0.0-prerelease.45" /> <PackageReference Include="RGB.NET.Layout" Version="2.0.0-prerelease.53" />
<PackageReference Include="SkiaSharp" Version="2.88.3" /> <PackageReference Include="SkiaSharp" Version="2.88.3" />
<PackageReference Include="Splat.DryIoc" Version="14.6.8" /> <PackageReference Include="Splat.DryIoc" Version="14.6.8" />
</ItemGroup> </ItemGroup>