DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 20:06:33 +00:00
Code Issues Releases Wiki Activity

Noise brush - Fixed noise algorithm usage

Browse Source
This commit is contained in:
SpoinkyNL committed 2020-02-13 23:34:50 +01:00
1 parent a05af16391
commit eff52cac58
13 files changed
+37 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.Plugins.LayerBrushes.Noise/Artemis.Plugins.LayerBrushes.Noise.csproj
+3 -3
View File
@@ -54,7 +54,7 @@
<Private>False</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.68.1.1\lib\net45\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.68.2-preview.29\lib\net45\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="Stylet, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Stylet.1.3.0\lib\net45\Stylet.dll</HintPath>
@@ -118,11 +118,11 @@
<PostBuildEvent>echo Copying plugin to Artemis.UI output directory
XCOPY "$(TargetDir.TrimEnd('\'))" "$(SolutionDir)\Artemis.UI\$(OutDir)Plugins\$(ProjectName)" /s /q /i /y</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets')" />
<Import Project="..\packages\SkiaSharp.1.68.2-preview.29\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.2-preview.29\build\net45\SkiaSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.1.1\build\net45\SkiaSharp.targets'))" />
<Error Condition="!Exists('..\packages\SkiaSharp.1.68.2-preview.29\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.2-preview.29\build\net45\SkiaSharp.targets'))" />
</Target>
</Project>
src/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
+9 -7
View File
@@ -48,19 +48,21 @@ namespace Artemis.Plugins.LayerBrushes.Noise
var verticalScale = ScaleProperty.CurrentValue.Height / 400f;
// Scale down the render path to avoid computing a value for every pixel
var width = (int) (path.Bounds.Width * horizontalScale);
var height = (int) (path.Bounds.Height * verticalScale);
var width = Math.Floor(path.Bounds.Width * horizontalScale);
var height = Math.Floor(path.Bounds.Height * verticalScale);
var opacity = (float) Math.Round(mainColor.Alpha / 255.0, 2, MidpointRounding.AwayFromZero);
using (var bitmap = new SKBitmap(new SKImageInfo(width, height)))
using (var bitmap = new SKBitmap(new SKImageInfo((int) width, (int) height)))
{
bitmap.Erase(SKColor.Empty);
for (var x = 0; x < width; x++)
{
for (var y = 0; y < height; y++)
{
var v = _noise.Evaluate(1f / horizontalScale * x, 1f / verticalScale * y, _z);
var alpha = (byte) ((v + 1) * 127 * opacity);
var v = _noise.Evaluate(5 * x / width, 5 * y / height, _z);
var alpha = (byte) Math.Max(0, Math.Min(255, v * 2000));
// var alpha = (byte) ((v + 1) * 127 * opacity);
// There's some fun stuff we can do here, like creating hard lines
// if (alpha > 128)
// alpha = 255;
@@ -71,12 +73,12 @@ namespace Artemis.Plugins.LayerBrushes.Noise
}
var makeTranslation = SKMatrix.MakeTranslation(path.Bounds.Left, path.Bounds.Top);
var makeTranslation = SKMatrix.MakeTranslation(path.Bounds.Left , path.Bounds.Top );
SKMatrix.Concat(ref makeTranslation, makeTranslation, SKMatrix.MakeScale(1f / horizontalScale, 1f / verticalScale));
using (var sh = SKShader.CreateBitmap(bitmap, SKShaderTileMode.Mirror, SKShaderTileMode.Mirror, makeTranslation))
{
paint.FilterQuality = SKFilterQuality.Low;
paint.ImageFilter = SKImageFilter.CreateBlur(2,2);
paint.Shader = SKShader.CreateColor(SecondaryColorProperty.CurrentValue);
canvas.DrawPath(path, paint);
paint.Shader = sh;
src/Artemis.Plugins.LayerBrushes.Noise/packages.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.68.1.1" targetFramework="net472" />
<package id="SkiaSharp" version="1.68.2-preview.29" targetFramework="net472" />
<package id="Stylet" version="1.3.0" targetFramework="net472" />
<package id="System.Buffers" version="4.5.0" targetFramework="net472" />
<package id="System.Memory" version="4.5.3" targetFramework="net472" />