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

improved

Browse Source
This commit is contained in:
Perfare 2020-03-24 10:42:39 +08:00
parent 48ca96807f
commit ada26db659
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AssetStudio/Classes/Sprite.cs
View File

@ -32,6 +32,12 @@ namespace AssetStudio
kSPMRectangle
};
public enum SpriteMeshType
{
kSpriteMeshTypeFullRect,
kSpriteMeshTypeTight
};
public class SpriteSettings
{
public uint settingsRaw;
@ -39,6 +45,7 @@ namespace AssetStudio
public uint packed;
public SpritePackingMode packingMode;
public SpritePackingRotation packingRotation;
public SpriteMeshType meshType;
public SpriteSettings(BinaryReader reader)
{
@ -47,8 +54,7 @@ namespace AssetStudio
packed = settingsRaw & 1; //1
packingMode = (SpritePackingMode)((settingsRaw >> 1) & 1); //1
packingRotation = (SpritePackingRotation)((settingsRaw >> 2) & 0xf); //4
//meshType = (settingsRaw >> 6) & 1; //1
meshType = (SpriteMeshType)((settingsRaw >> 6) & 1); //1
//reserved
}
}

3
AssetStudioGUI/AssetStudioGUIForm.cs
View File

@ -734,8 +734,7 @@ namespace AssetStudioGUI
private void PreviewTexture2D(AssetItem assetItem, Texture2D m_Texture2D)
{
var converter = new Texture2DConverter(m_Texture2D);
var bitmap = converter.ConvertToBitmap(true);
var bitmap = m_Texture2D.ConvertToBitmap(true);
if (bitmap != null)
{
assetItem.InfoText = $"Width: {m_Texture2D.m_Width}\nHeight: {m_Texture2D.m_Height}\nFormat: {m_Texture2D.m_TextureFormat}";

4
AssetStudioUtility/ModelConverter.cs
View File

@ -717,7 +717,7 @@ namespace AssetStudio
return iMat;
}
private void ConvertTexture2D(Texture2D tex2D, string name)
private void ConvertTexture2D(Texture2D m_Texture2D, string name)
{
var iTex = ImportedHelpers.FindTexture(name, TextureList);
if (iTex != null)
@ -725,7 +725,7 @@ namespace AssetStudio
return;
}
var bitmap = new Texture2DConverter(tex2D).ConvertToBitmap(true);
var bitmap = m_Texture2D.ConvertToBitmap(true);
if (bitmap != null)
{
using (var stream = new MemoryStream())

4
AssetStudioUtility/SpriteHelper.cs
View File

@ -30,8 +30,7 @@ namespace AssetStudio
private static Bitmap CutImage(Texture2D m_Texture2D, Sprite m_Sprite, RectangleF textureRect, Vector2 textureRectOffset, SpriteSettings settingsRaw)
{
var texture2D = new Texture2DConverter(m_Texture2D);
var originalImage = texture2D.ConvertToBitmap(false);
var originalImage = m_Texture2D.ConvertToBitmap(false);
if (originalImage != null)
{
using (originalImage)
@ -63,6 +62,7 @@ namespace AssetStudio
break;
}
}
//Tight
if (settingsRaw.packingMode == SpritePackingMode.kSPMTight)
{