Return to ImageSharp

coz the perfomance issue was fixed by Perfare in later commits

AssetStudioGUI/AssetStudioGUIForm.cs

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.Drawing.Text;
 using System.Globalization;
 using System.IO;
@@ -19,8 +18,6 @@ using System.Timers;
 using System.Windows.Forms;
 using static AssetStudioGUI.Studio;
 using Font = AssetStudio.Font;
-using ImageFormat = AssetStudio.ImageFormat;
-using PixelFormat = System.Drawing.Imaging.PixelFormat;
 #if NET472
 using Vector3 = OpenTK.Vector3;
 using Vector4 = OpenTK.Vector4;
@@ -35,7 +32,7 @@ namespace AssetStudioGUI
     partial class AssetStudioGUIForm : Form
     {
         private AssetItem lastSelectedItem;
-        private Bitmap imageTexture;
+        private DirectBitmap imageTexture;
         private string tempClipboard;
 
         private FMOD.System system;
@@ -397,7 +394,7 @@ namespace AssetStudioGUI
                         {
                             if (enablePreview.Checked && imageTexture != null)
                             {
-                                previewPanel.BackgroundImage = imageTexture;
+                                previewPanel.BackgroundImage = imageTexture.Bitmap;
                             }
                             else
                             {
@@ -769,9 +766,11 @@ namespace AssetStudioGUI
 
         private void PreviewTexture2D(AssetItem assetItem, Texture2D m_Texture2D)
         {
-            var bitmap = m_Texture2D.ConvertToBitmap(true);
+            var image = m_Texture2D.ConvertToImage(true);
-            if (bitmap != null)
+            if (image != null)
             {
+                var bitmap = new DirectBitmap(image.ConvertToBgra32Bytes(), m_Texture2D.m_Width, m_Texture2D.m_Height);
+                image.Dispose();
                 assetItem.InfoText = $"Width: {m_Texture2D.m_Width}\nHeight: {m_Texture2D.m_Height}\nFormat: {m_Texture2D.m_TextureFormat}";
                 switch (m_Texture2D.m_TextureSettings.m_FilterMode)
                 {
@@ -799,13 +798,11 @@ namespace AssetStudioGUI
                     assetItem.InfoText += "None";
                 if (validChannel != 4)
                 {
-                    var bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+                    var bytes = bitmap.Bits;
-                    var bytes = new byte[bitmap.Width * bitmap.Height * 4];
+                    for (int i = 0; i < bitmap.Height; i++)
-                    Marshal.Copy(bmpData.Scan0, bytes, 0, bytes.Length);
-                    Parallel.For(0, bmpData.Height, i =>
                     {
-                        int offset = Math.Abs(bmpData.Stride) * i;
+                        int offset = Math.Abs(bitmap.Stride) * i;
-                        for (int j = 0; j < bmpData.Width; j++)
+                        for (int j = 0; j < bitmap.Width; j++)
                         {
                             bytes[offset] = textureChannels[0] ? bytes[offset] : validChannel == 1 && textureChannels[3] ? byte.MaxValue : byte.MinValue;
                             bytes[offset + 1] = textureChannels[1] ? bytes[offset + 1] : validChannel == 1 && textureChannels[3] ? byte.MaxValue : byte.MinValue;
@@ -813,9 +810,7 @@ namespace AssetStudioGUI
                             bytes[offset + 3] = textureChannels[3] ? bytes[offset + 3] : byte.MaxValue;
                             offset += 4;
                         }
-                    });
+                    }
-                    Marshal.Copy(bytes, 0, bmpData.Scan0, bytes.Length);
-                    bitmap.UnlockBits(bmpData);
                 }
                 PreviewTexture(bitmap);
 
@@ -1179,9 +1174,11 @@ namespace AssetStudioGUI
 
         private void PreviewSprite(AssetItem assetItem, Sprite m_Sprite)
         {
-            var bitmap = m_Sprite.GetImage();
+            var image = m_Sprite.GetImage();
-            if (bitmap != null)
+            if (image != null)
             {
+                var bitmap = new DirectBitmap(image.ConvertToBgra32Bytes(), image.Width, image.Height);
+                image.Dispose();
                 assetItem.InfoText = $"Width: {bitmap.Width}\nHeight: {bitmap.Height}\n";
                 PreviewTexture(bitmap);
             }
@@ -1191,11 +1188,11 @@ namespace AssetStudioGUI
             }
         }
 
-        private void PreviewTexture(Bitmap bitmap)
+        private void PreviewTexture(DirectBitmap bitmap)
         {
             imageTexture?.Dispose();
             imageTexture = bitmap;
-            previewPanel.BackgroundImage = imageTexture;
+            previewPanel.BackgroundImage = imageTexture.Bitmap;
             if (imageTexture.Width > previewPanel.Width || imageTexture.Height > previewPanel.Height)
                 previewPanel.BackgroundImageLayout = ImageLayout.Zoom;
             else

AssetStudioGUI/DirectBitmap.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Runtime.InteropServices;
+
+namespace AssetStudioGUI
+{
+    public sealed class DirectBitmap : IDisposable
+    {
+        public DirectBitmap(byte[] buff, int width, int height)
+        {
+            Width = width;
+            Height = height;
+            Bits = buff;
+            m_handle = GCHandle.Alloc(Bits, GCHandleType.Pinned);
+            m_bitmap = new Bitmap(Width, Height, Stride, PixelFormat.Format32bppArgb, m_handle.AddrOfPinnedObject());
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                m_bitmap.Dispose();
+                m_handle.Free();
+            }
+            m_bitmap = null;
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        public int Height { get; }
+        public int Width { get; }
+        public int Stride => Width * 4;
+        public byte[] Bits { get; }
+        public Bitmap Bitmap => m_bitmap;
+
+        private Bitmap m_bitmap;
+        private readonly GCHandle m_handle;
+    }
+}

AssetStudioGUI/Exporter.cs

@@ -17,12 +17,15 @@ namespace AssetStudioGUI
                 var type = Properties.Settings.Default.convertType;
                 if (!TryExportFile(exportPath, item, "." + type.ToString().ToLower(), out var exportFullPath))
                     return false;
-                var stream = m_Texture2D.ConvertToStream(type, true);
+                var image = m_Texture2D.ConvertToImage(true);
-                if (stream == null)
+                if (image == null)
                     return false;
-                using (stream)
+                using (image)
                 {
-                    File.WriteAllBytes(exportFullPath, stream.ToArray());
+                    using (var file = File.OpenWrite(exportFullPath))
+                    {
+                        image.WriteToStream(file, type);
+                    }
                     return true;
                 }
             }
@@ -230,12 +233,15 @@ namespace AssetStudioGUI
             var type = Properties.Settings.Default.convertType;
             if (!TryExportFile(exportPath, item, "." + type.ToString().ToLower(), out var exportFullPath))
                 return false;
-            var stream = ((Sprite)item.Asset).GetImage(type);
+            var image = ((Sprite)item.Asset).GetImage();
-            if (stream != null)
+            if (image != null)
             {
-                using (stream)
+                using (image)
                 {
-                    File.WriteAllBytes(exportFullPath, stream.ToArray());
+                    using (var file = File.OpenWrite(exportFullPath))
+                    {
+                        image.WriteToStream(file, type);
+                    }
                     return true;
                 }
             }

AssetStudioUtility/AssetStudioUtility.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="0.11.3" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
   </ItemGroup>
 
   <ItemGroup>

AssetStudioUtility/ImageExtensions.cs

@@ -1,32 +1,55 @@
-using System.Drawing;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Bmp;
+using SixLabors.ImageSharp.Formats.Tga;
+using SixLabors.ImageSharp.PixelFormats;
 using System.IO;
-using TGASharpLib;
+using System.Runtime.InteropServices;
 
 namespace AssetStudio
 {
     public static class ImageExtensions
     {
-        public static MemoryStream ConvertToStream(this Bitmap image, ImageFormat imageFormat)
+        public static void WriteToStream(this Image image, Stream stream, ImageFormat imageFormat)
         {
-            var outputStream = new MemoryStream();
             switch (imageFormat)
             {
                 case ImageFormat.Jpeg:
-                    image.Save(outputStream, System.Drawing.Imaging.ImageFormat.Jpeg);
+                    image.SaveAsJpeg(stream);
                     break;
                 case ImageFormat.Png:
-                    image.Save(outputStream, System.Drawing.Imaging.ImageFormat.Png);
+                    image.SaveAsPng(stream);
                     break;
                 case ImageFormat.Bmp:
-                    image.Save(outputStream, System.Drawing.Imaging.ImageFormat.Bmp);
+                    image.Save(stream, new BmpEncoder
+                    {
+                        BitsPerPixel = BmpBitsPerPixel.Pixel32,
+                        SupportTransparency = true
+                    });
                     break;
                 case ImageFormat.Tga:
-                    var tga = new TGA(image);
+                    image.Save(stream, new TgaEncoder
-                    tga.Save(outputStream);
+                    {
+                        BitsPerPixel = TgaBitsPerPixel.Pixel32,
+                        Compression = TgaCompression.None
+                    });
                     break;
             }
-            image.Dispose();
+        }
-            return outputStream;
+
+        public static MemoryStream ConvertToStream(this Image image, ImageFormat imageFormat)
+        {
+            var stream = new MemoryStream();
+            image.WriteToStream(stream, imageFormat);
+            return stream;
+        }
+
+        public static byte[] ConvertToBgra32Bytes(this Image<Bgra32> image)
+        {
+            if (image.TryGetSinglePixelSpan(out var pixelSpan))
+            {
+                return MemoryMarshal.AsBytes(pixelSpan).ToArray();
+            }
+            return null;
         }
     }
 }

AssetStudioUtility/SpriteHelper.cs

@@ -1,29 +1,19 @@
-using System.Collections.Generic;
+using SixLabors.ImageSharp;
-using System.Drawing;
+using SixLabors.ImageSharp.Drawing;
-using System.Drawing.Drawing2D;
+using SixLabors.ImageSharp.Drawing.Processing;
-using System.Drawing.Imaging;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Numerics;
 
 namespace AssetStudio
 {
     public static class SpriteHelper
     {
-        public static MemoryStream GetImage(this Sprite m_Sprite, ImageFormat imageFormat)
+        public static Image<Bgra32> GetImage(this Sprite m_Sprite)
-        {
-            var image = GetImage(m_Sprite);
-            if (image != null)
-            {
-                using (image)
-                {
-                    return image.ConvertToStream(imageFormat);
-                }
-            }
-            return null;
-        }
-
-        public static Bitmap GetImage(this Sprite m_Sprite)
         {
             if (m_Sprite.m_SpriteAtlas != null && m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlas))
             {
@@ -42,9 +32,9 @@ namespace AssetStudio
             return null;
         }
 
-        private static Bitmap CutImage(Texture2D m_Texture2D, Sprite m_Sprite, Rectf textureRect, Vector2 textureRectOffset, SpriteSettings settingsRaw)
+        private static Image<Bgra32> CutImage(Texture2D m_Texture2D, Sprite m_Sprite, Rectf textureRect, Vector2 textureRectOffset, SpriteSettings settingsRaw)
         {
-            var originalImage = m_Texture2D.ConvertToBitmap(false);
+            var originalImage = m_Texture2D.ConvertToImage(false);
             if (originalImage != null)
             {
                 using (originalImage)
@@ -56,29 +46,23 @@ namespace AssetStudio
                     rectRight = Math.Min(rectRight, m_Texture2D.m_Width);
                     rectBottom = Math.Min(rectBottom, m_Texture2D.m_Height);
                     var rect = new Rectangle(rectX, rectY, rectRight - rectX, rectBottom - rectY);
-
+                    var spriteImage = originalImage.Clone(x => x.Crop(rect));
-                    var spriteImage = new Bitmap(rect.Width, rect.Height, PixelFormat.Format32bppArgb);
-                    var destRect = new Rectangle(0, 0, rect.Width, rect.Height);
-                    using (var graphic = Graphics.FromImage(spriteImage))
-                    {
-                        graphic.DrawImage(originalImage, destRect, rect, GraphicsUnit.Pixel);
-                    }
                     if (settingsRaw.packed == 1)
                     {
                         //RotateAndFlip
                         switch (settingsRaw.packingRotation)
                         {
                             case SpritePackingRotation.kSPRFlipHorizontal:
-                                spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipX);
+                                spriteImage.Mutate(x => x.Flip(FlipMode.Horizontal));
                                 break;
                             case SpritePackingRotation.kSPRFlipVertical:
-                                spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                                spriteImage.Mutate(x => x.Flip(FlipMode.Vertical));
                                 break;
                             case SpritePackingRotation.kSPRRotate180:
-                                spriteImage.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                                spriteImage.Mutate(x => x.Rotate(180));
                                 break;
                             case SpritePackingRotation.kSPRRotate90:
-                                spriteImage.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                                spriteImage.Mutate(x => x.Rotate(270));
                                 break;
                         }
                     }
@@ -89,40 +73,27 @@ namespace AssetStudio
                         try
                         {
                             var triangles = GetTriangles(m_Sprite.m_RD);
-                            var points = triangles.Select(x => x.Select(y => new PointF(y.X, y.Y)).ToArray());
+                            var polygons = triangles.Select(x => new Polygon(new LinearLineSegment(x.Select(y => new PointF(y.X, y.Y)).ToArray()))).ToArray();
-                            using (var path = new GraphicsPath())
+                            IPathCollection path = new PathCollection(polygons);
+                            var matrix = Matrix3x2.CreateScale(m_Sprite.m_PixelsToUnits);
+                            matrix *= Matrix3x2.CreateTranslation(m_Sprite.m_Rect.width * m_Sprite.m_Pivot.X - textureRectOffset.X, m_Sprite.m_Rect.height * m_Sprite.m_Pivot.Y - textureRectOffset.Y);
+                            path = path.Transform(matrix);
+                            var graphicsOptions = new GraphicsOptions
                             {
-                                foreach (var p in points)
+                                Antialias = false,
-                                {
+                                AlphaCompositionMode = PixelAlphaCompositionMode.DestOut
-                                    path.AddPolygon(p);
+                            };
-                                }
+                            var options = new DrawingOptions
-                                using (var matr = new Matrix())
+                            {
-                                {
+                                GraphicsOptions = graphicsOptions
-                                    var version = m_Sprite.version;
+                            };
-                                    if (version[0] < 5
+                            using (var mask = new Image<Bgra32>(rect.Width, rect.Height, SixLabors.ImageSharp.Color.Black))
-                                       || (version[0] == 5 && version[1] < 4)
+                            {
-                                       || (version[0] == 5 && version[1] == 4 && version[2] <= 1)) //5.4.1p3 down
+                                mask.Mutate(x => x.Fill(options, SixLabors.ImageSharp.Color.Red, path));
-                                    {
+                                var bursh = new ImageBrush(mask);
-                                        matr.Translate(m_Sprite.m_Rect.width * 0.5f - textureRectOffset.X, m_Sprite.m_Rect.height * 0.5f - textureRectOffset.Y);
+                                spriteImage.Mutate(x => x.Fill(graphicsOptions, bursh));
-                                    }
+                                spriteImage.Mutate(x => x.Flip(FlipMode.Vertical));
-                                    else
+                                return spriteImage;
-                                    {
-                                        matr.Translate(m_Sprite.m_Rect.width * m_Sprite.m_Pivot.X - textureRectOffset.X, m_Sprite.m_Rect.height * m_Sprite.m_Pivot.Y - textureRectOffset.Y);
-                                    }
-                                    matr.Scale(m_Sprite.m_PixelsToUnits, m_Sprite.m_PixelsToUnits);
-                                    path.Transform(matr);
-                                    var bitmap = new Bitmap(rect.Width, rect.Height);
-                                    using (var graphic = Graphics.FromImage(bitmap))
-                                    {
-                                        using (var brush = new TextureBrush(spriteImage))
-                                        {
-                                            graphic.FillPath(brush, path);
-                                            bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                                            spriteImage.Dispose();
-                                            return bitmap;
-                                        }
-                                    }
-                                }
                             }
                         }
                         catch
@@ -132,7 +103,7 @@ namespace AssetStudio
                     }
 
                     //Rectangle
-                    spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                    spriteImage.Mutate(x => x.Flip(FlipMode.Vertical));
                     return spriteImage;
                 }
             }

AssetStudioUtility/Texture2DExtensions.cs

@@ -1,41 +1,38 @@
-using System.Drawing;
+using SixLabors.ImageSharp;
-using System.Drawing.Imaging;
+using SixLabors.ImageSharp.PixelFormats;
-using System.Runtime.InteropServices;
+using SixLabors.ImageSharp.Processing;
 using System.IO;
 
 namespace AssetStudio
 {
     public static class Texture2DExtensions
     {
-        public static Bitmap ConvertToBitmap(this Texture2D m_Texture2D, bool flip)
+        public static Image<Bgra32> ConvertToImage(this Texture2D m_Texture2D, bool flip)
         {
             var converter = new Texture2DConverter(m_Texture2D);
-            var bytes = BigArrayPool<byte>.Shared.Rent(m_Texture2D.m_Width * m_Texture2D.m_Height * 4);
+            var buff = BigArrayPool<byte>.Shared.Rent(m_Texture2D.m_Width * m_Texture2D.m_Height * 4);
             try
             {
-                if (converter.DecodeTexture2D(bytes))
+                if (converter.DecodeTexture2D(buff))
                 {
-                    var bitmap = new Bitmap(m_Texture2D.m_Width, m_Texture2D.m_Height, PixelFormat.Format32bppArgb);
+                    var image = Image.LoadPixelData<Bgra32>(buff, m_Texture2D.m_Width, m_Texture2D.m_Height);
-                    var bmpData = bitmap.LockBits(new Rectangle(0, 0, m_Texture2D.m_Width, m_Texture2D.m_Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-                    Marshal.Copy(bytes, 0, bmpData.Scan0, bitmap.Width * bitmap.Height * 4);
-                    bitmap.UnlockBits(bmpData);
                     if (flip)
                     {
-                        bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                        image.Mutate(x => x.Flip(FlipMode.Vertical));
                     }
-                    return bitmap;
+                    return image;
                 }
                 return null;
             }
             finally
             {
-                BigArrayPool<byte>.Shared.Return(bytes);
+                BigArrayPool<byte>.Shared.Return(buff);
             }
         }
 
         public static MemoryStream ConvertToStream(this Texture2D m_Texture2D, ImageFormat imageFormat, bool flip)
         {
-            var image = ConvertToBitmap(m_Texture2D, flip);
+            var image = ConvertToImage(m_Texture2D, flip);
             if (image != null)
             {
                 using (image)