Browse Source

Removed all Skia leftovers

flabbet 2 years ago
parent
commit
026bbed660
35 changed files with 11 additions and 88 deletions
  1. 0 1
      src/ChunkyImageLib/DataHolders/ShapeData.cs
  2. 0 1
      src/ChunkyImageLib/Operations/ClearPathOperation.cs
  3. 0 1
      src/ChunkyImageLib/Shaders/ShaderUtils.cs
  4. 1 3
      src/PixiEditor.ChangeableDocument/Changeables/Document.cs
  5. 0 1
      src/PixiEditor.ChangeableDocument/Changeables/ReferenceLayer.cs
  6. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/ChangeBrightness_UpdateableChange.cs
  7. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/ClearSelectedArea_Change.cs
  8. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/FloodFill/FloodFillChunkCache.cs
  9. 0 2
      src/PixiEditor.ChangeableDocument/Changes/Drawing/FloodFill/FloodFillHelper.cs
  10. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/FloodFill/FloodFill_Change.cs
  11. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/LineBasedPen_UpdateableChange.cs
  12. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/PathBasedPen_UpdateableChange.cs
  13. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/PixelPerfectPen_UpdateableChange.cs
  14. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Drawing/TransformSelectedArea_UpdateableChange.cs
  15. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Root/ResizeImage_Change.cs
  16. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Selection/SelectEllipse_UpdateableChange.cs
  17. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Selection/SelectLasso_UpdateableChange.cs
  18. 0 2
      src/PixiEditor.ChangeableDocument/Changes/Selection/SelectRectangle_UpdateableChange.cs
  19. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Selection/SelectionChangeHelper.cs
  20. 0 1
      src/PixiEditor.ChangeableDocument/Changes/Selection/TransformSelectionPath_UpdateableChange.cs
  21. 1 6
      src/PixiEditor.ChangeableDocument/Changes/Structure/DuplicateLayer_Change.cs
  22. 0 1
      src/PixiEditor.ChangeableDocument/Enums/SelectionModeEx.cs
  23. 0 1
      src/PixiEditor.ChangeableDocument/Rendering/ChunkRenderer.cs
  24. 0 3
      src/PixiEditor.DrawingApi.Core/Numerics/Matrix3X3.cs
  25. 2 33
      src/PixiEditor.DrawingApi.Core/Numerics/VecD.cs
  26. 0 4
      src/PixiEditor.DrawingApi.Core/PixiEditor.DrawingApi.Core.csproj
  27. 0 1
      src/PixiEditor.DrawingApi.Core/Surface/Canvas.cs
  28. 1 3
      src/PixiEditor.DrawingApi.Core/Surface/ImageData/ColorType.cs
  29. 0 1
      src/PixiEditor.DrawingApi.Core/Surface/ImageData/ImgData.cs
  30. 0 1
      src/PixiEditor.DrawingApi.Core/Surface/PaintImpl/Paint.cs
  31. 0 1
      src/PixiEditor.DrawingApi.Core/Surface/Pixmap.cs
  32. 1 3
      src/PixiEditor.DrawingApi.Core/Surface/Vector/VectorPath.cs
  33. 0 6
      src/PixiEditor.DrawingApi.Skia/Class1.cs
  34. 4 0
      src/PixiEditor.DrawingApi.Skia/PixiEditor.DrawingApi.Skia.csproj
  35. 1 0
      src/PixiEditor/PixiEditor.csproj

+ 0 - 1
src/ChunkyImageLib/DataHolders/ShapeData.cs

@@ -1,7 +1,6 @@
 using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 
 namespace ChunkyImageLib.DataHolders;
 

+ 0 - 1
src/ChunkyImageLib/Operations/ClearPathOperation.cs

@@ -1,7 +1,6 @@
 using ChunkyImageLib.DataHolders;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace ChunkyImageLib.Operations;
 internal class ClearPathOperation : IDrawOperation

+ 0 - 1
src/ChunkyImageLib/Shaders/ShaderUtils.cs

@@ -1,6 +1,5 @@
 using ComputeSharp;
 using PixiEditor.DrawingApi.Core.ColorsImpl;
-using SkiaSharp;
 
 namespace ChunkyImageLib.Shaders;
 

+ 1 - 3
src/PixiEditor.ChangeableDocument/Changeables/Document.cs

@@ -1,8 +1,6 @@
-using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using PixiEditor.ChangeableDocument.Changeables.Interfaces;
 using PixiEditor.DrawingApi.Core.Numerics;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changeables;
 

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changeables/ReferenceLayer.cs

@@ -1,5 +1,4 @@
 using PixiEditor.ChangeableDocument.Changeables.Interfaces;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changeables;
 

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/ChangeBrightness_UpdateableChange.cs

@@ -1,7 +1,6 @@
 using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing;
 

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/ClearSelectedArea_Change.cs

@@ -1,5 +1,4 @@
 using PixiEditor.DrawingApi.Core.Numerics;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing;
 internal class ClearSelectedArea_Change : Change

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/FloodFill/FloodFillChunkCache.cs

@@ -2,7 +2,6 @@
 using PixiEditor.ChangeableDocument.Rendering;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing.FloodFill;
 

+ 0 - 2
src/PixiEditor.ChangeableDocument/Changes/Drawing/FloodFill/FloodFillHelper.cs

@@ -1,8 +1,6 @@
 using System.Runtime.CompilerServices;
 using ChunkyImageLib.Operations;
 using PixiEditor.ChangeableDocument.Changeables.Interfaces;
-using SkiaSharp;
-using ChunkyImageLib;
 using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/FloodFill/FloodFill_Change.cs

@@ -1,7 +1,6 @@
 using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing.FloodFill;
 

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/LineBasedPen_UpdateableChange.cs

@@ -1,7 +1,6 @@
 using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing;
 internal class LineBasedPen_UpdateableChange : UpdateableChange

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/PathBasedPen_UpdateableChange.cs

@@ -2,7 +2,6 @@
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing;
 internal class PathBasedPen_UpdateableChange : UpdateableChange

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/PixelPerfectPen_UpdateableChange.cs

@@ -2,7 +2,6 @@
 using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing;
 

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Drawing/TransformSelectedArea_UpdateableChange.cs

@@ -3,7 +3,6 @@ using PixiEditor.ChangeableDocument.Changes.Selection;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Drawing;
 internal class TransformSelectedArea_UpdateableChange : UpdateableChange

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Root/ResizeImage_Change.cs

@@ -2,7 +2,6 @@
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 using BlendMode = PixiEditor.DrawingApi.Core.Surface.BlendMode;
 
 namespace PixiEditor.ChangeableDocument.Changes.Root;

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Selection/SelectEllipse_UpdateableChange.cs

@@ -1,7 +1,6 @@
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Selection;
 

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Selection/SelectLasso_UpdateableChange.cs

@@ -1,6 +1,5 @@
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
-using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
 
 namespace PixiEditor.ChangeableDocument.Changes.Selection;

+ 0 - 2
src/PixiEditor.ChangeableDocument/Changes/Selection/SelectRectangle_UpdateableChange.cs

@@ -1,8 +1,6 @@
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
-using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Selection;
 

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Selection/SelectionChangeHelper.cs

@@ -1,7 +1,6 @@
 using ChunkyImageLib.Operations;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Selection;
 internal class SelectionChangeHelper

+ 0 - 1
src/PixiEditor.ChangeableDocument/Changes/Selection/TransformSelectionPath_UpdateableChange.cs

@@ -1,6 +1,5 @@
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Changes.Selection;
 internal class TransformSelectionPath_UpdateableChange : UpdateableChange

+ 1 - 6
src/PixiEditor.ChangeableDocument/Changes/Structure/DuplicateLayer_Change.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using PixiEditor.ChangeableDocument.ChangeInfos.Structure;
+using PixiEditor.ChangeableDocument.ChangeInfos.Structure;
 
 namespace PixiEditor.ChangeableDocument.Changes.Structure;
 internal class DuplicateLayer_Change : Change

+ 0 - 1
src/PixiEditor.ChangeableDocument/Enums/SelectionModeEx.cs

@@ -1,5 +1,4 @@
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Enums;
 internal static class SelectionModeEx

+ 0 - 1
src/PixiEditor.ChangeableDocument/Rendering/ChunkRenderer.cs

@@ -2,7 +2,6 @@
 using PixiEditor.ChangeableDocument.Changeables.Interfaces;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 
 namespace PixiEditor.ChangeableDocument.Rendering;
 

+ 0 - 3
src/PixiEditor.DrawingApi.Core/Numerics/Matrix3X3.cs

@@ -1,8 +1,5 @@
 using System;
-using System.ComponentModel;
 using PixiEditor.DrawingApi.Core.Bridge;
-using PixiEditor.DrawingApi.Core.Surface;
-using SkiaSharp;
 
 namespace PixiEditor.DrawingApi.Core.Numerics;
 

+ 2 - 33
src/PixiEditor.DrawingApi.Core/Numerics/VecD.cs

@@ -1,5 +1,4 @@
 using System;
-using SkiaSharp;
 
 namespace PixiEditor.DrawingApi.Core.Numerics;
 
@@ -183,42 +182,12 @@ public struct VecD : IEquatable<VecD>
     {
         return !(a.X == b.X && a.Y == b.Y);
     }
-    public static implicit operator VecD(SKPoint point)
-    {
-        return new VecD(point.X, point.Y);
-    }
-    public static implicit operator VecD(SKSize size)
-    {
-        return new VecD(size.Width, size.Height);
-    }
-    public static implicit operator VecD(SKPointI point)
-    {
-        return new VecD(point.X, point.Y);
-    }
-    public static implicit operator VecD(SKSizeI size)
-    {
-        return new VecD(size.Width, size.Height);
-    }
+
     public static explicit operator VecI(VecD vec)
     {
         return new VecI((int)vec.X, (int)vec.Y);
     }
-    public static explicit operator SKPointI(VecD vec)
-    {
-        return new SKPointI((int)vec.X, (int)vec.Y);
-    }
-    public static explicit operator SKPoint(VecD vec)
-    {
-        return new SKPoint((float)vec.X, (float)vec.Y);
-    }
-    public static explicit operator SKSizeI(VecD vec)
-    {
-        return new SKSizeI((int)vec.X, (int)vec.Y);
-    }
-    public static explicit operator SKSize(VecD vec)
-    {
-        return new SKSize((float)vec.X, (float)vec.Y);
-    }
+    
     public static implicit operator VecD((double, double) tuple)
     {
         return new VecD(tuple.Item1, tuple.Item2);

+ 0 - 4
src/PixiEditor.DrawingApi.Core/PixiEditor.DrawingApi.Core.csproj

@@ -6,8 +6,4 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.3" />
-  </ItemGroup>
 </Project>

+ 0 - 1
src/PixiEditor.DrawingApi.Core/Surface/Canvas.cs

@@ -3,7 +3,6 @@ using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
-using SkiaSharp;
 
 namespace PixiEditor.DrawingApi.Core.Surface
 {

+ 1 - 3
src/PixiEditor.DrawingApi.Core/Surface/ImageData/ColorType.cs

@@ -1,6 +1,4 @@
-using SkiaSharp;
-
-namespace PixiEditor.DrawingApi.Core.Surface.ImageData;
+namespace PixiEditor.DrawingApi.Core.Surface.ImageData;
 
 /// <summary>Describes how to interpret the components of a pixel.</summary>
 public enum ColorType

+ 0 - 1
src/PixiEditor.DrawingApi.Core/Surface/ImageData/ImgData.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using PixiEditor.DrawingApi.Core.Bridge;
-using SkiaSharp;
 
 namespace PixiEditor.DrawingApi.Core.Surface.ImageData;
 

+ 0 - 1
src/PixiEditor.DrawingApi.Core/Surface/PaintImpl/Paint.cs

@@ -1,7 +1,6 @@
 using System;
 using PixiEditor.DrawingApi.Core.Bridge;
 using PixiEditor.DrawingApi.Core.ColorsImpl;
-using SkiaSharp;
 
 namespace PixiEditor.DrawingApi.Core.Surface
 {

+ 0 - 1
src/PixiEditor.DrawingApi.Core/Surface/Pixmap.cs

@@ -1,7 +1,6 @@
 using System;
 using PixiEditor.DrawingApi.Core.Bridge;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
-using SkiaSharp;
 
 namespace PixiEditor.DrawingApi.Core.Surface;
 

+ 1 - 3
src/PixiEditor.DrawingApi.Core/Surface/Vector/VectorPath.cs

@@ -1,7 +1,5 @@
-using System;
-using PixiEditor.DrawingApi.Core.Bridge;
+using PixiEditor.DrawingApi.Core.Bridge;
 using PixiEditor.DrawingApi.Core.Numerics;
-using SkiaSharp;
 
 namespace PixiEditor.DrawingApi.Core.Surface.Vector;
 

+ 0 - 6
src/PixiEditor.DrawingApi.Skia/Class1.cs

@@ -1,6 +0,0 @@
-using System;
-
-namespace PixiEditor.DrawingApi.Skia
-{
-    
-}

+ 4 - 0
src/PixiEditor.DrawingApi.Skia/PixiEditor.DrawingApi.Skia.csproj

@@ -5,4 +5,8 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
+    <ItemGroup>
+      <PackageReference Include="SkiaSharp" Version="2.80.3" />
+    </ItemGroup>
+
 </Project>

+ 1 - 0
src/PixiEditor/PixiEditor.csproj

@@ -18,6 +18,7 @@
 		<Platforms>AnyCPU;x64;x86</Platforms>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
         <ImplicitUsings>true</ImplicitUsings>
+        <AssemblyVersion></AssemblyVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MSIX|AnyCPU'">