From a6078757285406fe2d3d20afee45928b856ed3a4 Mon Sep 17 00:00:00 2001 From: Prashant Mohta Date: Fri, 1 Dec 2023 01:18:03 +0530 Subject: [PATCH] Update TextureFile.cs for breaking changes in dependency --- AssetsTools.NET.Texture/TextureFile.cs | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/AssetsTools.NET.Texture/TextureFile.cs b/AssetsTools.NET.Texture/TextureFile.cs index c0c33e7..4ce25ff 100644 --- a/AssetsTools.NET.Texture/TextureFile.cs +++ b/AssetsTools.NET.Texture/TextureFile.cs @@ -362,26 +362,26 @@ public static byte[] DecodeManaged(byte[] data, TextureFormat format, int width, byte[] output = Array.Empty(); int size = format switch { - TextureFormat.Alpha8 => RgbConverter.Convert(data, width, height, out output), + TextureFormat.Alpha8 => RgbConverter.Convert, byte, ColorBGRA32, byte>(data, width, height, out output), TextureFormat.ARGB4444 => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGB24 => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGBA32 => RgbConverter.Convert(data, width, height, out output), + TextureFormat.RGB24 => RgbConverter.Convert, byte, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RGBA32 => RgbConverter.Convert, byte, ColorBGRA32, byte>(data, width, height, out output), TextureFormat.ARGB32 => RgbConverter.Convert(data, width, height, out output), - TextureFormat.R16 => RgbConverter.Convert(data, width, height, out output), + TextureFormat.R16 => RgbConverter.Convert, ushort, ColorBGRA32, byte>(data, width, height, out output), TextureFormat.RGBA4444 => RgbConverter.Convert(data, width, height, out output), TextureFormat.BGRA32 => data.Length, - TextureFormat.RG16 => RgbConverter.Convert(data, width, height, out output), - TextureFormat.R8 => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RHalf => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGHalf => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGBAHalf => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RFloat => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGFloat => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGBAFloat => RgbConverter.Convert(data, width, height, out output), + TextureFormat.RG16 => RgbConverter.Convert, byte, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.R8 => RgbConverter.Convert, byte, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RHalf => RgbConverter.Convert, Half, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RGHalf => RgbConverter.Convert, Half, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RGBAHalf => RgbConverter.Convert, Half, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RFloat => RgbConverter.Convert, float, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RGFloat => RgbConverter.Convert, float, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RGBAFloat => RgbConverter.Convert, float, ColorBGRA32, byte>(data, width, height, out output), TextureFormat.RGB9e5Float => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RG32 => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGB48 => RgbConverter.Convert(data, width, height, out output), - TextureFormat.RGBA64 => RgbConverter.Convert(data, width, height, out output), + TextureFormat.RG32 => RgbConverter.Convert, ushort, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RGB48 => RgbConverter.Convert, ushort, ColorBGRA32, byte>(data, width, height, out output), + TextureFormat.RGBA64 => RgbConverter.Convert, ushort, ColorBGRA32, byte>(data, width, height, out output), TextureFormat.DXT1 => DxtDecoder.DecompressDXT1(data, width, height, out output), TextureFormat.DXT3 => DxtDecoder.DecompressDXT3(data, width, height, out output),