Remove references to System.Drawing in EOLib.Graphics.Test

ethanmoffat · Feb 10, 2022 · a477871 · a477871
1 parent 7745fd4
commit a477871
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 33 deletions.
diff --git a/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj b/EOLib.Graphics.Test/EOLib.Graphics.Test.csproj
@@ -1,13 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <OutputPath>..\bin\$(Configuration)\test\</OutputPath>
-    <NoWarn>CA1416</NoWarn> <!-- TODO: Remove when using cross-platform graphics library instead of System.Drawing -->
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration.Contains(`Debug`))'">
     <DebugSymbols>true</DebugSymbols>
@@ -20,7 +16,8 @@
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
     <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/EOLib.Graphics.Test/GraphicsDeviceTestHelper.cs b/EOLib.Graphics.Test/GraphicsDeviceTestHelper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel.Design;
 using System.Diagnostics.CodeAnalysis;
-using System.Windows.Forms;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
@@ -10,25 +9,15 @@ namespace EOLib.Graphics.Test
     [ExcludeFromCodeCoverage]
     internal sealed class GraphicsDeviceTestHelper : IDisposable
     {
-        private readonly Form _form;
         private readonly Game _game;
-        //private readonly ServiceContainer _serviceContainer;
 
         public GraphicsDeviceManager GraphicsDeviceManager { get; }
 
         public GraphicsDeviceTestHelper()
         {
-            _form = new Form();
             _game = new Game();
             GraphicsDeviceManager = new GraphicsDeviceManager(_game);
             _game.RunOneFrame();
-
-            //var gds = GraphicsDeviceServiceTestHelper.AddRef(_form.Handle, _form.ClientSize.Width, _form.ClientSize.Height);
-
-            //_serviceContainer = new ServiceContainer();
-            //_serviceContainer.AddService(typeof(IGraphicsDeviceService), gds);
-
-            //GraphicsDeviceManager.ApplyChanges();
         }
 
         public void Dispose()
@@ -48,7 +37,6 @@ private void Dispose(bool disposing)
             {
                 GraphicsDeviceManager.Dispose();
                 _game.Dispose();
-                _form.Dispose();
             }
         }
     }

diff --git a/EOLib.Graphics.Test/NativeGraphicsLoaderTest.cs b/EOLib.Graphics.Test/NativeGraphicsLoaderTest.cs
@@ -1,10 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using NUnit.Framework;
 using Moq;
 using PELoaderLib;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Formats.Bmp;
 
 namespace EOLib.Graphics.Test
 {
@@ -60,11 +61,11 @@ public void WhenLoadGFX_EmptyDataArray_ThrowsException()
         private byte[] CreateDataArrayForBitmap()
         {
             byte[] array;
-            using (var retBmp = new Bitmap(10, 10))
+            using (var retBmp = new Image<Rgb24>(10, 10))
             {
                 using (var ms = new MemoryStream())
                 {
-                    retBmp.Save(ms, ImageFormat.Bmp);
+                    retBmp.Save(ms, new BmpEncoder());
                     array = ms.ToArray();
                 }
             }

diff --git a/EOLib.Graphics.Test/NativeGraphicsManagerTest.cs b/EOLib.Graphics.Test/NativeGraphicsManagerTest.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Linq;
 using NUnit.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Moq;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Drawing.Processing;
 
 namespace EOLib.Graphics.Test
 {
@@ -161,7 +163,7 @@ public void WhenLoadTexture_MaleHat_Transparent_SetsSpecialColorToTransparent()
             Texture2D resultTexture;
             using (var bmp = LoadGFXReturnsBitmap(GFXTypes.MaleHat, requestedResource))
             {
-                FillBitmapWithColor(bmp, Color.FromArgb(0xff, 0x08, 0x00, 0x00));
+                FillBitmapWithColor(bmp, Color.FromRgba(0x08, 0x00, 0x00, 0xff));
                 resultTexture = _nativeGraphicsManager.TextureFromResource(GFXTypes.MaleHat, requestedResource, true);
             }
 
@@ -179,7 +181,7 @@ public void WhenLoadTexture_FemaleHat_Transparent_SetsSpecialColorToTransparent(
             Texture2D resultTexture;
             using (var bmp = LoadGFXReturnsBitmap(GFXTypes.FemaleHat, requestedResource))
             {
-                FillBitmapWithColor(bmp, Color.FromArgb(0xff, 0x08, 0x00, 0x00));
+                FillBitmapWithColor(bmp, Color.FromRgba(0x08, 0x00, 0x00, 0xff));
                 resultTexture = _nativeGraphicsManager.TextureFromResource(GFXTypes.FemaleHat, requestedResource, true);
             }
 
@@ -201,9 +203,9 @@ public void WhenLoadTexture_RaceCondition_DisposesExistingCachedTextureAndReturn
             Assert.IsFalse(resultTexture.IsDisposed);
         }
 
-        private Bitmap LoadGFXReturnsBitmap(GFXTypes whichFile, int requestedResource, Action loadCallback = null)
+        private IImage LoadGFXReturnsBitmap(GFXTypes whichFile, int requestedResource, Action loadCallback = null)
         {
-            var bitmapToReturn = new Bitmap(10, 10, PixelFormat.Format24bppRgb);
+            var bitmapToReturn = new Image<Rgba32>(10, 10);
 
             var graphicsLoaderMock = Mock.Get(_graphicsLoader);
             graphicsLoaderMock.Setup(x => x.LoadGFX(whichFile, requestedResource))
@@ -213,11 +215,10 @@ private Bitmap LoadGFXReturnsBitmap(GFXTypes whichFile, int requestedResource, A
             return bitmapToReturn;
         }
 
-        private static void FillBitmapWithColor(Bitmap bitmap, Color color)
+        private static void FillBitmapWithColor(IImage image, Color color)
         {
-            for(int row = 0; row < bitmap.Height; ++row)
-                for (int col = 0; col < bitmap.Width; ++col)
-                    bitmap.SetPixel(col, row, color);
+            var colorBrush = new SolidBrush(color);
+            ((Image)image).Mutate(x => x.Clear(colorBrush));
         }
 
         private void GetTextureAgain(GFXTypes whichFile, int requestedResource)

diff --git a/EOLib.Graphics/EOLib.Graphics.csproj b/EOLib.Graphics/EOLib.Graphics.csproj
@@ -17,6 +17,5 @@
     <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
 </Project>