chizui/AssetStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve Sprite export

Browse Source
This commit is contained in:
Perfare
2018-11-08 17:30:12 +08:00
parent e13b4489c3
commit 798a63e33c
3 changed files with 89 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AssetStudio/Classes/Mesh.cs
View File

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

37
AssetStudio/Classes/Sprite.cs
View File

@@ -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 SpritePackingMode packingMode => (SpritePackingMode)((settingsRaw >> 1) & 1); //1
public SpritePackingRotation packingRotation => (SpritePackingRotation)((settingsRaw >> 2) & 0xf); //4
public uint reserved => settingsRaw >> 6; //26
/*
*public uint meshType => (settingsRaw >> 6) & 1; //1
*public uint reserved => settingsRaw >> 7; //25
*/
public uint packed;
public SpritePackingMode packingMode;
public SpritePackingRotation packingRotation;
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 Guid first;
public Vector2 m_Pivot;
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