From 4a81c461e8ac6702796e71c9629f3c083ed09d92 Mon Sep 17 00:00:00 2001 From: Perfare Date: Fri, 10 Apr 2020 18:57:04 +0800 Subject: [PATCH] Modify Sprite processing function as an extension function --- AssetStudioGUI/AssetStudioGUIForm.cs | 2 +- AssetStudioGUI/Exporter.cs | 2 +- AssetStudioUtility/SpriteHelper.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index af5c26d..27fb77e 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -1082,7 +1082,7 @@ namespace AssetStudioGUI private void PreviewSprite(AssetItem assetItem, Sprite m_Sprite) { - var bitmap = SpriteHelper.GetImageFromSprite(m_Sprite); + var bitmap = m_Sprite.GetImage(); if (bitmap != null) { assetItem.InfoText = $"Width: {bitmap.Width}\nHeight: {bitmap.Height}\n"; diff --git a/AssetStudioGUI/Exporter.cs b/AssetStudioGUI/Exporter.cs index deb2863..4926b6f 100644 --- a/AssetStudioGUI/Exporter.cs +++ b/AssetStudioGUI/Exporter.cs @@ -287,7 +287,7 @@ namespace AssetStudioGUI var exportFullName = exportPath + item.Text + "." + type.ToLower(); if (ExportFileExists(exportFullName)) return false; - var bitmap = SpriteHelper.GetImageFromSprite((Sprite)item.Asset); + var bitmap = ((Sprite)item.Asset).GetImage(); if (bitmap != null) { if (tga) diff --git a/AssetStudioUtility/SpriteHelper.cs b/AssetStudioUtility/SpriteHelper.cs index 36ba2a4..fe1e21b 100644 --- a/AssetStudioUtility/SpriteHelper.cs +++ b/AssetStudioUtility/SpriteHelper.cs @@ -9,7 +9,7 @@ namespace AssetStudio { public static class SpriteHelper { - public static Bitmap GetImageFromSprite(Sprite m_Sprite) + public static Bitmap GetImage(this Sprite m_Sprite) { if (m_Sprite.m_SpriteAtlas != null && m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlas)) {