From 9686eee3b7434be4c75a20fd16963a176da7256a Mon Sep 17 00:00:00 2001 From: VaDiM Date: Thu, 11 Apr 2024 22:30:42 +0300 Subject: [PATCH] Fix for 512x512 avg sprites temporarily? --- .../Components/Arknights/AkSpriteHelper.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/AssetStudioGUI/Components/Arknights/AkSpriteHelper.cs b/AssetStudioGUI/Components/Arknights/AkSpriteHelper.cs index c429072..001087c 100644 --- a/AssetStudioGUI/Components/Arknights/AkSpriteHelper.cs +++ b/AssetStudioGUI/Components/Arknights/AkSpriteHelper.cs @@ -57,14 +57,19 @@ namespace Arknights { var faceImage = m_Texture2D.ConvertToImage(true); var faceAlpha = avgSprite.FaceSpriteAlphaTexture.ConvertToImage(true); + + tex = avgSprite.FullTexture.ConvertToImage(true); + var facePos = tex.Width == 512 ? avgSprite.FacePos / 2 : avgSprite.FacePos; // ? + var faceSize = tex.Width == 512 ? avgSprite.FaceSize / 2 : avgSprite.FaceSize; + if (new Size(faceImage.Width, faceImage.Height) != avgSprite.FaceSize) { - faceImage.Mutate(x => x.Resize(new ResizeOptions { Size = avgSprite.FaceSize, Sampler = KnownResamplers.Lanczos3, Mode = ResizeMode.Stretch })); - faceAlpha.Mutate(x => x.Resize(new ResizeOptions { Size = avgSprite.FaceSize, Sampler = KnownResamplers.Lanczos3, Mode = ResizeMode.Stretch })); + faceImage.Mutate(x => x.Resize(new ResizeOptions { Size = faceSize, Sampler = KnownResamplers.Lanczos3, Mode = ResizeMode.Stretch })); + faceAlpha.Mutate(x => x.Resize(new ResizeOptions { Size = faceSize, Sampler = KnownResamplers.Lanczos3, Mode = ResizeMode.Stretch })); } - tex = avgSprite.FullTexture.ConvertToImage(true); - tex.Mutate(x => x.DrawImage(faceImage, avgSprite.FacePos, opacity: 1f)); - alphaTex.Mutate(x => x.DrawImage(faceAlpha, avgSprite.FacePos, opacity: 1f)); + + tex.Mutate(x => x.DrawImage(faceImage, facePos, opacity: 1f)); + alphaTex.Mutate(x => x.DrawImage(faceAlpha, facePos, opacity: 1f)); } else {