Some refactor for Texture2DExtensions

This commit is contained in:
VaDiM
2026-01-27 00:05:45 +03:00
parent abeb251488
commit bb1cba89e1
6 changed files with 154 additions and 158 deletions
+1 -2
View File
@@ -45,8 +45,7 @@ namespace AssetStudioCLI
debugLog += sb.ToString(); debugLog += sb.ToString();
} }
var image = m_Texture2D.ConvertToImage(flip: true); if (!m_Texture2D.TryConvertToImage(flip: true, out var image))
if (image == null)
{ {
Logger.Error($"{debugLog}Export error. Failed to convert texture \"{m_Texture2D.m_Name}\" into image"); Logger.Error($"{debugLog}Export error. Failed to convert texture \"{m_Texture2D.m_Name}\" into image");
return false; return false;
+5 -7
View File
@@ -964,9 +964,12 @@ namespace AssetStudioGUI
private void PreviewTexture2D(AssetItem assetItem, Texture2D m_Texture2D) private void PreviewTexture2D(AssetItem assetItem, Texture2D m_Texture2D)
{ {
var image = m_Texture2D.ConvertToImage(true); if (!m_Texture2D.TryConvertToImage(true, out var image))
if (image != null)
{ {
StatusStripUpdate("Unsupported image for preview");
return;
}
var bitmap = new DirectBitmap(image); var bitmap = new DirectBitmap(image);
image.Dispose(); image.Dispose();
@@ -1022,11 +1025,6 @@ namespace AssetStudioGUI
StatusStripUpdate("'Ctrl'+'R'/'G'/'B'/'A' for Channel Toggle"); StatusStripUpdate("'Ctrl'+'R'/'G'/'B'/'A' for Channel Toggle");
} }
else
{
StatusStripUpdate("Unsupported image for preview");
}
}
private void PreviewAudioClip(AssetItem assetItem, AudioClip m_AudioClip) private void PreviewAudioClip(AssetItem assetItem, AudioClip m_AudioClip)
{ {
+1 -2
View File
@@ -44,8 +44,7 @@ namespace AssetStudioGUI
debugLog += sb.ToString(); debugLog += sb.ToString();
} }
var image = m_Texture2D.ConvertToImage(flip: true); if (!m_Texture2D.TryConvertToImage(flip: true, out var image))
if (image == null)
{ {
Logger.Warning($"Failed to convert texture \"{m_Texture2D.m_Name}\" into image"); Logger.Warning($"Failed to convert texture \"{m_Texture2D.m_Name}\" into image");
return false; return false;
@@ -275,12 +275,15 @@ namespace CubismLive2DExtractor
return; return;
} }
using (var image = texture2D.ConvertToImage(flip: true)) if (texture2D.TryConvertToImage(flip: true, out var image))
{ {
using (var file = File.OpenWrite(savePath)) using (var file = File.OpenWrite(savePath))
{
using (image)
{ {
image.WriteToStream(file, ImageFormat.Png); image.WriteToStream(file, ImageFormat.Png);
} }
}
textureBag.Add($"textures/{texture2D.m_Name}.png"); textureBag.Add($"textures/{texture2D.m_Name}.png");
} }
}); });
+9 -11
View File
@@ -89,24 +89,25 @@ namespace AssetStudio
private static Image<Bgra32> CutImage(Sprite m_Sprite, Texture2D m_Texture2D, Rectf textureRect, Vector2 textureRectOffset, float downscaleMultiplier, SpriteSettings settingsRaw) private static Image<Bgra32> CutImage(Sprite m_Sprite, Texture2D m_Texture2D, Rectf textureRect, Vector2 textureRectOffset, float downscaleMultiplier, SpriteSettings settingsRaw)
{ {
var originalImage = m_Texture2D.ConvertToImage(false); if (!m_Texture2D.TryConvertToImage(false, out var textureImage))
if (originalImage != null) return null;
{
if (downscaleMultiplier > 0f && downscaleMultiplier != 1f) if (downscaleMultiplier > 0f && downscaleMultiplier != 1f)
{ {
var width = (int)(m_Texture2D.m_Width / downscaleMultiplier); var width = (int)(m_Texture2D.m_Width / downscaleMultiplier);
var height = (int)(m_Texture2D.m_Height / downscaleMultiplier); var height = (int)(m_Texture2D.m_Height / downscaleMultiplier);
originalImage.Mutate(x => x.Resize(width, height)); textureImage.Mutate(x => x.Resize(width, height));
} }
var rectX = (int)MathF.Floor(textureRect.x); var rectX = (int)MathF.Floor(textureRect.x);
var rectY = (int)MathF.Floor(textureRect.y); var rectY = (int)MathF.Floor(textureRect.y);
var rectRight = (int)MathF.Ceiling(textureRect.x + textureRect.width); var rectRight = (int)MathF.Ceiling(textureRect.x + textureRect.width);
var rectBottom = (int)MathF.Ceiling(textureRect.y + textureRect.height); var rectBottom = (int)MathF.Ceiling(textureRect.y + textureRect.height);
rectRight = Math.Min(rectRight, originalImage.Width); rectRight = Math.Min(rectRight, textureImage.Width);
rectBottom = Math.Min(rectBottom, originalImage.Height); rectBottom = Math.Min(rectBottom, textureImage.Height);
var rect = new Rectangle(rectX, rectY, rectRight - rectX, rectBottom - rectY); var rect = new Rectangle(rectX, rectY, rectRight - rectX, rectBottom - rectY);
var spriteImage = originalImage.Clone(x => x.Crop(rect)); var spriteImage = textureImage.Clone(x => x.Crop(rect));
originalImage.Dispose(); textureImage.Dispose();
if (settingsRaw.packed == 1) if (settingsRaw.packed == 1)
{ {
//RotateAndFlip //RotateAndFlip
@@ -185,9 +186,6 @@ namespace AssetStudio
return spriteImage; return spriteImage;
} }
return null;
}
private static Vector2[][] GetTriangles(SpriteRenderData m_RD) private static Vector2[][] GetTriangles(SpriteRenderData m_RD)
{ {
if (m_RD.vertices != null) //5.6 down if (m_RD.vertices != null) //5.6 down
+8 -9
View File
@@ -8,23 +8,24 @@ namespace AssetStudio
{ {
public static class Texture2DExtensions public static class Texture2DExtensions
{ {
public static Image<Bgra32> ConvertToImage(this Texture2D m_Texture2D, bool flip) public static bool TryConvertToImage(this Texture2D m_Texture2D, bool flip, out Image<Bgra32> image)
{ {
image = null;
var converter = new Texture2DConverter(m_Texture2D); var converter = new Texture2DConverter(m_Texture2D);
var buff = BigArrayPool<byte>.Shared.Rent(converter.OutputDataSize); var buff = BigArrayPool<byte>.Shared.Rent(converter.OutputDataSize);
var spanBuff = buff.AsSpan(0, converter.OutputDataSize); var spanBuff = buff.AsSpan(0, converter.OutputDataSize);
try try
{ {
if (!converter.DecodeTexture2D(buff)) if (!converter.DecodeTexture2D(buff))
return null; return false;
var image = Image.LoadPixelData<Bgra32>(spanBuff, m_Texture2D.m_Width, m_Texture2D.m_Height); image = Image.LoadPixelData<Bgra32>(spanBuff, m_Texture2D.m_Width, m_Texture2D.m_Height);
if (flip) if (flip)
{ {
image.Mutate(x => x.Flip(FlipMode.Vertical)); image.Mutate(x => x.Flip(FlipMode.Vertical));
} }
return image; return true;
} }
finally finally
{ {
@@ -34,15 +35,13 @@ namespace AssetStudio
public static MemoryStream ConvertToStream(this Texture2D m_Texture2D, ImageFormat imageFormat, bool flip) public static MemoryStream ConvertToStream(this Texture2D m_Texture2D, ImageFormat imageFormat, bool flip)
{ {
var image = ConvertToImage(m_Texture2D, flip); if (!TryConvertToImage(m_Texture2D, flip, out var image))
if (image != null) return null;
{
using (image) using (image)
{ {
return image.ConvertToStream(imageFormat); return image.ConvertToStream(imageFormat);
} }
} }
return null;
}
} }
} }