mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-27 22:00:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

improved Sprite export

Browse Source
This commit is contained in:
Perfare 2021-01-14 19:27:57 +08:00
parent 32ce032655
commit d7f652d572
5 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AssetStudio/AssetStudio.csproj
View File

@ -33,13 +33,6 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="7zip\Common\CommandLineParser.cs" /> <Compile Include="7zip\Common\CommandLineParser.cs" />

25
AssetStudio/Classes/Sprite.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.IO; using System.IO;
namespace AssetStudio namespace AssetStudio
@ -88,7 +87,7 @@ namespace AssetStudio
public ushort[] indices; public ushort[] indices;
public Matrix4x4[] m_Bindpose; public Matrix4x4[] m_Bindpose;
public BoneWeights4[] m_SourceSkin; public BoneWeights4[] m_SourceSkin;
public RectangleF textureRect; public Rectf textureRect;
public Vector2 textureRectOffset; public Vector2 textureRectOffset;
public Vector2 atlasRectOffset; public Vector2 atlasRectOffset;
public SpriteSettings settingsRaw; public SpriteSettings settingsRaw;
@ -156,7 +155,7 @@ namespace AssetStudio
} }
} }
textureRect = reader.ReadRectangleF(); textureRect = new Rectf(reader);
textureRectOffset = reader.ReadVector2(); textureRectOffset = reader.ReadVector2();
if (version[0] > 5 || (version[0] == 5 && version[1] >= 6)) //5.6 and up if (version[0] > 5 || (version[0] == 5 && version[1] >= 6)) //5.6 and up
{ {
@ -176,9 +175,25 @@ namespace AssetStudio
} }
} }
public class Rectf
{
public float x;
public float y;
public float width;
public float height;
public Rectf(BinaryReader reader)
{
x = reader.ReadSingle();
y = reader.ReadSingle();
width = reader.ReadSingle();
height = reader.ReadSingle();
}
}
public sealed class Sprite : NamedObject public sealed class Sprite : NamedObject
{ {
public RectangleF m_Rect; public Rectf m_Rect;
public Vector2 m_Offset; public Vector2 m_Offset;
public Vector4 m_Border; public Vector4 m_Border;
public float m_PixelsToUnits; public float m_PixelsToUnits;
@ -193,7 +208,7 @@ namespace AssetStudio
public Sprite(ObjectReader reader) : base(reader) public Sprite(ObjectReader reader) : base(reader)
{ {
m_Rect = reader.ReadRectangleF(); m_Rect = new Rectf(reader);
m_Offset = reader.ReadVector2(); m_Offset = reader.ReadVector2();
if (version[0] > 4 || (version[0] == 4 && version[1] >= 5)) //4.5 and up if (version[0] > 4 || (version[0] == 4 && version[1] >= 5)) //4.5 and up
{ {

4
AssetStudio/Classes/SpriteAtlas.cs
View File

@ -7,7 +7,7 @@ namespace AssetStudio
{ {
public PPtr<Texture2D> texture; public PPtr<Texture2D> texture;
public PPtr<Texture2D> alphaTexture; public PPtr<Texture2D> alphaTexture;
public System.Drawing.RectangleF textureRect; public Rectf textureRect;
public Vector2 textureRectOffset; public Vector2 textureRectOffset;
public Vector2 atlasRectOffset; public Vector2 atlasRectOffset;
public Vector4 uvTransform; public Vector4 uvTransform;
@ -20,7 +20,7 @@ namespace AssetStudio
var version = reader.version; var version = reader.version;
texture = new PPtr<Texture2D>(reader); texture = new PPtr<Texture2D>(reader);
alphaTexture = new PPtr<Texture2D>(reader); alphaTexture = new PPtr<Texture2D>(reader);
textureRect = reader.ReadRectangleF(); textureRect = new Rectf(reader);
textureRectOffset = reader.ReadVector2(); textureRectOffset = reader.ReadVector2();
if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 2)) //2017.2 and up if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 2)) //2017.2 and up
{ {

5
AssetStudio/Extensions/BinaryReaderExtensions.cs
View File

@ -72,11 +72,6 @@ namespace AssetStudio
return new Vector4(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle()); return new Vector4(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
} }
public static System.Drawing.RectangleF ReadRectangleF(this BinaryReader reader)
{
return new System.Drawing.RectangleF(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
}
public static Color ReadColor4(this BinaryReader reader) public static Color ReadColor4(this BinaryReader reader)
{ {
return new Color(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle()); return new Color(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());

42
AssetStudioUtility/SpriteHelper.cs
View File

@ -28,7 +28,7 @@ namespace AssetStudio
return null; return null;
} }
private static Bitmap CutImage(Texture2D m_Texture2D, Sprite m_Sprite, RectangleF textureRect, Vector2 textureRectOffset, SpriteSettings settingsRaw) private static Bitmap CutImage(Texture2D m_Texture2D, Sprite m_Sprite, Rectf textureRect, Vector2 textureRectOffset, SpriteSettings settingsRaw)
{ {
var originalImage = m_Texture2D.ConvertToBitmap(false); var originalImage = m_Texture2D.ConvertToBitmap(false);
if (originalImage != null) if (originalImage != null)
@ -36,20 +36,21 @@ namespace AssetStudio
using (originalImage) using (originalImage)
{ {
//var spriteImage = originalImage.Clone(textureRect, PixelFormat.Format32bppArgb); //var spriteImage = originalImage.Clone(textureRect, PixelFormat.Format32bppArgb);
var textureRectI = Rectangle.Round(textureRect); var rectf = new RectangleF(textureRect.x, textureRect.y, textureRect.width, textureRect.height);
if (textureRectI.Width == 0) var rect = Rectangle.Round(rectf);
if (rect.Width == 0)
{ {
textureRectI.Width = 1; rect.Width = 1;
} }
if (textureRectI.Height == 0) if (rect.Height == 0)
{ {
textureRectI.Height = 1; rect.Height = 1;
} }
var spriteImage = new Bitmap(textureRectI.Width, textureRectI.Height, PixelFormat.Format32bppArgb); var spriteImage = new Bitmap(rect.Width, rect.Height, PixelFormat.Format32bppArgb);
var destRect = new Rectangle(0, 0, textureRectI.Width, textureRectI.Height); var destRect = new Rectangle(0, 0, rect.Width, rect.Height);
using (var graphic = Graphics.FromImage(spriteImage)) using (var graphic = Graphics.FromImage(spriteImage))
{ {
graphic.DrawImage(originalImage, destRect, textureRectI, GraphicsUnit.Pixel); graphic.DrawImage(originalImage, destRect, rect, GraphicsUnit.Pixel);
} }
if (settingsRaw.packed == 1) if (settingsRaw.packed == 1)
{ {
@ -91,21 +92,22 @@ namespace AssetStudio
|| (version[0] == 5 && version[1] < 4) || (version[0] == 5 && version[1] < 4)
|| (version[0] == 5 && version[1] == 4 && version[2] <= 1)) //5.4.1p3 down || (version[0] == 5 && version[1] == 4 && version[2] <= 1)) //5.4.1p3 down
{ {
matr.Translate(m_Sprite.m_Rect.Width * 0.5f - textureRectOffset.X, m_Sprite.m_Rect.Height * 0.5f - textureRectOffset.Y); matr.Translate(m_Sprite.m_Rect.width * 0.5f - textureRectOffset.X, m_Sprite.m_Rect.height * 0.5f - textureRectOffset.Y);
} }
else else
{ {
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.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); matr.Scale(m_Sprite.m_PixelsToUnits, m_Sprite.m_PixelsToUnits);
path.Transform(matr); path.Transform(matr);
var bitmap = new Bitmap(textureRectI.Width, textureRectI.Height); var bitmap = new Bitmap(rect.Width, rect.Height);
using (var graphic = Graphics.FromImage(bitmap)) using (var graphic = Graphics.FromImage(bitmap))
{ {
using (var brush = new TextureBrush(spriteImage)) using (var brush = new TextureBrush(spriteImage))
{ {
graphic.FillPath(brush, path); graphic.FillPath(brush, path);
bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY); bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
spriteImage.Dispose();
return bitmap; return bitmap;
} }
} }
@ -144,19 +146,17 @@ namespace AssetStudio
} }
return triangles; return triangles;
} }
else //5.6 and up
return GetTriangles(m_RD.m_VertexData, m_RD.m_SubMeshes, m_RD.m_IndexBuffer); //5.6 and up
}
private static Vector2[][] GetTriangles(VertexData m_VertexData, SubMesh[] m_SubMeshes, byte[] m_IndexBuffer)
{ {
var triangles = new List<Vector2[]>(); var triangles = new List<Vector2[]>();
var m_VertexData = m_RD.m_VertexData;
var m_Channel = m_VertexData.m_Channels[0]; //kShaderChannelVertex var m_Channel = m_VertexData.m_Channels[0]; //kShaderChannelVertex
var m_Stream = m_VertexData.m_Streams[m_Channel.stream]; var m_Stream = m_VertexData.m_Streams[m_Channel.stream];
using (BinaryReader vertexReader = new BinaryReader(new MemoryStream(m_VertexData.m_DataSize)), using (var vertexReader = new BinaryReader(new MemoryStream(m_VertexData.m_DataSize)))
indexReader = new BinaryReader(new MemoryStream(m_IndexBuffer)))
{ {
foreach (var subMesh in m_SubMeshes) using (var indexReader = new BinaryReader(new MemoryStream(m_RD.m_IndexBuffer)))
{
foreach (var subMesh in m_RD.m_SubMeshes)
{ {
vertexReader.BaseStream.Position = m_Stream.offset + subMesh.firstVertex * m_Stream.stride + m_Channel.offset; vertexReader.BaseStream.Position = m_Stream.offset + subMesh.firstVertex * m_Stream.stride + m_Channel.offset;
@ -180,7 +180,9 @@ namespace AssetStudio
} }
} }
} }
}
return triangles.ToArray(); return triangles.ToArray();
} }
} }
}
} }