From d2fa8e490544603581796ccb42f0f5dd830a8135 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 31 May 2020 14:46:13 -0300
Subject: [PATCH] use embedded noise asset.

---
 .../Assets/NoiseAsset_256X256_PNG.png         | Bin 0 -> 3241 bytes
 src/Skia/Avalonia.Skia/Avalonia.Skia.csproj   |   3 ++
 src/Skia/Avalonia.Skia/DrawingContextImpl.cs  |  39 +++++++-----------
 3 files changed, 18 insertions(+), 24 deletions(-)
 create mode 100644 src/Skia/Avalonia.Skia/Assets/NoiseAsset_256X256_PNG.png

diff --git a/src/Skia/Avalonia.Skia/Assets/NoiseAsset_256X256_PNG.png b/src/Skia/Avalonia.Skia/Assets/NoiseAsset_256X256_PNG.png
new file mode 100644
index 0000000000000000000000000000000000000000..41de173d9014b38f8290acf270c490b37fc79a60
GIT binary patch
literal 3241
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
b`zOEvZWw$UQ#roJ00000NkvXXu0mjf_=+mu

literal 0
HcmV?d00001

diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index 68da513528..d5ad70b944 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -7,6 +7,9 @@
     <IncludeLinuxSkia>true</IncludeLinuxSkia>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\NoiseAsset_256X256_PNG.png" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
   </ItemGroup>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 01eddd2aad..63b51dcccb 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -34,6 +34,7 @@ namespace Avalonia.Skia
         private readonly SKPaint _strokePaint = new SKPaint();
         private readonly SKPaint _fillPaint = new SKPaint();
         private readonly SKPaint _boxShadowPaint = new SKPaint();
+        private static SKShader s_acrylicNoiseShader;
 
         /// <summary>
         /// Context create info.
@@ -652,21 +653,6 @@ namespace Avalonia.Skia
             }
         }
 
-        static SKColor SimpleColorBurn(SKColor bg, SKColor fg)
-        {
-            using (var bmp = new SKBitmap(1, 1))
-            {
-                bmp.SetPixel(0, 0, bg);
-                using (var canvas = new SKCanvas(bmp))
-                using (var paint = new SKPaint
-                {
-                    Color = fg
-                })
-                    canvas.DrawRect(-1, -1, 3, 3, paint);
-                return bmp.GetPixel(0, 0);
-            }
-        }
-
         static SKColorFilter CreateAlphaColorFilter(double opacity)
         {
             if (opacity > 1)
@@ -711,19 +697,24 @@ namespace Avalonia.Skia
                     acrylicBrush.BackgroundSource == AcrylicBackgroundSource.Digger ?
                     acrylicBrush.TintOpacity : 1;
 
-                var noiseOpcity = 0.06 * brush.Opacity;
+                const double noiseOpcity = 0.06;
 
-                var tintColor = acrylicBrush.TintColor;
-                var excl = new SKColor(255, 255, 255, (byte)(255 * 0.1));
-                var tint = new SKColor(tintColor.R, tintColor.G, tintColor.B, (byte)(255 * ((tintColor.A / 255.0) * acrylicBrush.Opacity)));
+                var tintColor = acrylicBrush.TintColor;                
+                var tint = new SKColor(tintColor.R, tintColor.G, tintColor.B, (byte)(255 * ((tintColor.A / 255.0) * acrylicBrush.Opacity)));                
+                
+                if(s_acrylicNoiseShader == null)
+                {
+                    using(var stream = typeof(DrawingContextImpl).Assembly.GetManifestResourceStream("Avalonia.Skia.Assets.NoiseAsset_256X256_PNG.png"))
+                    using (var bitmap = SKBitmap.Decode(stream))
+                    {
+                        s_acrylicNoiseShader = SKShader.CreateBitmap(bitmap, SKShaderTileMode.Repeat, SKShaderTileMode.Repeat)
+                            .WithColorFilter(CreateAlphaColorFilter(noiseOpcity));
+                    }
 
-                tint = SimpleColorBurn(excl, tint);
+                }
 
                 using (var tintShader = SKShader.CreateColor(tint))
-                using (var noiseShader =
-                    SKShader.CreatePerlinNoiseTurbulence(15.876f, 15.876f, 2, 0.76829314f)
-                    .WithColorFilter(CreateAlphaColorFilter(noiseOpcity)))
-                using (var compose = SKShader.CreateCompose(tintShader, noiseShader))
+                using (var compose = SKShader.CreateCompose(tintShader, s_acrylicNoiseShader))
                 {
                     paint.Shader = compose;