improve Sprite export

AssetStudio/Classes/Mesh.cs

@@ -568,6 +568,7 @@ namespace AssetStudio
 
                 //actual Vertex Buffer
                 var m_DataSize = reader.ReadBytes(reader.ReadInt32());
+                reader.AlignStream(4);
                 #endregion
 
                 #region compute FvF

AssetStudio/Classes/Sprite.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text;
+using SharpDX;
+using RectangleF = System.Drawing.RectangleF;
 
 namespace AssetStudio
 {
@@ -25,18 +27,20 @@ namespace AssetStudio
     {
         public uint settingsRaw;
 
-        public uint packed => settingsRaw & 1; //1
+        public uint packed;
-        public SpritePackingMode packingMode => (SpritePackingMode)((settingsRaw >> 1) & 1); //1
+        public SpritePackingMode packingMode;
-        public SpritePackingRotation packingRotation => (SpritePackingRotation)((settingsRaw >> 2) & 0xf); //4
+        public SpritePackingRotation packingRotation;
-        public uint reserved => settingsRaw >> 6; //26
-        /*
-         *public uint meshType => (settingsRaw >> 6) & 1; //1
-         *public uint reserved => settingsRaw >> 7; //25
-         */
 
         public SpriteSettings(ObjectReader reader)
         {
             settingsRaw = reader.ReadUInt32();
+
+            packed = settingsRaw & 1; //1
+            packingMode = (SpritePackingMode)((settingsRaw >> 1) & 1); //1
+            packingRotation = (SpritePackingRotation)((settingsRaw >> 2) & 0xf); //4
+
+            //meshType = (settingsRaw >> 6) & 1; //1
+            //reserved
         }
     }
 
@@ -44,18 +48,18 @@ namespace AssetStudio
     {
         public RectangleF m_Rect;
         public float m_PixelsToUnits;
-        public PointF m_Pivot;
+        public Vector2 m_Pivot;
-        public Guid first;
+        public Tuple<Guid, long> m_RenderDataKey;
         public PPtr texture;
         public PPtr m_SpriteAtlas;
         public RectangleF textureRect;
         public SpriteSettings settingsRaw;
-        public PointF[][] m_PhysicsShape;
+        public PointF[][] m_PhysicsShape; //Vector2[][]
 
         public Sprite(ObjectReader reader) : base(reader)
         {
             //Rectf m_Rect
-            m_Rect = new RectangleF(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+            m_Rect = reader.ReadRectangleF();
             //Vector2f m_Offset
             reader.Position += 8;
             if (version[0] > 4 || (version[0] == 4 && version[1] >= 5)) //4.5 and up
@@ -70,7 +74,7 @@ namespace AssetStudio
                 || (version[0] == 5 && version[1] == 4 && version[2] >= 2)) //5.4.2 and up
             {
                 //Vector2f m_Pivot
-                m_Pivot = new PointF(reader.ReadSingle(), reader.ReadSingle());
+                m_Pivot = reader.ReadVector2();
             }
 
             var m_Extrude = reader.ReadUInt32();
@@ -83,8 +87,9 @@ namespace AssetStudio
             if (version[0] >= 2017) //2017 and up
             {
                 //pair m_RenderDataKey
-                first = new Guid(reader.ReadBytes(16));
+                var first = new Guid(reader.ReadBytes(16));
                 var second = reader.ReadInt64();
+                m_RenderDataKey = new Tuple<Guid, long>(first, second);
                 //vector m_AtlasTags
                 var size = reader.ReadInt32();
                 for (int i = 0; i < size; i++)
@@ -100,7 +105,7 @@ namespace AssetStudio
             //  PPtr<Texture2D> texture
             texture = reader.ReadPPtr();
             //  PPtr<Texture2D> alphaTexture
-            if (version[0] >= 5) //5.0 and up
+            if (version[0] > 5 || (version[0] == 5 && version[1] >= 2)) //5.2 and up
             {
                 var alphaTexture = reader.ReadPPtr();
             }
@@ -171,7 +176,7 @@ namespace AssetStudio
             }
 
             //  Rectf textureRect
-            textureRect = new RectangleF(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+            textureRect = reader.ReadRectangleF();
             //  Vector2f textureRectOffset
             reader.Position += 8;
             //  Vector2f atlasRectOffset - 5.6 and up

AssetStudio/StudioClasses/SpriteHelper.cs

@@ -12,57 +12,93 @@ namespace AssetStudio
     {
         public static Bitmap GetImageFromSprite(Sprite m_Sprite)
         {
-            Bitmap bitmap = null;
-            SpriteSettings settingsRaw = null;
             if (m_Sprite.m_SpriteAtlas != null && m_Sprite.m_SpriteAtlas.TryGet(out var objectReader))
             {
                 var m_SpriteAtlas = new SpriteAtlas(objectReader);
-                var spriteAtlasData = m_SpriteAtlas.m_RenderDataMap.FirstOrDefault(x => x.Key.Item1 == m_Sprite.first).Value;
+                if (m_SpriteAtlas.m_RenderDataMap.TryGetValue(m_Sprite.m_RenderDataKey, out var spriteAtlasData) && spriteAtlasData.texture.TryGet(out objectReader))
-                if (spriteAtlasData != null && spriteAtlasData.texture.TryGet(out objectReader))
                 {
-                    settingsRaw = spriteAtlasData.settingsRaw;
+                    return CutImage(objectReader, spriteAtlasData.textureRect, m_Sprite, spriteAtlasData.settingsRaw);
-                    try
-                    {
-                        if (settingsRaw.packingMode == SpritePackingMode.kSPMTight && m_Sprite.m_PhysicsShape.Length > 0) //Tight
-                        {
-                            bitmap = CutTightImage(objectReader, spriteAtlasData.textureRect, m_Sprite);
-                        }
-                        else
-                        {
-                            bitmap = CutRectangleImage(objectReader, spriteAtlasData.textureRect);
-                        }
-                    }
-                    catch
-                    {
-                        bitmap = CutRectangleImage(objectReader, spriteAtlasData.textureRect);
-                    }
                 }
             }
             else
             {
-                //TODO Tight
                 if (m_Sprite.texture.TryGet(out objectReader))
                 {
-                    settingsRaw = m_Sprite.settingsRaw;
+                    return CutImage(objectReader, m_Sprite.textureRect, m_Sprite, m_Sprite.settingsRaw);
-                    bitmap = CutRectangleImage(objectReader, m_Sprite.textureRect);
                 }
             }
-            if (bitmap != null)
-            {
-                RotateAndFlip(bitmap, settingsRaw.packingRotation);
-                return bitmap;
-            }
             return null;
         }
 
-        private static Bitmap CutRectangleImage(ObjectReader texture2DAsset, RectangleF textureRect)
+        private static Bitmap CutImage(ObjectReader texture2DAsset, RectangleF textureRect, Sprite m_Sprite, SpriteSettings settingsRaw)
         {
             var texture2D = new Texture2DConverter(new Texture2D(texture2DAsset, true));
-            using (var originalImage = texture2D.ConvertToBitmap(false))
+            var originalImage = texture2D.ConvertToBitmap(false);
+            if (originalImage != null)
             {
-                if (originalImage != null)
+                using (originalImage)
                 {
                     var spriteImage = originalImage.Clone(textureRect, PixelFormat.Format32bppArgb);
+
+                    //RotateAndFlip
+                    switch (settingsRaw.packingRotation)
+                    {
+                        case SpritePackingRotation.kSPRFlipHorizontal:
+                            spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipX);
+                            break;
+                        case SpritePackingRotation.kSPRFlipVertical:
+                            spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                            break;
+                        case SpritePackingRotation.kSPRRotate180:
+                            spriteImage.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                            break;
+                        case SpritePackingRotation.kSPRRotate90:
+                            spriteImage.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                            break;
+                    }
+
+                    /* TODO Tight
+                     * 2017之前没有PhysicsShape
+                     * 5.6之前使用vertices
+                     * 5.6需要使用VertexData
+                     */
+                    if (settingsRaw.packingMode == SpritePackingMode.kSPMTight && m_Sprite.m_PhysicsShape?.Length > 0) //Tight
+                    {
+                        try
+                        {
+                            using (var brush = new TextureBrush(spriteImage))
+                            {
+                                using (var path = new GraphicsPath())
+                                {
+                                    foreach (var p in m_Sprite.m_PhysicsShape)
+                                    {
+                                        path.AddPolygon(p);
+                                    }
+                                    using (var matr = new Matrix())
+                                    {
+                                        matr.Translate(m_Sprite.m_Rect.Width * m_Sprite.m_Pivot.X, m_Sprite.m_Rect.Height * m_Sprite.m_Pivot.Y);
+                                        matr.Scale(m_Sprite.m_PixelsToUnits, m_Sprite.m_PixelsToUnits);
+                                        path.Transform(matr);
+                                        var bitmap = new Bitmap((int)textureRect.Width, (int)textureRect.Height);
+                                        using (var graphic = Graphics.FromImage(bitmap))
+                                        {
+                                            graphic.FillPath(brush, path);
+                                            bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                                            return bitmap;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        catch
+                        {
+                            spriteImage = originalImage.Clone(textureRect, PixelFormat.Format32bppArgb);
+                            spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                            return spriteImage;
+                        }
+                    }
+
+                    //Rectangle
                     spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY);
                     return spriteImage;
                 }
@@ -70,59 +106,5 @@ namespace AssetStudio
 
             return null;
         }
-
-        private static Bitmap CutTightImage(ObjectReader texture2DAsset, RectangleF textureRect, Sprite sprite)
-        {
-            var texture2D = new Texture2DConverter(new Texture2D(texture2DAsset, true));
-            using (var originalImage = texture2D.ConvertToBitmap(false))
-            {
-                if (originalImage != null)
-                {
-                    var spriteImage = originalImage.Clone(textureRect, PixelFormat.Format32bppArgb);
-                    using (var brush = new TextureBrush(spriteImage))
-                    {
-                        using (var path = new GraphicsPath())
-                        {
-                            foreach (var p in sprite.m_PhysicsShape)
-                                path.AddPolygon(p);
-                            using (var matr = new Matrix())
-                            {
-                                matr.Translate(sprite.m_Rect.Width * sprite.m_Pivot.X, sprite.m_Rect.Height * sprite.m_Pivot.Y);
-                                matr.Scale(sprite.m_PixelsToUnits, sprite.m_PixelsToUnits);
-                                path.Transform(matr);
-                                var bitmap = new Bitmap((int)textureRect.Width, (int)textureRect.Height);
-                                using (var graphic = Graphics.FromImage(bitmap))
-                                {
-                                    graphic.FillPath(brush, path);
-                                    bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                                    return bitmap;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private static void RotateAndFlip(Bitmap bitmap, SpritePackingRotation packingRotation)
-        {
-            switch (packingRotation)
-            {
-                case SpritePackingRotation.kSPRFlipHorizontal:
-                    bitmap.RotateFlip(RotateFlipType.RotateNoneFlipX);
-                    break;
-                case SpritePackingRotation.kSPRFlipVertical:
-                    bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                    break;
-                case SpritePackingRotation.kSPRRotate180:
-                    bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
-                    break;
-                case SpritePackingRotation.kSPRRotate90:
-                    bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
-                    break;
-            }
-        }
     }
 }