From 54d0a962350060acbd41610b175c00365cb69d9a Mon Sep 17 00:00:00 2001 From: VaDiM Date: Sat, 14 Mar 2026 20:22:51 +0300 Subject: [PATCH] Do not throw an error in case of unsupported sprites. Close #109 --- AssetStudioGUI/AssetStudioGUIForm.cs | 7 +++-- AssetStudioUtility/SpriteConverter.cs | 37 +++++++++++++++++---------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 642452b..d32a2f0 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -1508,7 +1508,7 @@ namespace AssetStudioGUI $"Height: {bitmap.Height}\n" + $"Keep original size: {spriteRenderWithOrigSize}\n" + $"Show border: {spriteRednerWithBorder}\n"; - + if (spriteRednerWithBorder) PreviewTextureWithBorder(bitmap); else @@ -1524,7 +1524,10 @@ namespace AssetStudioGUI } else { - StatusStripUpdate("Unsupported sprite for preview."); + var statusStrip = "Unsupported sprite for preview. "; + if (converter.Width == 0 || converter.Height == 0) + statusStrip += "The width or height of the sprite is 0."; + StatusStripUpdate(statusStrip); } } diff --git a/AssetStudioUtility/SpriteConverter.cs b/AssetStudioUtility/SpriteConverter.cs index a229752..2f3115d 100644 --- a/AssetStudioUtility/SpriteConverter.cs +++ b/AssetStudioUtility/SpriteConverter.cs @@ -30,9 +30,12 @@ namespace AssetStudio private bool keepSpriteSize; private int resultWidth; private int resultHeight; + private bool canConvert; - public Texture2D m_Texture2D { get; } - public Texture2D m_AlphaTexture2D { get; } + public readonly Texture2D m_Texture2D; + public readonly Texture2D m_AlphaTexture2D; + public int Width => resultWidth; + public int Height => resultHeight; public SpriteConverter(Sprite m_Sprite, bool keepSize = true) { @@ -41,31 +44,37 @@ namespace AssetStudio if (m_Sprite.m_SpriteAtlas != null && m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlas)) { - if (m_SpriteAtlas.m_RenderDataMap.TryGetValue(m_Sprite.m_RenderDataKey, out var spriteAtlasData) && spriteAtlasData.texture.TryGet(out var texture2D)) + if (m_SpriteAtlas.m_RenderDataMap.TryGetValue(m_Sprite.m_RenderDataKey, out var spriteAtlasData) && spriteAtlasData.texture.TryGet(out m_Texture2D)) { - m_Texture2D = texture2D; - if (spriteAtlasData.alphaTexture.TryGet(out var alphaTexture2D)) - m_AlphaTexture2D = alphaTexture2D; + spriteAtlasData.alphaTexture.TryGet(out m_AlphaTexture2D); textureRect = spriteAtlasData.textureRect; textureRectOffset = spriteAtlasData.textureRectOffset; downscaleMultiplier = spriteAtlasData.downscaleMultiplier; settingsRaw = spriteAtlasData.settingsRaw; + SetResultSpriteSize(); + if (resultWidth > 0 && resultHeight > 0) + { + canConvert = true; + } } } - else if (m_Sprite.m_RD.texture.TryGet(out var texture2D)) + if (!canConvert && m_Sprite.m_RD.texture.TryGet(out m_Texture2D)) { - m_Texture2D = texture2D; - if (m_Sprite.m_RD.alphaTexture.TryGet(out var alphaTexture2D)) - m_AlphaTexture2D = alphaTexture2D; + m_Sprite.m_RD.alphaTexture.TryGet(out m_AlphaTexture2D); textureRect = m_Sprite.m_RD.textureRect; textureRectOffset = m_Sprite.m_RD.textureRectOffset; downscaleMultiplier = m_Sprite.m_RD.downscaleMultiplier; settingsRaw = m_Sprite.m_RD.settingsRaw; + SetResultSpriteSize(); + if (resultWidth > 0 && resultHeight > 0) + { + canConvert = true; + } } + } - if (textureRect == null) - return; - + private void SetResultSpriteSize() + { resultWidth = keepSpriteSize ? (int)MathF.Round(sprite.m_Rect.width) : (int)MathF.Round(textureRect.width); @@ -77,7 +86,7 @@ namespace AssetStudio public bool TryConvertToImage(out Image spriteImage, SpriteMaskMode maskMode) { spriteImage = null; - if (m_Texture2D == null) + if (!canConvert) return false; if (m_AlphaTexture2D != null)