Fix(?) for crunched cubemaps

- bugfix for 44a1240f5f

.gitignore

@@ -35,6 +35,9 @@ bld/
 # Visual Studio 2017 auto generated files
 Generated\ Files/
 
+# Launch Settings
+*launchSettings.json
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*

AssetStudio.PInvoke/AssetStudio.PInvoke.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>0.16.0.0</Version>
-    <AssemblyVersion>0.16.0.0</AssemblyVersion>
-    <FileVersion>0.16.0.0</FileVersion>
+    <Version>0.16.48.1</Version>
     <Copyright>Copyright © Perfare 2020-2022; Copyright © hozuki 2020</Copyright>
     <DebugType>embedded</DebugType>
   </PropertyGroup>

AssetStudio.PInvoke/DllLoader.cs

@@ -4,33 +4,29 @@ using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 
+#if NETFRAMEWORK
 namespace AssetStudio.PInvoke
 {
     public static class DllLoader
     {
-
         public static void PreloadDll(string dllName)
         {
-            var dllDir = GetDirectedDllDirectory();
+            var localPath = Process.GetCurrentProcess().MainModule.FileName;
+            var localDir = Path.GetDirectoryName(localPath);
 
             // Not using OperatingSystem.Platform.
             // See: https://www.mono-project.com/docs/faq/technical/#how-to-detect-the-execution-platform
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                Win32.LoadDll(dllDir, dllName);
-            }
-            else
-            {
-                Posix.LoadDll(dllDir, dllName);
+                Win32.LoadDll(GetDirectedDllDirectory(localDir), dllName);
             }
         }
 
-        private static string GetDirectedDllDirectory()
+        private static string GetDirectedDllDirectory(string localDir)
         {
-            var localPath = Process.GetCurrentProcess().MainModule.FileName;
-            var localDir = Path.GetDirectoryName(localPath);
-
-            var subDir = Environment.Is64BitProcess ? "x64" : "x86";
+            var win32Path = Path.Combine("runtimes", "win-x86", "native");
+            var win64Path = Path.Combine("runtimes", "win-x64", "native");
+            var subDir = Environment.Is64BitProcess ? win64Path : win32Path;
 
             var directedDllDir = Path.Combine(localDir, subDir);
 
@@ -64,61 +60,7 @@ namespace AssetStudio.PInvoke
 
             private const uint LOAD_LIBRARY_SEARCH_DEFAULT_DIRS = 0x1000;
             private const uint LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR = 0x100;
-
         }
-
-        private static class Posix
-        {
-
-            internal static void LoadDll(string dllDir, string dllName)
-            {
-                string dllExtension;
-
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                {
-                    dllExtension = ".so";
-                }
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                {
-                    dllExtension = ".dylib";
-                }
-                else
-                {
-                    throw new NotSupportedException();
-                }
-
-                var dllFileName = $"lib{dllName}{dllExtension}";
-                var directedDllPath = Path.Combine(dllDir, dllFileName);
-
-                const int ldFlags = RTLD_NOW | RTLD_GLOBAL;
-                var hLibrary = DlOpen(directedDllPath, ldFlags);
-
-                if (hLibrary == IntPtr.Zero)
-                {
-                    var pErrStr = DlError();
-                    // `PtrToStringAnsi` always uses the specific constructor of `String` (see dotnet/core#2325),
-                    // which in turn interprets the byte sequence with system default codepage. On OSX and Linux
-                    // the codepage is UTF-8 so the error message should be handled correctly.
-                    var errorMessage = Marshal.PtrToStringAnsi(pErrStr);
-
-                    throw new DllNotFoundException(errorMessage);
-                }
-            }
-
-            // OSX and most Linux OS use LP64 so `int` is still 32-bit even on 64-bit platforms.
-            // void *dlopen(const char *filename, int flag);
-            [DllImport("libdl", EntryPoint = "dlopen")]
-            private static extern IntPtr DlOpen([MarshalAs(UnmanagedType.LPStr)] string fileName, int flags);
-
-            // char *dlerror(void);
-            [DllImport("libdl", EntryPoint = "dlerror")]
-            private static extern IntPtr DlError();
-
-            private const int RTLD_LAZY = 0x1;
-            private const int RTLD_NOW = 0x2;
-            private const int RTLD_GLOBAL = 0x100;
-
-        }
-
     }
 }
+#endif

AssetStudio.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31410.357
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33414.496
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetStudio", "AssetStudio\AssetStudio.csproj", "{422FEC21-EF60-4F29-AA56-95DFDA23C913}"
 EndProject
@@ -25,6 +25,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetStudioFBXNative", "Ass
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture2DDecoderNative", "Texture2DDecoderNative\Texture2DDecoderNative.vcxproj", "{29356642-C46E-4144-83D8-22DC09D0D7FD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetStudioCLI", "AssetStudioCLI\AssetStudioCLI.csproj", "{34B6329B-0E73-45AC-B8CC-015F119F63DC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913} = {422FEC21-EF60-4F29-AA56-95DFDA23C913}
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF} = {65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -131,6 +137,18 @@ Global
 		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Release|x64.Build.0 = Release|x64
 		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Release|x86.ActiveCfg = Release|Win32
 		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Release|x86.Build.0 = Release|Win32
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Debug|x64.Build.0 = Debug|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Debug|x86.Build.0 = Debug|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Release|x64.Build.0 = Release|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{34B6329B-0E73-45AC-B8CC-015F119F63DC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

AssetStudio/AssetStudio.csproj

@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;net5.0;net6.0</TargetFrameworks>
-    <Version>0.16.0.0</Version>
-    <AssemblyVersion>0.16.0.0</AssemblyVersion>
-    <FileVersion>0.16.0.0</FileVersion>
+    <TargetFrameworks>net472;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <Version>0.16.48.1</Version>
     <Copyright>Copyright © Perfare 2018-2022</Copyright>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
-    <PackageReference Include="K4os.Compression.LZ4" Version="1.2.16" />
+    <PackageReference Include="K4os.Compression.LZ4" Version="1.3.5" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">

AssetStudio/AssetsManager.cs

@@ -12,6 +12,7 @@ namespace AssetStudio
     {
         public string SpecifyUnityVersion;
         public List<SerializedFile> assetsFileList = new List<SerializedFile>();
+        private List<ClassIDType> filteredAssetTypesList = new List<ClassIDType>();
 
         internal Dictionary<string, int> assetsFileIndexCache = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
         internal Dictionary<string, BinaryReader> resourceFileReaders = new Dictionary<string, BinaryReader>(StringComparer.OrdinalIgnoreCase);
@@ -21,6 +22,37 @@ namespace AssetStudio
         private HashSet<string> noexistFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private HashSet<string> assetsFileListHash = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
+        public void SetAssetFilter(ClassIDType classIDType)
+        {
+            if (filteredAssetTypesList.Count == 0)
+            {
+                filteredAssetTypesList.AddRange(new List<ClassIDType>
+                {
+                    ClassIDType.AssetBundle,
+                    ClassIDType.ResourceManager,
+                });
+            }
+
+            if (classIDType == ClassIDType.MonoBehaviour)
+            {
+                filteredAssetTypesList.AddRange(new List<ClassIDType>
+                {
+                    ClassIDType.MonoScript,
+                    ClassIDType.MonoBehaviour
+                });
+            }
+            else
+            {
+                filteredAssetTypesList.Add(classIDType);
+            }
+        }
+
+        public void SetAssetFilter(List<ClassIDType> classIDTypeList)
+        {
+            foreach (ClassIDType classIDType in classIDTypeList)
+                SetAssetFilter(classIDType);
+        }
+
         public void LoadFiles(params string[] files)
         {
             var path = Path.GetDirectoryName(Path.GetFullPath(files[0]));
@@ -135,9 +167,14 @@ namespace AssetStudio
                         }
                     }
                 }
+                catch (NotSupportedException e)
+                {
+                    Logger.Error(e.Message);
+                    reader.Dispose();
+                }
                 catch (Exception e)
                 {
-                    Logger.Error($"Error while reading assets file {reader.FullPath}", e);
+                    Logger.Warning($"Error while reading assets file {reader.FullPath}\r\n{e}");
                     reader.Dispose();
                 }
             }
@@ -164,9 +201,14 @@ namespace AssetStudio
                     assetsFileList.Add(assetsFile);
                     assetsFileListHash.Add(assetsFile.fileName);
                 }
+                catch (NotSupportedException e)
+                {
+                    Logger.Error(e.Message);
+                    resourceFileReaders.Add(reader.FileName, reader);
+                }
                 catch (Exception e)
                 {
-                    Logger.Error($"Error while reading assets file {reader.FullPath} from {Path.GetFileName(originalPath)}", e);
+                    Logger.Warning($"Error while reading assets file {reader.FullPath} from {Path.GetFileName(originalPath)}\r\n{e}");
                     resourceFileReaders.Add(reader.FileName, reader);
                 }
             }
@@ -179,7 +221,7 @@ namespace AssetStudio
             Logger.Info("Loading " + reader.FullPath);
             try
             {
-                var bundleFile = new BundleFile(reader);
+                var bundleFile = new BundleFile(reader, SpecifyUnityVersion);
                 foreach (var file in bundleFile.fileList)
                 {
                     var dummyPath = Path.Combine(Path.GetDirectoryName(reader.FullPath), file.fileName);
@@ -188,12 +230,16 @@ namespace AssetStudio
                     {
                         LoadAssetsFromMemory(subReader, originalPath ?? reader.FullPath, bundleFile.m_Header.unityRevision);
                     }
-                    else
+                    else if (!resourceFileReaders.ContainsKey(file.fileName))
                     {
-                        resourceFileReaders[file.fileName] = subReader; //TODO
+                        resourceFileReaders.Add(file.fileName, subReader);
                     }
                 }
             }
+            catch (NotSupportedException e)
+            {
+                Logger.Error(e.Message);
+            }
             catch (Exception e)
             {
                 var str = $"Error while reading bundle file {reader.FullPath}";
@@ -201,7 +247,7 @@ namespace AssetStudio
                 {
                     str += $" from {Path.GetFileName(originalPath)}";
                 }
-                Logger.Error(str, e);
+                Logger.Warning($"{str}\r\n{e}");
             }
             finally
             {
@@ -248,7 +294,7 @@ namespace AssetStudio
 
         private void LoadZipFile(FileReader reader)
         {
-            Logger.Info("Loading " + reader.FileName);
+            Logger.Info("Reading " + reader.FileName);
             try
             {
                 using (ZipArchive archive = new ZipArchive(reader.BaseStream, ZipArchiveMode.Read))
@@ -298,11 +344,14 @@ namespace AssetStudio
                         }
                         catch (Exception e)
                         {
-                            Logger.Error($"Error while reading zip split file {basePath}", e);
+                            Logger.Warning($"Error while reading zip split file {basePath}\r\n{e}");
                         }
                     }
 
                     // load all entries
+                    var progressCount = archive.Entries.Count;
+                    int k = 0;
+                    Progress.Reset();
                     foreach (ZipArchiveEntry entry in archive.Entries)
                     {
                         try
@@ -328,10 +377,11 @@ namespace AssetStudio
                                     resourceFileReaders.Add(entry.Name, entryReader);
                                 }
                             }
+                            Progress.Report(++k, progressCount);
                         }
                         catch (Exception e)
                         {
-                            Logger.Error($"Error while reading zip entry {entry.FullName}", e);
+                            Logger.Warning($"Error while reading zip entry {entry.FullName}\r\n{e}");
                         }
                     }
                 }
@@ -350,7 +400,7 @@ namespace AssetStudio
         {
             if (assetsFile.IsVersionStripped && string.IsNullOrEmpty(SpecifyUnityVersion))
             {
-                throw new Exception("The Unity version has been stripped, please set the version in the options");
+                throw new NotSupportedException("The Unity version has been stripped, please set the version in the options");
             }
             if (!string.IsNullOrEmpty(SpecifyUnityVersion))
             {
@@ -388,9 +438,13 @@ namespace AssetStudio
                 foreach (var objectInfo in assetsFile.m_Objects)
                 {
                     var objectReader = new ObjectReader(assetsFile.reader, assetsFile, objectInfo);
+                    if (filteredAssetTypesList.Count > 0 && !filteredAssetTypesList.Contains(objectReader.type))
+                    {
+                        continue;
+                    }
                     try
                     {
-                        Object obj;
+                        Object obj = null;
                         switch (objectReader.type)
                         {
                             case ClassIDType.Animation:
@@ -451,7 +505,8 @@ namespace AssetStudio
                                 obj = new RectTransform(objectReader);
                                 break;
                             case ClassIDType.Shader:
-                                obj = new Shader(objectReader);
+                                if (objectReader.version[0] < 2021)
+                                    obj = new Shader(objectReader);
                                 break;
                             case ClassIDType.SkinnedMeshRenderer:
                                 obj = new SkinnedMeshRenderer(objectReader);
@@ -481,7 +536,8 @@ namespace AssetStudio
                                 obj = new Object(objectReader);
                                 break;
                         }
-                        assetsFile.AddObject(obj);
+                        if (obj != null)
+                            assetsFile.AddObject(obj);
                     }
                     catch (Exception e)
                     {
@@ -492,7 +548,7 @@ namespace AssetStudio
                             .AppendLine($"Type {objectReader.type}")
                             .AppendLine($"PathID {objectInfo.m_PathID}")
                             .Append(e);
-                        Logger.Error(sb.ToString());
+                        Logger.Warning(sb.ToString());
                     }
 
                     Progress.Report(++i, progressCount);

AssetStudio/BundleFile.cs

@@ -15,6 +15,13 @@ namespace AssetStudio
         BlockInfoNeedPaddingAtStart = 0x200
     }
 
+    [Flags]
+    public enum CnEncryptionFlags
+    {
+        OldFlag = 0x200,
+        NewFlag = 0x400
+    }
+
     [Flags]
     public enum StorageBlockFlags
     {
@@ -66,7 +73,7 @@ namespace AssetStudio
 
         public StreamFile[] fileList;
 
-        public BundleFile(FileReader reader)
+        public BundleFile(FileReader reader, string specUnityVer = "")
         {
             m_Header = new Header();
             m_Header.signature = reader.ReadStringToNull();
@@ -92,7 +99,31 @@ namespace AssetStudio
                     break;
                 case "UnityFS":
                     ReadHeader(reader);
-                    ReadBlocksInfoAndDirectory(reader);
+
+                    bool isUnityCnEnc = false;
+                    string unityVer = string.IsNullOrEmpty(specUnityVer) ? m_Header.unityRevision : specUnityVer;
+                    int[] ver = new string(unityVer.SkipWhile(x => !char.IsDigit(x)).TakeWhile(x => char.IsDigit(x) || x == '.').ToArray()).Split('.').Select(x => int.Parse(x)).ToArray();
+                    if (ver[0] != 0)
+                    {
+                        // https://issuetracker.unity3d.com/issues/files-within-assetbundles-do-not-start-on-aligned-boundaries-breaking-patching-on-nintendo-switch
+                        if (ver[0] < 2020 ||
+                           (ver[0] == 2020 && ver[1] <= 3 && ver[2] < 34) ||
+                           (ver[0] == 2021 && ver[1] <= 3 && ver[2] < 2) ||
+                           (ver[0] == 2022 && ver[1] <= 1 && ver[2] < 1))
+                        {
+                            isUnityCnEnc = ((CnEncryptionFlags)m_Header.flags & CnEncryptionFlags.OldFlag) != 0;
+                        }
+                        else
+                        {
+                            isUnityCnEnc = ((CnEncryptionFlags)m_Header.flags & CnEncryptionFlags.NewFlag) != 0;                    
+                        }
+                    }
+                    if (isUnityCnEnc)
+                    {
+                        throw new NotSupportedException("Unsupported bundle file. UnityCN encryption was detected.");
+                    }
+
+                    ReadBlocksInfoAndDirectory(reader, ver);
                     using (var blocksStream = CreateBlocksStream(reader.FullPath))
                     {
                         ReadBlocks(reader, blocksStream);
@@ -227,13 +258,27 @@ namespace AssetStudio
             }
         }
 
-        private void ReadBlocksInfoAndDirectory(EndianBinaryReader reader)
+        private void ReadBlocksInfoAndDirectory(EndianBinaryReader reader, int[] unityVer)
         {
             byte[] blocksInfoBytes;
+
             if (m_Header.version >= 7)
             {
                 reader.AlignStream(16);
             }
+            else if (unityVer[0] >= 2019 && unityVer[1] >= 4)
+            {
+                //check if we need to align the reader
+                //- align to 16 bytes and check if all are 0
+                //- if not, reset the reader to the previous position
+                var preAlign = reader.Position;
+                var alignData = reader.ReadBytes((16 - (int)(preAlign % 16)) % 16);
+                if (alignData.Any(x => x != 0))
+                {
+                    reader.Position = preAlign;
+                }
+            }
+
             if ((m_Header.flags & ArchiveFlags.BlocksInfoAtTheEnd) != 0)
             {
                 var position = reader.Position;

AssetStudio/Classes/VideoClip.cs

@@ -21,22 +21,27 @@ namespace AssetStudio
         public ResourceReader m_VideoData;
         public string m_OriginalPath;
         public StreamedResource m_ExternalResources;
+        public uint Width;
+        public uint Height;
+        public double m_FrameRate;
+        public int m_Format;
+        public bool m_HasSplitAlpha;
 
         public VideoClip(ObjectReader reader) : base(reader)
         {
             m_OriginalPath = reader.ReadAlignedString();
             var m_ProxyWidth = reader.ReadUInt32();
             var m_ProxyHeight = reader.ReadUInt32();
-            var Width = reader.ReadUInt32();
-            var Height = reader.ReadUInt32();
+            Width = reader.ReadUInt32();
+            Height = reader.ReadUInt32();
             if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 2)) //2017.2 and up
             {
                 var m_PixelAspecRatioNum = reader.ReadUInt32();
                 var m_PixelAspecRatioDen = reader.ReadUInt32();
             }
-            var m_FrameRate = reader.ReadDouble();
+            m_FrameRate = reader.ReadDouble();
             var m_FrameCount = reader.ReadUInt64();
-            var m_Format = reader.ReadInt32();
+            m_Format = reader.ReadInt32();
             var m_AudioChannelCount = reader.ReadUInt16Array();
             reader.AlignStream();
             var m_AudioSampleRate = reader.ReadUInt32Array();
@@ -51,7 +56,7 @@ namespace AssetStudio
                 }
             }
             m_ExternalResources = new StreamedResource(reader);
-            var m_HasSplitAlpha = reader.ReadBoolean();
+            m_HasSplitAlpha = reader.ReadBoolean();
             if (version[0] >= 2020) //2020.1 and up
             {
                 var m_sRGB = reader.ReadBoolean();

AssetStudio/ILogger.cs

@@ -16,11 +16,11 @@ namespace AssetStudio
 
     public interface ILogger
     {
-        void Log(LoggerEvent loggerEvent, string message);
+        void Log(LoggerEvent loggerEvent, string message, bool ignoreLevel = false);
     }
 
     public sealed class DummyLogger : ILogger
     {
-        public void Log(LoggerEvent loggerEvent, string message) { }
+        public void Log(LoggerEvent loggerEvent, string message, bool ignoreLevel) { }
     }
 }

AssetStudio/Logger.cs

@@ -19,6 +19,7 @@ namespace AssetStudio
         {
             var sb = new StringBuilder();
             sb.AppendLine(message);
+            sb.AppendLine();
             sb.AppendLine(e.ToString());
             Default.Log(LoggerEvent.Error, sb.ToString());
         }

AssetStudio/SerializedFile.cs

@@ -223,6 +223,10 @@ namespace AssetStudio
             {
                 unityVersion = stringVersion;
                 var buildSplit = Regex.Replace(stringVersion, @"\d", "").Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries);
+                if (buildSplit.Length == 0)
+                    throw new NotSupportedException("Specified Unity version is not in a correct format.\n" +
+                        "Specify full Unity version, including letters at the end.\n" +
+                        "Example: 2017.4.39f1");
                 buildType = new BuildType(buildSplit[0]);
                 var versionSplit = Regex.Replace(stringVersion, @"\D", ".").Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries);
                 version = versionSplit.Select(int.Parse).ToArray();

AssetStudioCLI/AssetStudioCLI.csproj

@@ -0,0 +1,96 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
+        <AssemblyTitle>AssetStudio Mod by VaDiM</AssemblyTitle>
+        <Version>0.16.48.1</Version>
+        <Copyright>Copyright © Perfare; Copyright © aelurum 2023</Copyright>
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <DebugType>embedded</DebugType>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\AssetStudioUtility\AssetStudioUtility.csproj" />
+        <ProjectReference Include="..\AssetStudio\AssetStudio.csproj" />
+    </ItemGroup>
+    
+    <!-- Use local compiled win-x86 and win-x64 Texture2DDecoder libs, because libs from Kyaru.Texture2DDecoder.Windows were compiled with /MD flag -->
+
+    <Target Name="CopyExtraFilesPortable" AfterTargets="AfterBuild" Condition=" '$(RuntimeIdentifier)' == '' ">
+        <Message Text="Copying windows extra files for $(TargetFramework)... " Importance="high" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\Win32\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\x64\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)runtimes\win-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\win-x86\fmod.dll" DestinationFolder="$(TargetDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\win-x64\fmod.dll" DestinationFolder="$(TargetDir)runtimes\win-x64\native" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="CopyExtraFilesPortableNet" AfterTargets="AfterBuild" Condition=" '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' != 'net472' ">
+        <Message Text="Copying other platforms extra files for $(TargetFramework)... " Importance="high" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\linux-x86\libfmod.so" DestinationFolder="$(TargetDir)runtimes\linux-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\linux-x64\libfmod.so" DestinationFolder="$(TargetDir)runtimes\linux-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\osx-x64\libfmod.dylib" DestinationFolder="$(TargetDir)runtimes\osx-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\osx-arm64\libfmod.dylib" DestinationFolder="$(TargetDir)runtimes\osx-arm64\native" ContinueOnError="false" />
+    </Target>
+
+    <!-- Publishing an app as framework-dependent produces a cross-platform binary as a dll file, and a platform-specific executable that targets your current platform.
+    The dll is cross-platform while the executable isn't -->
+    <Target Name="PublishExtraFilesPortable" AfterTargets="Publish" Condition=" '$(RuntimeIdentifier)' == '' ">
+        <Message Text="Publishing windows extra files for Portable build ($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x86\native\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x64\native\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)runtimes\win-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x86\native\fmod.dll" DestinationFolder="$(PublishDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x64\native\fmod.dll" DestinationFolder="$(PublishDir)runtimes\win-x64\native" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="PublishExtraFilesPortableNet" AfterTargets="Publish" Condition=" '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' != 'net472' ">
+        <Message Text="Publishing other platforms extra files for Portable build ($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(TargetDir)runtimes\linux-x86\native\libfmod.so" DestinationFolder="$(PublishDir)runtimes\linux-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\linux-x64\native\libfmod.so" DestinationFolder="$(PublishDir)runtimes\linux-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\osx-x64\native\libfmod.dylib" DestinationFolder="$(PublishDir)runtimes\osx-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\osx-arm64\native\libfmod.dylib" DestinationFolder="$(PublishDir)runtimes\osx-arm64\native" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="CopyExtraFilesWin86" AfterTargets="AfterBuild" Condition=" '$(RuntimeIdentifier)' == 'win-x86' ">
+        <Message Text="Copying extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\Win32\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\win-x86\fmod.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="CopyExtraFilesWin64" AfterTargets="AfterBuild" Condition=" '$(RuntimeIdentifier)' == 'win-x64' ">
+        <Message Text="Copying extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\x64\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\win-x64\fmod.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="PublishExtraFilesWin" AfterTargets="Publish" Condition=" $(RuntimeIdentifier.Contains('win-x')) ">
+        <Message Text="Publishing extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(TargetDir)\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)\fmod.dll" DestinationFolder="$(PublishDir)" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="CopyExtraFilesLinux64" AfterTargets="AfterBuild" Condition=" '$(RuntimeIdentifier)' == 'linux-x64' ">
+        <Message Text="Copying extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\linux-x64\libfmod.so" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="PublishExtraFilesLinux64" AfterTargets="Publish" Condition=" '$(RuntimeIdentifier)' == 'linux-x64' ">
+        <Message Text="Publishing extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(TargetDir)\libfmod.so" DestinationFolder="$(PublishDir)" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="CopyExtraFilesMac" AfterTargets="AfterBuild" Condition=" $(RuntimeIdentifier.Contains('osx-')) ">
+        <Message Text="Copying extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\$(RuntimeIdentifier)\libfmod.dylib" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="PublishExtraFilesMac" AfterTargets="Publish" Condition=" $(RuntimeIdentifier.Contains('osx-')) ">
+        <Message Text="Publishing extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(TargetDir)\libfmod.dylib" DestinationFolder="$(PublishDir)" ContinueOnError="false" />
+    </Target>
+
+</Project>

AssetStudioCLI/CLILogger.cs

@@ -0,0 +1,117 @@
+using AssetStudio;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using AssetStudioCLI.Options;
+
+namespace AssetStudioCLI
+{
+    internal enum LogOutputMode
+    {
+        Console,
+        File,
+        Both,
+    }
+
+    internal class CLILogger : ILogger
+    {
+        private readonly LogOutputMode logOutput;
+        private readonly LoggerEvent logMinLevel;
+        public string LogName;
+        public string LogPath;
+
+        public CLILogger(CLIOptions options)
+        {
+            logOutput = options.o_logOutput.Value;
+            logMinLevel = options.o_logLevel.Value;
+            LogName = $"AssetStudioCLI_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.log";
+            LogPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, LogName);
+
+            var ver = typeof(Program).Assembly.GetName().Version;
+            LogToFile(LoggerEvent.Verbose, $"---AssetStudioCLI v{ver} | Logger launched---\n" +
+                                           $"CMD Args: {string.Join(" ", options.cliArgs)}");
+        }
+
+        private static string ColorLogLevel(LoggerEvent logLevel)
+        {
+            string formattedLevel = $"[{logLevel}]";
+            switch (logLevel)
+            {
+                case LoggerEvent.Info:
+                    return $"{formattedLevel.Color(CLIAnsiColors.BrightCyan)}";
+                case LoggerEvent.Warning:
+                    return $"{formattedLevel.Color(CLIAnsiColors.BrightYellow)}";
+                case LoggerEvent.Error:
+                    return $"{formattedLevel.Color(CLIAnsiColors.BrightRed)}";
+                default:
+                    return formattedLevel;
+            }
+        }
+
+        private static string FormatMessage(LoggerEvent logMsgLevel, string message, bool consoleMode = false)
+        {
+            var curTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            message = message.TrimEnd();
+            var multiLine = message.Contains('\n');
+            
+            string formattedMessage;
+            if (consoleMode)
+            {
+                string colorLogLevel = ColorLogLevel(logMsgLevel);
+                formattedMessage = $"{colorLogLevel} {message}";
+                if (multiLine)
+                {
+                    formattedMessage = formattedMessage.Replace("\n", $"\n{colorLogLevel} ");
+                }
+            }
+            else
+            {
+                message = Regex.Replace(message, @"\e\[[0-9;]*m(?:\e\[K)?", "");  //Delete ANSI colors
+                var logLevel = $"{logMsgLevel.ToString().ToUpper(),-7}";
+                formattedMessage = $"{curTime} | {logLevel} | {message}";
+                if (multiLine)
+                {
+                    formattedMessage = formattedMessage.Replace("\n", $"\n{curTime} | {logLevel} | ");
+                }
+            }
+            return formattedMessage;
+        }
+
+        public void LogToConsole(LoggerEvent logMsgLevel, string message)
+        {
+            if (logOutput != LogOutputMode.File)
+            {
+                Console.WriteLine(FormatMessage(logMsgLevel, message, consoleMode: true));
+            }
+        }
+
+        public async void LogToFile(LoggerEvent logMsgLevel, string message)
+        {
+            if (logOutput != LogOutputMode.Console)
+            {
+                using (var sw = new StreamWriter(LogPath, append: true, System.Text.Encoding.UTF8))
+                {
+                    await sw.WriteLineAsync(FormatMessage(logMsgLevel, message));
+                }
+            }
+        }
+
+        public void Log(LoggerEvent logMsgLevel, string message, bool ignoreLevel)
+        {
+            if ((logMsgLevel < logMinLevel && !ignoreLevel) || string.IsNullOrEmpty(message))
+            {
+                return;
+            }
+
+            if (logOutput != LogOutputMode.File)
+            {
+                LogToConsole(logMsgLevel, message);
+            }
+            if (logOutput != LogOutputMode.Console)
+            {
+                LogToFile(logMsgLevel, message);
+            }
+        }
+    }
+}

AssetStudioCLI/Components/AssetItem.cs

@@ -0,0 +1,27 @@
+using AssetStudio;
+
+namespace AssetStudioCLI
+{
+    internal class AssetItem
+    {
+        public Object Asset;
+        public SerializedFile SourceFile;
+        public string Container = string.Empty;
+        public string TypeString;
+        public long m_PathID;
+        public long FullSize;
+        public ClassIDType Type;
+        public string Text;
+        public string UniqueID;
+
+        public AssetItem(Object asset)
+        {
+            Asset = asset;
+            SourceFile = asset.assetsFile;
+            Type = asset.type;
+            TypeString = Type.ToString();
+            m_PathID = asset.m_PathID;
+            FullSize = asset.byteSize;
+        }
+    }
+}

AssetStudioCLI/Components/CLIAnsiColors.cs

@@ -0,0 +1,49 @@
+using System;
+
+namespace AssetStudioCLI
+{
+    // Represents set with 16 base colors using ANSI escape codes, which should be supported in most terminals
+    // (well, except for windows editions before windows 10)
+    public static class CLIAnsiColors
+    {
+        public static readonly string
+            Black = "\u001b[30m",
+            Red = "\u001b[31m",
+            Green = "\u001b[32m",
+            Yellow = "\u001b[33m",   //remapped to ~BrightWhite in Windows PowerShell 6
+            Blue = "\u001b[34m",
+            Magenta = "\u001b[35m",  //remapped to ~Blue in Windows PowerShell 6
+            Cyan = "\u001b[36m",
+            White = "\u001b[37m",
+            BrightBlack = "\u001b[30;1m",
+            BrightRed = "\u001b[31;1m",
+            BrightGreen = "\u001b[32;1m",
+            BrightYellow = "\u001b[33;1m",
+            BrightBlue = "\u001b[34;1m",
+            BrightMagenta = "\u001b[35;1m",
+            BrightCyan = "\u001b[36;1m",
+            BrightWhite = "\u001b[37;1m";
+        private static readonly string Reset = "\u001b[0m";
+
+        public static string Color(this string str, string ansiColor)
+        {
+            if (!CLIWinAnsiFix.isAnsiSupported)
+            {
+                return str;
+            }
+
+            return $"{ansiColor}{str}{Reset}";
+        }
+
+        public static void ANSICodesTest()
+        {
+            Console.WriteLine("ANSI escape codes test");
+            Console.WriteLine($"Supported: {CLIWinAnsiFix.isAnsiSupported}");
+            Console.WriteLine("\u001b[30m A \u001b[31m B \u001b[32m C \u001b[33m D \u001b[0m");
+            Console.WriteLine("\u001b[34m E \u001b[35m F \u001b[36m G \u001b[37m H \u001b[0m");
+            Console.WriteLine("\u001b[30;1m A \u001b[31;1m B \u001b[32;1m C \u001b[33;1m D \u001b[0m");
+            Console.WriteLine("\u001b[34;1m E \u001b[35;1m F \u001b[36;1m G \u001b[37;1m H \u001b[0m");
+        }
+    }
+
+}

AssetStudioCLI/Components/CLIWinAnsiFix.cs

@@ -0,0 +1,62 @@
+// Based on code by tomzorz (https://gist.github.com/tomzorz/6142d69852f831fb5393654c90a1f22e)
+using System;
+using System.Runtime.InteropServices;
+
+namespace AssetStudioCLI
+{
+    static class CLIWinAnsiFix
+    {
+        public static readonly bool isAnsiSupported;
+        private const int STD_OUTPUT_HANDLE = -11;
+        private const uint ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004;
+
+        [DllImport("kernel32.dll")]
+        private static extern bool GetConsoleMode(IntPtr hConsoleHandle, out uint lpMode);
+
+        [DllImport("kernel32.dll")]
+        private static extern bool SetConsoleMode(IntPtr hConsoleHandle, uint dwMode);
+
+        [DllImport("kernel32.dll")]
+        private static extern IntPtr GetStdHandle(int nStdHandle);
+
+        static CLIWinAnsiFix()
+        { 
+            bool isWin = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+            if (isWin)
+            {
+                isAnsiSupported = TryEnableVTMode();
+                if (!isAnsiSupported)
+                {
+                    //Check for bash terminal emulator. E.g., Git Bash, Cmder
+                    isAnsiSupported = Environment.GetEnvironmentVariable("TERM") != null;
+                }
+            }
+            else
+            {
+                isAnsiSupported = true;
+            }
+        }
+
+        // Enable support for ANSI escape codes
+        // (but probably only suitable for windows 10+)
+        // https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
+        private static bool TryEnableVTMode()
+        {
+            var iStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
+
+            if (!GetConsoleMode(iStdOut, out uint outConsoleMode))
+            {
+                return false;
+            }
+
+            outConsoleMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+
+            if (!SetConsoleMode(iStdOut, outConsoleMode))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}

AssetStudioCLI/Exporter.cs

@@ -0,0 +1,314 @@
+using AssetStudio;
+using AssetStudioCLI.Options;
+using Newtonsoft.Json;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace AssetStudioCLI
+{
+    internal static class Exporter
+    {
+        public static AssemblyLoader assemblyLoader = new AssemblyLoader();
+
+        public static bool ExportTexture2D(AssetItem item, string exportPath, CLIOptions options)
+        {
+            var m_Texture2D = (Texture2D)item.Asset;
+            if (options.convertTexture)
+            {
+                var type = options.o_imageFormat.Value;
+                if (!TryExportFile(exportPath, item, "." + type.ToString().ToLower(), out var exportFullPath))
+                    return false;
+                var image = m_Texture2D.ConvertToImage(flip: true);
+                if (image == null)
+                {
+                    Logger.Error($"Export error. Failed to convert texture \"{m_Texture2D.m_Name}\" into image");
+                    return false;
+                }
+                using (image)
+                {
+                    using (var file = File.OpenWrite(exportFullPath))
+                    {
+                        image.WriteToStream(file, type);
+                    }
+                    Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+                    return true;
+                }
+            }
+            else
+            {
+                if (!TryExportFile(exportPath, item, ".tex", out var exportFullPath))
+                    return false;
+                File.WriteAllBytes(exportFullPath, m_Texture2D.image_data.GetData());
+                Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+                return true;
+            }
+        }
+
+        public static bool ExportAudioClip(AssetItem item, string exportPath, CLIOptions options)
+        {
+            string exportFullPath;
+            var m_AudioClip = (AudioClip)item.Asset;
+            var m_AudioData = m_AudioClip.m_AudioData.GetData();
+            if (m_AudioData == null || m_AudioData.Length == 0)
+            {
+                Logger.Error($"Export error. \"{item.Text}\": AudioData was not found");
+                return false;
+            }
+            var converter = new AudioClipConverter(m_AudioClip);
+            if (options.o_audioFormat.Value != AudioFormat.None && converter.IsSupport)
+            {
+                if (!TryExportFile(exportPath, item, ".wav", out exportFullPath))
+                    return false;
+
+                var sb = new StringBuilder();
+                sb.AppendLine($"Converting \"{m_AudioClip.m_Name}\" to wav..");
+                sb.AppendLine(m_AudioClip.version[0] < 5 ? $"AudioClip type: {m_AudioClip.m_Type}" : $"AudioClip compression format: {m_AudioClip.m_CompressionFormat}");
+                sb.AppendLine($"AudioClip channel count: {m_AudioClip.m_Channels}");
+                sb.AppendLine($"AudioClip sample rate: {m_AudioClip.m_Frequency}");
+                sb.AppendLine($"AudioClip bit depth: {m_AudioClip.m_BitsPerSample}");
+                Logger.Debug(sb.ToString());
+
+                var buffer = converter.ConvertToWav(m_AudioData);
+                if (buffer == null)
+                {
+                    Logger.Error($"Export error. \"{item.Text}\": Failed to convert to Wav");
+                    return false;
+                }
+                File.WriteAllBytes(exportFullPath, buffer);
+            }
+            else
+            {
+                if (!TryExportFile(exportPath, item, converter.GetExtensionName(), out exportFullPath))
+                    return false;
+                File.WriteAllBytes(exportFullPath, m_AudioData);
+            }
+
+            Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+            return true;
+        }
+
+        public static bool ExportVideoClip(AssetItem item, string exportPath)
+        {
+            var m_VideoClip = (VideoClip)item.Asset;
+            if (m_VideoClip.m_ExternalResources.m_Size > 0)
+            {
+                if (!TryExportFile(exportPath, item, Path.GetExtension(m_VideoClip.m_OriginalPath), out var exportFullPath))
+                    return false;
+
+                var sb = new StringBuilder();
+                sb.AppendLine($"VideoClip format: {m_VideoClip.m_Format}");
+                sb.AppendLine($"VideoClip width: {m_VideoClip.Width}");
+                sb.AppendLine($"VideoClip height: {m_VideoClip.Height}");
+                sb.AppendLine($"VideoClip frame rate: {m_VideoClip.m_FrameRate}");
+                sb.AppendLine($"VideoClip split alpha: {m_VideoClip.m_HasSplitAlpha}");
+                Logger.Debug(sb.ToString());
+
+                m_VideoClip.m_VideoData.WriteData(exportFullPath);
+                Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+                return true;
+            }
+            return false;
+        }
+
+        public static bool ExportMovieTexture(AssetItem item, string exportPath)
+        {
+            var m_MovieTexture = (MovieTexture)item.Asset;
+            if (!TryExportFile(exportPath, item, ".ogv", out var exportFullPath))
+                return false;
+            File.WriteAllBytes(exportFullPath, m_MovieTexture.m_MovieData);
+
+            Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+            return true;
+        }
+
+        public static bool ExportShader(AssetItem item, string exportPath)
+        {
+            if (!TryExportFile(exportPath, item, ".shader", out var exportFullPath))
+                return false;
+            var m_Shader = (Shader)item.Asset;
+            var str = m_Shader.Convert();
+            File.WriteAllText(exportFullPath, str);
+
+            Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+            return true;
+        }
+        
+        public static bool ExportTextAsset(AssetItem item, string exportPath, CLIOptions options)
+        {
+            var m_TextAsset = (TextAsset)item.Asset;
+            var extension = ".txt";
+            if (!options.f_notRestoreExtensionName.Value)
+            {
+                if (!string.IsNullOrEmpty(item.Container))
+                {
+                    extension = Path.GetExtension(item.Container);
+                }
+            }
+            if (!TryExportFile(exportPath, item, extension, out var exportFullPath))
+                return false;
+            File.WriteAllBytes(exportFullPath, m_TextAsset.m_Script);
+
+            Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+            return true;
+        }
+        
+        public static bool ExportMonoBehaviour(AssetItem item, string exportPath, CLIOptions options)
+        {
+            if (!TryExportFile(exportPath, item, ".json", out var exportFullPath))
+                return false;
+            var m_MonoBehaviour = (MonoBehaviour)item.Asset;
+            var type = m_MonoBehaviour.ToType();
+            if (type == null)
+            {
+                var m_Type = MonoBehaviourToTypeTree(m_MonoBehaviour, options);
+                type = m_MonoBehaviour.ToType(m_Type);
+            }
+            var str = JsonConvert.SerializeObject(type, Formatting.Indented);
+            File.WriteAllText(exportFullPath, str);
+
+            Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+            return true;
+        }
+
+        public static bool ExportFont(AssetItem item, string exportPath)
+        {
+            var m_Font = (Font)item.Asset;
+            if (m_Font.m_FontData != null)
+            {
+                var extension = ".ttf";
+                if (m_Font.m_FontData[0] == 79 && m_Font.m_FontData[1] == 84 && m_Font.m_FontData[2] == 84 && m_Font.m_FontData[3] == 79)
+                {
+                    extension = ".otf";
+                }
+                if (!TryExportFile(exportPath, item, extension, out var exportFullPath))
+                    return false;
+                File.WriteAllBytes(exportFullPath, m_Font.m_FontData);
+
+                Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+                return true;
+            }
+            return false;
+        }
+
+        public static bool ExportSprite(AssetItem item, string exportPath, CLIOptions options)
+        {
+            var type = options.o_imageFormat.Value;
+            var alphaMask = SpriteMaskMode.On;
+            if (!TryExportFile(exportPath, item, "." + type.ToString().ToLower(), out var exportFullPath))
+                return false;
+            var image = ((Sprite)item.Asset).GetImage(alphaMask);
+            if (image != null)
+            {
+                using (image)
+                {
+                    using (var file = File.OpenWrite(exportFullPath))
+                    {
+                        image.WriteToStream(file, type);
+                    }
+                    Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public static bool ExportRawFile(AssetItem item, string exportPath)
+        {
+            if (!TryExportFile(exportPath, item, ".dat", out var exportFullPath))
+                return false;
+            File.WriteAllBytes(exportFullPath, item.Asset.GetRawData());
+
+            Logger.Debug($"{item.TypeString}: \"{item.Text}\" exported to \"{exportFullPath}\"");
+            return true;
+        }
+
+        public static bool ExportDumpFile(AssetItem item, string exportPath, CLIOptions options)
+        {
+            if (!TryExportFile(exportPath, item, ".txt", out var exportFullPath))
+                return false;
+            var str = item.Asset.Dump();
+            if (str == null && item.Asset is MonoBehaviour m_MonoBehaviour)
+            {
+                var m_Type = MonoBehaviourToTypeTree(m_MonoBehaviour, options);
+                str = m_MonoBehaviour.Dump(m_Type);
+            }
+            if (str != null)
+            {
+                File.WriteAllText(exportFullPath, str);
+                Logger.Debug($"{item.TypeString}: \"{item.Text}\" saved to \"{exportFullPath}\"");
+                return true;
+            }
+            return false;
+        }
+
+        private static bool TryExportFile(string dir, AssetItem item, string extension, out string fullPath)
+        {
+            var fileName = FixFileName(item.Text);
+            fullPath = Path.Combine(dir, fileName + extension);
+            if (!File.Exists(fullPath))
+            {
+                Directory.CreateDirectory(dir);
+                return true;
+            }
+            fullPath = Path.Combine(dir, fileName + item.UniqueID + extension);
+            if (!File.Exists(fullPath))
+            {
+                Directory.CreateDirectory(dir);
+                return true;
+            }
+            Logger.Error($"Export error. File \"{fullPath.Color(CLIAnsiColors.BrightRed)}\" already exist");
+            return false;
+        }
+
+        public static bool ExportConvertFile(AssetItem item, string exportPath, CLIOptions options)
+        {
+            switch (item.Type)
+            {
+                case ClassIDType.Texture2D:
+                    return ExportTexture2D(item, exportPath, options);
+                case ClassIDType.AudioClip:
+                    return ExportAudioClip(item, exportPath, options);
+                case ClassIDType.VideoClip:
+                    return ExportVideoClip(item, exportPath);
+                case ClassIDType.MovieTexture:
+                    return ExportMovieTexture(item, exportPath);
+                case ClassIDType.Shader:
+                    return ExportShader(item, exportPath);
+                case ClassIDType.TextAsset:
+                    return ExportTextAsset(item, exportPath, options);
+                case ClassIDType.MonoBehaviour:
+                    return ExportMonoBehaviour(item, exportPath, options);
+                case ClassIDType.Font:
+                    return ExportFont(item, exportPath);
+                case ClassIDType.Sprite:
+                    return ExportSprite(item, exportPath, options);
+                default:
+                    return ExportRawFile(item, exportPath);
+            }
+        }
+
+        public static TypeTree MonoBehaviourToTypeTree(MonoBehaviour m_MonoBehaviour, CLIOptions options)
+        {
+            if (!assemblyLoader.Loaded)
+            {
+                var assemblyFolder = options.o_assemblyPath.Value;
+                if (assemblyFolder != "")
+                {
+                    assemblyLoader.Load(assemblyFolder);
+                }
+                else
+                {
+                    assemblyLoader.Loaded = true;
+                }
+            }
+            return m_MonoBehaviour.ConvertToTypeTree(assemblyLoader);
+        }
+
+        public static string FixFileName(string str)
+        {
+            if (str.Length >= 260) return Path.GetRandomFileName();
+            return Path.GetInvalidFileNameChars().Aggregate(str, (current, c) => current.Replace(c, '_'));
+        }
+    }
+}

AssetStudioCLI/Options/CLIOptions.cs

@@ -0,0 +1,795 @@
+using AssetStudio;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace AssetStudioCLI.Options
+{
+    internal enum HelpGroups
+    {
+        General,
+        Convert,
+        Logger,
+        Advanced,
+    }
+
+    internal enum WorkMode
+    {
+        Export,
+        ExportRaw,
+        Dump,
+        Info,
+    }
+
+    internal enum AssetGroupOption
+    {
+        None,
+        TypeName,
+        ContainerPath,
+        SourceFileName,
+    }
+
+    internal enum ExportListType
+    {
+        None,
+        XML,
+    }
+
+    internal enum AudioFormat
+    {
+        None,
+        Wav,
+    }
+
+    internal enum FilterBy
+    {
+        None,
+        Name,
+        Container,
+        PathID,
+        NameOrContainer,
+        NameAndContainer,
+    }
+
+    internal class GroupedOption<T> : Option<T>
+    {
+        public GroupedOption(T optionDefaultValue, string optionName, string optionDescription, HelpGroups optionHelpGroup, bool isFlag = false) : base(optionDefaultValue, optionName, optionDescription, optionHelpGroup, isFlag)
+        {
+            CLIOptions.OptionGrouping(optionName, optionDescription, optionHelpGroup, isFlag);
+        }
+    }
+
+    internal class CLIOptions
+    {
+        public bool isParsed;
+        public bool showHelp;
+        public string[] cliArgs;
+        public string inputPath;
+        public FilterBy filterBy;
+        private static Dictionary<string, string> optionsDict;
+        private static Dictionary<string, string> flagsDict;
+        private static Dictionary<HelpGroups, Dictionary<string, string>> optionGroups;
+        private List<ClassIDType> supportedAssetTypes;
+        //general
+        public Option<WorkMode> o_workMode;
+        public Option<List<ClassIDType>> o_exportAssetTypes;
+        public Option<AssetGroupOption> o_groupAssetsBy;
+        public Option<string> o_outputFolder;
+        public Option<bool> o_displayHelp;
+        //logger
+        public Option<LoggerEvent> o_logLevel;
+        public Option<LogOutputMode> o_logOutput;
+        //convert
+        public bool convertTexture;
+        public Option<ImageFormat> o_imageFormat;
+        public Option<AudioFormat> o_audioFormat;
+        //advanced
+        public Option<ExportListType> o_exportAssetList;
+        public Option<List<string>> o_filterByName;
+        public Option<List<string>> o_filterByContainer;
+        public Option<List<string>> o_filterByPathID;
+        public Option<List<string>> o_filterByText;
+        public Option<string> o_assemblyPath;
+        public Option<string> o_unityVersion;
+        public Option<bool> f_notRestoreExtensionName;
+
+        public CLIOptions(string[] args)
+        {
+            cliArgs = args;
+            InitOptions();
+            ParseArgs(args);
+        }
+
+        private void InitOptions()
+        {
+            isParsed = false;
+            showHelp = false;
+            inputPath = "";
+            filterBy = FilterBy.None;
+            optionsDict = new Dictionary<string, string>();
+            flagsDict = new Dictionary<string, string>();
+            optionGroups = new Dictionary<HelpGroups, Dictionary<string, string>>();
+            supportedAssetTypes = new List<ClassIDType>
+            {
+                ClassIDType.Texture2D,
+                ClassIDType.Sprite,
+                ClassIDType.TextAsset,
+                ClassIDType.MonoBehaviour,
+                ClassIDType.Font,
+                ClassIDType.Shader,
+                ClassIDType.AudioClip,
+                ClassIDType.VideoClip,
+                ClassIDType.MovieTexture,
+            };
+
+            #region Init General Options
+            o_workMode = new GroupedOption<WorkMode>
+            (
+                optionDefaultValue: WorkMode.Export,
+                optionName: "-m, --mode <value>",
+                optionDescription: "Specify working mode\n" +
+                    "<Value: export(default) | exportRaw | dump | info>\n" +
+                    "Export - Exports converted assets\n" +
+                    "ExportRaw - Exports raw data\n" +
+                    "Dump - Makes asset dumps\n" +
+                    "Info - Loads file(s), shows the number of supported for export assets and exits\n" +
+                    "Example: \"-m info\"\n",
+                optionHelpGroup: HelpGroups.General
+            );
+            o_exportAssetTypes = new GroupedOption<List<ClassIDType>>
+            (
+                optionDefaultValue: supportedAssetTypes,
+                optionName: "-t, --asset-type <value(s)>",
+                optionDescription: "Specify asset type(s) to export\n" +
+                    "<Value(s): tex2d, sprite, textAsset, monoBehaviour, font, shader, movieTexture,\n" +
+                    "audio, video | all(default)>\n" +
+                    "All - export all asset types, which are listed in the values\n" +
+                    "*To specify multiple asset types, write them separated by ',' or ';' without spaces\n" +
+                    "Examples: \"-t sprite\" or \"-t all\" or \"-t tex2d,sprite,audio\" or \"-t tex2d;sprite;font\"\n",
+                optionHelpGroup: HelpGroups.General
+            );
+            o_groupAssetsBy = new GroupedOption<AssetGroupOption>
+            (
+                optionDefaultValue: AssetGroupOption.ContainerPath,
+                optionName: "-g, --group-option <value>",
+                optionDescription: "Specify the way in which exported assets should be grouped\n" +
+                    "<Value: none | type | container(default) | filename>\n" +
+                    "None - Do not group exported assets\n" +
+                    "Type - Group exported assets by type name\n" +
+                    "Container - Group exported assets by container path\n" +
+                    "Filename - Group exported assets by source file name\n" +
+                    "Example: \"-g container\"\n",
+                optionHelpGroup: HelpGroups.General
+            );
+            o_outputFolder = new GroupedOption<string>
+            (
+                optionDefaultValue: "",
+                optionName: "-o, --output <path>",
+                optionDescription: "Specify path to the output folder\n" +
+                    "If path isn't specifyed, 'ASExport' folder will be created in the program's work folder\n",
+                optionHelpGroup: HelpGroups.General
+            );
+            o_displayHelp = new GroupedOption<bool>
+            (
+                optionDefaultValue: false,
+                optionName: "-h, --help",
+                optionDescription: "Display help and exit",
+                optionHelpGroup: HelpGroups.General
+            );
+            #endregion
+
+            #region Init Logger Options
+            o_logLevel = new GroupedOption<LoggerEvent>
+            (
+                optionDefaultValue: LoggerEvent.Info,
+                optionName: "--log-level <value>",
+                optionDescription: "Specify the log level\n" +
+                    "<Value: verbose | debug | info(default) | warning | error>\n" +
+                    "Example: \"--log-level warning\"\n",
+                optionHelpGroup: HelpGroups.Logger
+            );
+            o_logOutput = new GroupedOption<LogOutputMode> 
+            (
+                optionDefaultValue: LogOutputMode.Console,
+                optionName: "--log-output <value>",
+                optionDescription: "Specify the log output\n" +
+                    "<Value: console(default) | file | both>\n" +
+                    "Example: \"--log-output both\"",
+                optionHelpGroup: HelpGroups.Logger
+            );
+            #endregion
+
+            #region Init Convert Options
+            convertTexture = true;
+            o_imageFormat = new GroupedOption<ImageFormat>
+            (
+                optionDefaultValue: ImageFormat.Png,
+                optionName: "--image-format <value>",
+                optionDescription: "Specify the format for converting image assets\n" +
+                    "<Value: none | jpg | png(default) | bmp | tga | webp>\n" +
+                    "None - Do not convert images and export them as texture data (.tex)\n" +
+                    "Example: \"--image-format jpg\"\n",
+                optionHelpGroup: HelpGroups.Convert
+            );
+            o_audioFormat = new GroupedOption<AudioFormat>
+            (
+                optionDefaultValue: AudioFormat.Wav,
+                optionName: "--audio-format <value>",
+                optionDescription: "Specify the format for converting audio assets\n" +
+                    "<Value: none | wav(default)>\n" +
+                    "None - Do not convert audios and export them in their own format\n" +
+                    "Example: \"--audio-format wav\"",
+                optionHelpGroup: HelpGroups.Convert
+            );
+            #endregion
+
+            #region Init Advanced Options
+            o_exportAssetList = new GroupedOption<ExportListType>
+            (
+                optionDefaultValue: ExportListType.None,
+                optionName: "--export-asset-list <value>",
+                optionDescription: "Specify the format in which you want to export asset list\n" +
+                    "<Value: none(default) | xml>\n" +
+                    "None - Do not export asset list\n" +
+                    "Example: \"--export-asset-list xml\"\n",
+                optionHelpGroup: HelpGroups.Advanced
+            );
+            o_filterByName = new GroupedOption<List<string>>
+            (
+                optionDefaultValue: new List<string>(),
+                optionName: "--filter-by-name <text>",
+                optionDescription: "Specify the name by which assets should be filtered\n" +
+                    "*To specify multiple names write them separated by ',' or ';' without spaces\n" +
+                    "Example: \"--filter-by-name char\" or \"--filter-by-name char,bg\"\n",
+                optionHelpGroup: HelpGroups.Advanced
+            );
+            o_filterByContainer = new GroupedOption<List<string>>
+            (
+                optionDefaultValue: new List<string>(),
+                optionName: "--filter-by-container <text>",
+                optionDescription: "Specify the container by which assets should be filtered\n" +
+                    "*To specify multiple containers write them separated by ',' or ';' without spaces\n" +
+                    "Example: \"--filter-by-container arts\" or \"--filter-by-container arts,icons\"\n",
+                optionHelpGroup: HelpGroups.Advanced
+            );
+            o_filterByPathID = new GroupedOption<List<string>>
+            (
+                optionDefaultValue: new List<string>(),
+                optionName: "--filter-by-pathid <text>",
+                optionDescription: "Specify the PathID by which assets should be filtered\n" +
+                    "*To specify multiple PathIDs write them separated by ',' or ';' without spaces\n" +
+                    "Example: \"--filter-by-pathid 7238605633795851352,-2430306240205277265\"\n",
+                optionHelpGroup: HelpGroups.Advanced
+            );
+            o_filterByText = new GroupedOption<List<string>>
+            (
+                optionDefaultValue: new List<string>(),
+                optionName: "--filter-by-text <text>",
+                optionDescription: "Specify the text by which assets should be filtered\n" +
+                    "Looks for assets that contain the specified text in their names or containers\n" +
+                    "*To specify multiple values write them separated by ',' or ';' without spaces\n" +
+                    "Example: \"--filter-by-text portrait\" or \"--filter-by-text portrait,art\"\n",
+                optionHelpGroup: HelpGroups.Advanced
+            );
+            o_assemblyPath = new GroupedOption<string>
+            (
+                optionDefaultValue: "",
+                optionName: "--assembly-folder <path>",
+                optionDescription: "Specify the path to the assembly folder",
+                optionHelpGroup: HelpGroups.Advanced
+            );
+            o_unityVersion = new GroupedOption<string>
+            (
+                optionDefaultValue: "",
+                optionName: "--unity-version <text>",
+                optionDescription: "Specify Unity version. Example: \"--unity-version 2017.4.39f1\"",
+                optionHelpGroup: HelpGroups.Advanced
+            );
+            f_notRestoreExtensionName = new GroupedOption<bool>
+            (
+                optionDefaultValue: false,
+                optionName: "--not-restore-extension",
+                optionDescription: "(Flag) If specified, AssetStudio will not try to restore TextAssets extension name, \nand will just export all TextAssets with the \".txt\" extension",
+                optionHelpGroup: HelpGroups.Advanced,
+                isFlag: true
+            );
+            #endregion
+        }
+
+        internal static void OptionGrouping(string name, string desc, HelpGroups group, bool isFlag)
+        {
+            if (string.IsNullOrEmpty(name))
+            {
+                return;
+            }
+
+            var optionDict = new Dictionary<string, string>() { { name, desc } };
+            if (!optionGroups.ContainsKey(group))
+            {
+                optionGroups.Add(group, optionDict);
+            }
+            else
+            {
+                optionGroups[group].Add(name, desc);
+            }
+
+            if (isFlag)
+            {
+                flagsDict.Add(name, desc);
+            }
+            else
+            {
+                optionsDict.Add(name, desc);
+            }
+        }
+
+        private void ParseArgs(string[] args)
+        {
+            var brightYellow = CLIAnsiColors.BrightYellow;
+            var brightRed = CLIAnsiColors.BrightRed;
+
+            if (args.Length == 0 || args.Any(x => x == "-h" || x == "--help"))
+            {
+                showHelp = true;
+                return;
+            }
+
+            if (!args[0].StartsWith("-"))
+            {
+                inputPath = Path.GetFullPath(args[0]).Replace("\"", "");
+                if (!Directory.Exists(inputPath) && !File.Exists(inputPath))
+                {
+                    Console.WriteLine($"{"Error:".Color(brightRed)} Invalid input path \"{args[0].Color(brightRed)}\".\n" +
+                        $"Specified file or folder was not found. The input path must be specified as the first argument.");
+                    return;
+                }
+                o_outputFolder.Value = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ASExport");
+            }
+            else
+            {
+                Console.WriteLine($"{"Error:".Color(brightRed)} Input path was empty. Specify the input path as the first argument.");
+                return;
+            }
+
+            var resplittedArgs = new List<string>();
+            for (int i = 1; i < args.Length; i++)
+            {
+                string arg = args[i];
+
+                if (arg.Contains('='))
+                {
+                    var splittedArgs = arg.Split('=');
+                    resplittedArgs.Add(splittedArgs[0]);
+                    resplittedArgs.Add(splittedArgs[1]);
+                }
+                else
+                {
+                    resplittedArgs.Add(arg);
+                }    
+            };
+
+            #region Parse Flags
+            for (int i = 0; i < resplittedArgs.Count; i++) 
+            {
+                string flag = resplittedArgs[i].ToLower();
+
+                switch(flag)
+                {
+                    case "--not-restore-extension":
+                        f_notRestoreExtensionName.Value = true;
+                        resplittedArgs.RemoveAt(i);
+                        break;
+                }
+            }            
+            #endregion
+
+            #region Parse Options
+            for (int i = 0; i < resplittedArgs.Count; i++)
+            {
+                var option = resplittedArgs[i].ToLower();
+                try
+                {
+                    var value = resplittedArgs[i + 1].Replace("\"", "");
+                    switch (option)
+                    {
+                        case "-m":
+                        case "--mode":
+                            switch (value.ToLower())
+                            {
+                                case "export":
+                                    o_workMode.Value = WorkMode.Export;
+                                    break;
+                                case "raw":
+                                case "exportraw":
+                                    o_workMode.Value = WorkMode.ExportRaw;
+                                    break;
+                                case "dump":
+                                    o_workMode.Value = WorkMode.Dump;
+                                    break;
+                                case "info":
+                                    o_workMode.Value = WorkMode.Info;
+                                    break;
+                                default:
+                                    Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported working mode: [{value.Color(brightRed)}].\n");
+                                    Console.WriteLine(o_workMode.Description);
+                                    return;
+                            }
+                            break;
+                        case "-t":
+                        case "--asset-type":
+                            var splittedTypes = ValueSplitter(value);
+                            o_exportAssetTypes.Value = new List<ClassIDType>();
+                            foreach (var type in splittedTypes)
+                            {
+                                switch (type.ToLower())
+                                {
+                                    case "tex2d":
+                                    case "texture2d":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.Texture2D);
+                                        break;
+                                    case "sprite":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.Sprite);
+                                        break;
+                                    case "textasset":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.TextAsset);
+                                        break;
+                                    case "monobehaviour":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.MonoBehaviour);
+                                        break;
+                                    case "font":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.Font);
+                                        break;
+                                    case "shader":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.Shader);
+                                        break;
+                                    case "audio":
+                                    case "audioclip":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.AudioClip);
+                                        break;
+                                    case "video":
+                                    case "videoclip":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.VideoClip);
+                                        break;
+                                    case "movietexture":
+                                        o_exportAssetTypes.Value.Add(ClassIDType.MovieTexture);
+                                        break;
+                                    case "all":
+                                        o_exportAssetTypes.Value = supportedAssetTypes;
+                                        break;
+                                    default:
+                                        Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported asset type: [{value.Color(brightRed)}].\n");
+                                        Console.WriteLine(o_exportAssetTypes.Description);
+                                        return;
+                                }
+                            }
+                            break;
+                        case "-g":
+                        case "--group-option":
+                            switch (value.ToLower())
+                            {
+                                case "type":
+                                    o_groupAssetsBy.Value = AssetGroupOption.TypeName;
+                                    break;
+                                case "container":
+                                    o_groupAssetsBy.Value = AssetGroupOption.ContainerPath;
+                                    break;
+                                case "filename":
+                                    o_groupAssetsBy.Value = AssetGroupOption.SourceFileName;
+                                    break;
+                                case "none":
+                                    o_groupAssetsBy.Value = AssetGroupOption.None;
+                                    break;
+                                default:
+                                    Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported grouping option: [{value.Color(brightRed)}].\n");
+                                    Console.WriteLine(o_groupAssetsBy.Description);
+                                    return;
+                            }
+                            break;
+                        case "-o":
+                        case "--output":
+                            try
+                            {
+                                value = Path.GetFullPath(value);
+                                if (!Directory.Exists(value))
+                                {
+                                    Directory.CreateDirectory(value);
+                                }
+                                o_outputFolder.Value = value;
+                            }
+                            catch (Exception ex)
+                            {
+                                Console.WriteLine($"{"Warning:".Color(brightYellow)} Invalid output folder \"{value.Color(brightYellow)}\".\n{ex.Message}");
+                                Console.WriteLine($"Working folder \"{o_outputFolder.Value.Color(brightYellow)}\" will be used as the output folder.\n");
+                                Console.WriteLine("Press ESC to exit or any other key to continue...\n");
+                                switch (Console.ReadKey(intercept: true).Key)
+                                {
+                                    case ConsoleKey.Escape:
+                                        return;
+                                }
+                            }
+                            break;
+                        case "--log-level":
+                            switch (value.ToLower())
+                            {
+                                case "verbose":
+                                    o_logLevel.Value = LoggerEvent.Verbose;
+                                    break;
+                                case "debug":
+                                    o_logLevel.Value = LoggerEvent.Debug;
+                                    break;
+                                case "info":
+                                    o_logLevel.Value = LoggerEvent.Info;
+                                    break;
+                                case "warning":
+                                    o_logLevel.Value = LoggerEvent.Warning;
+                                    break;
+                                case "error":
+                                    o_logLevel.Value = LoggerEvent.Error;
+                                    break;
+                                default:
+                                    Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported log level value: [{value.Color(brightRed)}].\n");
+                                    Console.WriteLine(o_logLevel.Description);
+                                    return;
+                            }
+                            break;
+                        case "--log-output":
+                            switch (value.ToLower())
+                            {
+                                case "console":
+                                    o_logOutput.Value = LogOutputMode.Console;
+                                    break;
+                                case "file":
+                                    o_logOutput.Value = LogOutputMode.File;
+                                    break;
+                                case "both":
+                                    o_logOutput.Value = LogOutputMode.Both;
+                                    break;
+                                default:
+                                    Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported log output mode: [{value.Color(brightRed)}].\n");
+                                    Console.WriteLine(o_logOutput.Description);
+                                    return;
+                            }
+                            break;
+                        case "--image-format":
+                            switch (value.ToLower())
+                            {
+                                case "jpg":
+                                case "jpeg":
+                                    o_imageFormat.Value = ImageFormat.Jpeg;
+                                    break;
+                                case "png":
+                                    o_imageFormat.Value = ImageFormat.Png;
+                                    break;
+                                case "bmp":
+                                    o_imageFormat.Value = ImageFormat.Bmp;
+                                    break;
+                                case "tga":
+                                    o_imageFormat.Value = ImageFormat.Tga;
+                                    break;
+                                case "webp":
+                                    o_imageFormat.Value = ImageFormat.Webp;
+                                    break;
+                                case "none":
+                                    convertTexture = false;
+                                    break;
+                                default:
+                                    Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported image format: [{value.Color(brightRed)}].\n");
+                                    Console.WriteLine(o_imageFormat.Description);
+                                    return;
+                            }
+                            break;
+                        case "--audio-format":
+                            switch (value.ToLower())
+                            {
+                                case "wav":
+                                case "wave":
+                                    o_audioFormat.Value = AudioFormat.Wav;
+                                    break;
+                                case "none":
+                                    o_audioFormat.Value = AudioFormat.None;
+                                    break;
+                                default:
+                                    Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported audio format: [{value.Color(brightRed)}].\n");
+                                    Console.WriteLine(o_audioFormat.Description);
+                                    return;
+                            }
+                            break;
+                        case "--export-asset-list":
+                            switch (value.ToLower())
+                            {
+                                case "xml":
+                                    o_exportAssetList.Value = ExportListType.XML;
+                                    break;
+                                case "none":
+                                    o_exportAssetList.Value = ExportListType.None;
+                                    break;
+                                default:
+                                    Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Unsupported asset list export option: [{value.Color(brightRed)}].\n");
+                                    Console.WriteLine(o_exportAssetList.Description);
+                                    return;
+                            }
+                            break;
+                        case "--filter-by-name":
+                            o_filterByName.Value.AddRange(ValueSplitter(value));
+                            filterBy = filterBy == FilterBy.None ? FilterBy.Name : filterBy == FilterBy.Container ? FilterBy.NameAndContainer : filterBy;
+                            break;
+                        case "--filter-by-container":
+                            o_filterByContainer.Value.AddRange(ValueSplitter(value));
+                            filterBy = filterBy == FilterBy.None ? FilterBy.Container : filterBy == FilterBy.Name ? FilterBy.NameAndContainer : filterBy;
+                            break;
+                        case "--filter-by-pathid":
+                            o_filterByPathID.Value.AddRange(ValueSplitter(value));
+                            filterBy = FilterBy.PathID;
+                            break;
+                        case "--filter-by-text":
+                            o_filterByText.Value.AddRange(ValueSplitter(value));
+                            filterBy = FilterBy.NameOrContainer;
+                            break;
+                        case "--assembly-folder":
+                            if (Directory.Exists(value))
+                            {
+                                o_assemblyPath.Value = value;
+                            }
+                            else
+                            {
+                                Console.WriteLine($"{"Error".Color(brightRed)} during parsing [{option}] option. Assembly folder [{value.Color(brightRed)}] was not found.");
+                                return;
+                            }
+                            break;
+                        case "--unity-version":
+                            o_unityVersion.Value = value;
+                            break;
+                        default:
+                            Console.WriteLine($"{"Error:".Color(brightRed)} Unknown option [{option.Color(brightRed)}].\n");
+                            if (!TryShowOptionDescription(option, optionsDict))
+                            {
+                                TryShowOptionDescription(option, flagsDict);
+                            }
+                            return;
+                    }
+                    i++;
+                }
+                catch (IndexOutOfRangeException)
+                {
+                    if (optionsDict.Any(x => x.Key.Contains(option)))
+                    {
+                        Console.WriteLine($"{"Error during parsing options:".Color(brightRed)} Value for [{option.Color(brightRed)}] option was not found.\n");
+                        TryShowOptionDescription(option, optionsDict);
+                    }
+                    else if (flagsDict.Any(x => x.Key.Contains(option)))
+                    {
+                        Console.WriteLine($"{"Error:".Color(brightRed)} Unknown flag [{option.Color(brightRed)}].\n");
+                        TryShowOptionDescription(option, flagsDict);
+                    }
+                    else
+                    {
+                        Console.WriteLine($"{"Error:".Color(brightRed)} Unknown option [{option.Color(brightRed)}].");
+                    }
+                    return;
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine("Unknown Error.".Color(CLIAnsiColors.Red));
+                    Console.WriteLine(ex);
+                    return;
+                }
+            }
+            isParsed = true;
+            #endregion
+        }
+
+        private static string[] ValueSplitter(string value)
+        {
+            var separator = value.Contains(';') ? ';' : ',';
+            return value.Split(separator);
+        }
+
+        private bool TryShowOptionDescription(string option, Dictionary<string, string> descDict)
+        {
+            var optionDesc = descDict.Where(x => x.Key.Contains(option));
+            if (optionDesc.Any())
+            {
+                var rand = new Random();
+                var rndOption = optionDesc.ElementAt(rand.Next(0, optionDesc.Count()));
+                Console.WriteLine($"Did you mean [{ $"{rndOption.Key}".Color(CLIAnsiColors.BrightYellow) }] option?");
+                Console.WriteLine($"Here's a description of it: \n\n{rndOption.Value}");
+
+                return true;
+            }
+            return false;
+        }
+
+        public void ShowHelp(bool showUsageOnly = false)
+        {
+            const int indent = 22;
+            var helpMessage = new StringBuilder();
+            var usage = new StringBuilder();
+            var appAssembly = typeof(Program).Assembly.GetName();
+            usage.Append($"Usage: {appAssembly.Name} <input path to asset file/folder> ");
+
+            var i = 0;
+            foreach (var optionsGroup in optionGroups.Keys)
+            {
+                helpMessage.AppendLine($"{optionsGroup} Options:");
+                foreach (var optionDict in optionGroups[optionsGroup])
+                {
+                    var optionName = $"{optionDict.Key,-indent - 8}";
+                    var optionDesc = optionDict.Value.Replace("\n", $"{"\n",-indent - 11}");
+                    helpMessage.AppendLine($"  {optionName}{optionDesc}");
+
+                    usage.Append($"[{optionDict.Key}] ");
+                    if (i++ % 2 == 0)
+                    {
+                        usage.Append($"\n{"",indent}");
+                    }
+                }
+                helpMessage.AppendLine();
+            }
+
+            if (showUsageOnly)
+            {
+                Console.WriteLine(usage);
+            }
+            else
+            {
+                Console.WriteLine($"# {appAssembly.Name}\n# Based on AssetStudio Mod v{appAssembly.Version}\n");
+                Console.WriteLine($"{usage}\n\n{helpMessage}");
+            }
+        }
+
+        private string ShowCurrentFilter()
+        {
+            switch (filterBy)
+            {
+                case FilterBy.Name:
+                    return $"# Filter by {filterBy}(s): \"{string.Join("\", \"", o_filterByName.Value)}\"";
+                case FilterBy.Container:
+                    return $"# Filter by {filterBy}(s): \"{string.Join("\", \"", o_filterByContainer.Value)}\"";
+                case FilterBy.PathID:
+                    return $"# Filter by {filterBy}(s): \"{string.Join("\", \"", o_filterByPathID.Value)}\"";
+                case FilterBy.NameOrContainer:
+                    return $"# Filter by Text: \"{string.Join("\", \"", o_filterByText.Value)}\"";
+                case FilterBy.NameAndContainer:
+                    return $"# Filter by Name(s): \"{string.Join("\", \"", o_filterByName.Value)}\"\n# Filter by Container(s): \"{string.Join("\", \"", o_filterByContainer.Value)}\"";
+                default:
+                    return $"# Filter by: {filterBy}";
+            }
+        }
+
+        public void ShowCurrentOptions()
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine("[Current Options]");
+            sb.AppendLine($"# Working Mode: {o_workMode}");
+            sb.AppendLine($"# Input Path: \"{inputPath}\"");
+            if (o_workMode.Value != WorkMode.Info)
+            {
+                sb.AppendLine($"# Output Path: \"{o_outputFolder}\"");
+                sb.AppendLine($"# Export Asset Type(s): {string.Join(", ", o_exportAssetTypes.Value)}");
+                sb.AppendLine($"# Asset Group Option: {o_groupAssetsBy}");
+                sb.AppendLine($"# Export Image Format: {o_imageFormat}");
+                sb.AppendLine($"# Export Audio Format: {o_audioFormat}");
+                sb.AppendLine($"# Log Level: {o_logLevel}");
+                sb.AppendLine($"# Log Output: {o_logOutput}");
+                sb.AppendLine($"# Export Asset List: {o_exportAssetList}");
+                sb.AppendLine(ShowCurrentFilter());
+                sb.AppendLine($"# Assebmly Path: \"{o_assemblyPath}\"");
+                sb.AppendLine($"# Unity Version: \"{o_unityVersion}\"");
+                sb.AppendLine($"# Restore TextAsset extension: {!f_notRestoreExtensionName.Value}");
+            }
+            else
+            {
+                sb.AppendLine($"# Export Asset Type(s): {string.Join(", ", o_exportAssetTypes.Value)}");
+                sb.AppendLine($"# Log Level: {o_logLevel}");
+                sb.AppendLine($"# Log Output: {o_logOutput}");
+                sb.AppendLine($"# Export Asset List: {o_exportAssetList}");
+                sb.AppendLine(ShowCurrentFilter());
+                sb.AppendLine($"# Unity Version: \"{o_unityVersion}\"");
+            }
+            sb.AppendLine("======");
+            Logger.Info(sb.ToString());
+        }
+    }
+}

AssetStudioCLI/Options/Option.cs

@@ -0,0 +1,27 @@
+namespace AssetStudioCLI.Options
+{
+    internal class Option<T>
+    {
+        public string Name { get; }
+        public string Description { get; }
+        public T Value { get; set; }
+        public T DefaultValue { get; }
+        public HelpGroups HelpGroup { get; }
+        public bool IsFlag { get; }
+
+        public Option(T optionDefaultValue, string optionName, string optionDescription, HelpGroups optionHelpGroup, bool isFlag)
+        {
+            Name = optionName;
+            Description = optionDescription;
+            DefaultValue = optionDefaultValue;
+            Value = DefaultValue;
+            HelpGroup = optionHelpGroup;
+            IsFlag = isFlag;
+        }
+
+        public override string ToString()
+        {
+            return Value != null ? Value.ToString() : string.Empty;
+        }
+    }
+}

AssetStudioCLI/Program.cs

@@ -0,0 +1,65 @@
+using AssetStudio;
+using AssetStudioCLI.Options;
+using System;
+
+namespace AssetStudioCLI
+{
+    class Program
+    {
+        public static void Main(string[] args)
+        {
+            var options = new CLIOptions(args);
+            if (options.isParsed)
+            {
+                CLIRun(options);
+            }
+            else if (options.showHelp)
+            {
+                options.ShowHelp();
+            }
+            else
+            {
+                Console.WriteLine();
+                options.ShowHelp(showUsageOnly: true);
+            }
+        }
+
+        private static void CLIRun(CLIOptions options)
+        {
+            var cliLogger = new CLILogger(options);
+            Logger.Default = cliLogger;
+            var studio = new Studio(options);
+            options.ShowCurrentOptions();
+
+            try
+            {
+                if (studio.LoadAssets())
+                {
+                    studio.ParseAssets();
+                    if (options.filterBy != FilterBy.None)
+                    {
+                        studio.FilterAssets();
+                    }
+                    if (options.o_exportAssetList.Value != ExportListType.None)
+                    {
+                        studio.ExportAssetList();
+                    }
+                    if (options.o_workMode.Value == WorkMode.Info)
+                    {
+                        studio.ShowExportableAssetsInfo();
+                        return;
+                    }
+                    studio.ExportAssets();
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Error(ex.ToString());
+            }
+            finally
+            {
+                cliLogger.LogToFile(LoggerEvent.Verbose, "---Program ended---");
+            }
+        }       
+    }
+}

AssetStudioCLI/ReadMe.md

@@ -0,0 +1,96 @@
+## AssetStudioCLI
+CLI version of AssetStudio Mod.
+- Supported asset types: `Texture2D`, `Sprite`, `TextAsset`, `MonoBehaviour`, `Font`, `Shader`, `MovieTexture`, `AudioClip`, `VideoClip`
+- *There are no plans to add support for `Mesh`/`AnimationClip`/`Animator` for now*
+
+### Usage
+```
+AssetStudioCLI <input path to asset file/folder> [-m, --mode <value>]
+                      [-t, --asset-type <value(s)>] [-g, --group-option <value>]
+                      [-o, --output <path>] [-h, --help]
+                      [--log-level <value>] [--log-output <value>]
+                      [--image-format <value>] [--audio-format <value>]
+                      [--export-asset-list <value>] [--filter-by-name <text>]
+                      [--filter-by-container <text>] [--filter-by-pathid <text>]
+                      [--filter-by-text <text>] [--assembly-folder <path>]
+                      [--unity-version <text>] [--not-restore-extension]
+
+
+
+General Options:
+  -m, --mode <value>            Specify working mode
+                                <Value: export(default) | exportRaw | dump | info>
+                                Export - Exports converted assets
+                                ExportRaw - Exports raw data
+                                Dump - Makes asset dumps
+                                Info - Loads file(s), shows the number of supported for export assets and exits
+                                Example: "-m info"
+
+  -t, --asset-type <value(s)>   Specify asset type(s) to export
+                                <Value(s): tex2d, sprite, textAsset, monoBehaviour, font, shader, movieTexture,
+                                audio, video | all(default)>
+                                All - export all asset types, which are listed in the values
+                                *To specify multiple asset types, write them separated by ',' or ';' without spaces
+                                Examples: "-t sprite" or "-t all" or "-t tex2d,sprite,audio" or "-t tex2d;sprite;font"
+
+  -g, --group-option <value>    Specify the way in which exported assets should be grouped
+                                <Value: none | type | container(default) | filename>
+                                None - Do not group exported assets
+                                Type - Group exported assets by type name
+                                Container - Group exported assets by container path
+                                Filename - Group exported assets by source file name
+                                Example: "-g container"
+
+  -o, --output <path>           Specify path to the output folder
+                                If path isn't specifyed, 'ASExport' folder will be created in the program's work folder
+
+  -h, --help                    Display help and exit
+
+Logger Options:
+  --log-level <value>           Specify the log level
+                                <Value: verbose | debug | info(default) | warning | error>
+                                Example: "--log-level warning"
+
+  --log-output <value>          Specify the log output
+                                <Value: console(default) | file | both>
+                                Example: "--log-output both"
+
+Convert Options:
+  --image-format <value>        Specify the format for converting image assets
+                                <Value: none | jpg | png(default) | bmp | tga | webp>
+                                None - Do not convert images and export them as texture data (.tex)
+                                Example: "--image-format jpg"
+
+  --audio-format <value>        Specify the format for converting audio assets
+                                <Value: none | wav(default)>
+                                None - Do not convert audios and export them in their own format
+                                Example: "--audio-format wav"
+
+Advanced Options:
+  --export-asset-list <value>   Specify the format in which you want to export asset list
+                                <Value: none(default) | xml>
+                                None - Do not export asset list
+                                Example: "--export-asset-list xml"
+
+  --filter-by-name <text>       Specify the name by which assets should be filtered
+                                *To specify multiple names write them separated by ',' or ';' without spaces
+                                Example: "--filter-by-name char" or "--filter-by-name char,bg"
+
+  --filter-by-container <text>  Specify the container by which assets should be filtered
+                                *To specify multiple containers write them separated by ',' or ';' without spaces
+                                Example: "--filter-by-container arts" or "--filter-by-container arts,icons"
+
+  --filter-by-pathid <text>     Specify the PathID by which assets should be filtered
+                                *To specify multiple PathIDs write them separated by ',' or ';' without spaces
+                                Example: "--filter-by-pathid 7238605633795851352,-2430306240205277265"
+
+  --filter-by-text <text>       Specify the text by which assets should be filtered
+                                Looks for assets that contain the specified text in their names or containers
+                                *To specify multiple values write them separated by ',' or ';' without spaces
+                                Example: "--filter-by-text portrait" or "--filter-by-text portrait,art"
+
+  --assembly-folder <path>      Specify the path to the assembly folder
+  --unity-version <text>        Specify Unity version. Example: "--unity-version 2017.4.39f1"
+  --not-restore-extension       (Flag) If specified, AssetStudio will not try to restore TextAssets extension name,
+                                and will just export all TextAssets with the ".txt" extension
+```

AssetStudioCLI/Studio.cs

@@ -0,0 +1,383 @@
+using AssetStudio;
+using AssetStudioCLI.Options;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using static AssetStudioCLI.Exporter;
+using Ansi = AssetStudioCLI.CLIAnsiColors;
+
+namespace AssetStudioCLI
+{
+    internal class Studio
+    {
+        public AssetsManager assetsManager = new AssetsManager();
+        public List<AssetItem> parsedAssetsList = new List<AssetItem>();
+        private readonly CLIOptions options;
+
+        public Studio(CLIOptions cliOptions) 
+        {
+            Progress.Default = new Progress<int>(ShowCurProgressValue);
+            options = cliOptions;
+        }
+
+        private void ShowCurProgressValue(int value)
+        {
+            Console.Write($"[{value:000}%]\r");
+        }
+
+        public bool LoadAssets()
+        {
+            var isLoaded = false;
+            assetsManager.SpecifyUnityVersion = options.o_unityVersion.Value;
+            assetsManager.SetAssetFilter(options.o_exportAssetTypes.Value);
+
+            if (Directory.Exists(options.inputPath))
+            {
+                assetsManager.LoadFolder(options.inputPath);
+            }
+            else
+            {
+                assetsManager.LoadFiles(options.inputPath);
+            }
+            if (assetsManager.assetsFileList.Count == 0)
+            {
+                Logger.Warning("No Unity file can be loaded.");
+            }
+            else
+            {
+                isLoaded = true;
+            }
+
+            return isLoaded;
+        }
+
+        public void ParseAssets()
+        {
+            Logger.Info("Parse assets...");
+
+            var fileAssetsList = new List<AssetItem>();
+            var containers = new Dictionary<AssetStudio.Object, string>();
+            var objectCount = assetsManager.assetsFileList.Sum(x => x.Objects.Count);
+
+            Progress.Reset();
+            var i = 0;
+            foreach (var assetsFile in assetsManager.assetsFileList)
+            {
+                foreach (var asset in assetsFile.Objects)
+                {
+                    var assetItem = new AssetItem(asset);
+                    assetItem.UniqueID = "_#" + i;
+                    var isExportable = false;
+                    switch (asset)
+                    {
+                        case AssetBundle m_AssetBundle:
+                            foreach (var m_Container in m_AssetBundle.m_Container)
+                            {
+                                var preloadIndex = m_Container.Value.preloadIndex;
+                                var preloadSize = m_Container.Value.preloadSize;
+                                var preloadEnd = preloadIndex + preloadSize;
+                                for (int k = preloadIndex; k < preloadEnd; k++)
+                                {
+                                    var pptr = m_AssetBundle.m_PreloadTable[k];
+                                    if (pptr.TryGet(out var obj))
+                                    {
+                                        containers[obj] = m_Container.Key;
+                                    }
+                                }
+                            }
+                            break;
+                        case ResourceManager m_ResourceManager:
+                            foreach (var m_Container in m_ResourceManager.m_Container)
+                            {
+                                if (m_Container.Value.TryGet(out var obj))
+                                {
+                                    containers[obj] = m_Container.Key;
+                                }
+                            }
+                            break;
+                        case Texture2D m_Texture2D:
+                            if (!string.IsNullOrEmpty(m_Texture2D.m_StreamData?.path))
+                                assetItem.FullSize = asset.byteSize + m_Texture2D.m_StreamData.size;
+                            assetItem.Text = m_Texture2D.m_Name;
+                            break;
+                        case AudioClip m_AudioClip:
+                            if (!string.IsNullOrEmpty(m_AudioClip.m_Source))
+                                assetItem.FullSize = asset.byteSize + m_AudioClip.m_Size;
+                            assetItem.Text = m_AudioClip.m_Name;
+                            break;
+                        case VideoClip m_VideoClip:
+                            if (!string.IsNullOrEmpty(m_VideoClip.m_OriginalPath))
+                                assetItem.FullSize = asset.byteSize + m_VideoClip.m_ExternalResources.m_Size;
+                            assetItem.Text = m_VideoClip.m_Name;
+                            break;
+                        case MovieTexture _:
+                        case TextAsset _:
+                        case Font _:
+                        case Sprite _:
+                            assetItem.Text = ((NamedObject)asset).m_Name;
+                            break;
+                        case Shader m_Shader:
+                            assetItem.Text = m_Shader.m_ParsedForm?.m_Name ?? m_Shader.m_Name;
+                            break;
+                        case MonoBehaviour m_MonoBehaviour:
+                            if (m_MonoBehaviour.m_Name == "" && m_MonoBehaviour.m_Script.TryGet(out var m_Script))
+                            {
+                                assetItem.Text = m_Script.m_ClassName;
+                            }
+                            else
+                            {
+                                assetItem.Text = m_MonoBehaviour.m_Name;
+                            }
+                            break;
+                    }
+                    if (assetItem.Text == "")
+                    {
+                        assetItem.Text = assetItem.TypeString + assetItem.UniqueID;
+                    }
+
+                    isExportable = options.o_exportAssetTypes.Value.Contains(asset.type);
+                    if (isExportable)
+                    {
+                        fileAssetsList.Add(assetItem);
+                    }
+
+                    Progress.Report(++i, objectCount);
+                }
+                foreach (var asset in fileAssetsList)
+                {
+                    if (containers.ContainsKey(asset.Asset))
+                    {
+                        asset.Container = containers[asset.Asset];
+                    }
+                }
+                parsedAssetsList.AddRange(fileAssetsList);
+                containers.Clear();
+                fileAssetsList.Clear();
+            }
+        }
+
+        public void ShowExportableAssetsInfo()
+        {
+            var exportableAssetsCountDict = new Dictionary<ClassIDType, int>();
+            string info = "";
+            if (parsedAssetsList.Count > 0)
+            {
+                foreach (var asset in parsedAssetsList)
+                {
+                    if (exportableAssetsCountDict.ContainsKey(asset.Type))
+                    {
+                        exportableAssetsCountDict[asset.Type] += 1;
+                    }
+                    else
+                    {
+                        exportableAssetsCountDict.Add(asset.Type, 1);
+                    }
+                }
+
+                info += "\n[Exportable Assets Count]\n";
+                foreach (var assetType in exportableAssetsCountDict.Keys)
+                {
+                    info += $"# {assetType}: {exportableAssetsCountDict[assetType]}\n";
+                }
+                if (exportableAssetsCountDict.Count > 1)
+                {
+                    info += $"#\n# Total: {parsedAssetsList.Count} assets";
+                }
+            }
+            else
+            {
+                info += "No exportable assets found.";
+            }
+
+            if (options.o_logLevel.Value > LoggerEvent.Info)
+            {
+                Console.WriteLine(info);
+            }
+            else
+            {
+                Logger.Info(info);
+            }
+        }
+
+        public void FilterAssets()
+        {
+            var assetsCount = parsedAssetsList.Count;
+            var filteredAssets = new List<AssetItem>();
+
+            switch(options.filterBy)
+            {
+                case FilterBy.Name:
+                    filteredAssets = parsedAssetsList.FindAll(x => options.o_filterByName.Value.Any(y => x.Text.ToString().IndexOf(y, StringComparison.OrdinalIgnoreCase) >= 0));
+                    Logger.Info(
+                        $"Found [{filteredAssets.Count}/{assetsCount}] asset(s) " +
+                        $"that contain {$"\"{string.Join("\", \"", options.o_filterByName.Value)}\"".Color(Ansi.BrightYellow)} in their Names."
+                    );
+                    break;
+                case FilterBy.Container:
+                    filteredAssets = parsedAssetsList.FindAll(x => options.o_filterByContainer.Value.Any(y => x.Container.ToString().IndexOf(y, StringComparison.OrdinalIgnoreCase) >= 0));
+                    Logger.Info(
+                        $"Found [{filteredAssets.Count}/{assetsCount}] asset(s) " +
+                        $"that contain {$"\"{string.Join("\", \"", options.o_filterByContainer.Value)}\"".Color(Ansi.BrightYellow)} in their Containers."
+                    );
+                    break;
+                case FilterBy.PathID:
+                    filteredAssets = parsedAssetsList.FindAll(x => options.o_filterByPathID.Value.Any(y => x.m_PathID.ToString().IndexOf(y, StringComparison.OrdinalIgnoreCase) >= 0));
+                    Logger.Info(
+                        $"Found [{filteredAssets.Count}/{assetsCount}] asset(s) " +
+                        $"that contain {$"\"{string.Join("\", \"", options.o_filterByPathID.Value)}\"".Color(Ansi.BrightYellow)} in their PathIDs."
+                    );
+                    break;
+                case FilterBy.NameOrContainer:
+                    filteredAssets = parsedAssetsList.FindAll(x =>
+                        options.o_filterByText.Value.Any(y => x.Text.ToString().IndexOf(y, StringComparison.OrdinalIgnoreCase) >= 0) ||
+                        options.o_filterByText.Value.Any(y => x.Container.ToString().IndexOf(y, StringComparison.OrdinalIgnoreCase) >= 0)
+                    );
+                    Logger.Info(
+                        $"Found [{filteredAssets.Count}/{assetsCount}] asset(s) " +
+                        $"that contain {$"\"{string.Join("\", \"", options.o_filterByText.Value)}\"".Color(Ansi.BrightYellow)} in their Names or Contaniers."
+                    );
+                    break;
+                case FilterBy.NameAndContainer:
+                    filteredAssets = parsedAssetsList.FindAll(x =>
+                        options.o_filterByName.Value.Any(y => x.Text.ToString().IndexOf(y, StringComparison.OrdinalIgnoreCase) >= 0) &&
+                        options.o_filterByContainer.Value.Any(y => x.Container.ToString().IndexOf(y, StringComparison.OrdinalIgnoreCase) >= 0)
+                    );
+                    Logger.Info(
+                        $"Found [{filteredAssets.Count}/{assetsCount}] asset(s) " +
+                        $"that contain {$"\"{string.Join("\", \"", options.o_filterByContainer.Value)}\"".Color(Ansi.BrightYellow)} in their Containers " +
+                        $"and {$"\"{string.Join("\", \"", options.o_filterByName.Value)}\"".Color(Ansi.BrightYellow)} in their Names."
+                    );
+                    break;
+            }
+            parsedAssetsList.Clear();
+            parsedAssetsList = filteredAssets;
+        }
+
+        public void ExportAssets()
+        {
+            var savePath = options.o_outputFolder.Value;
+            var toExportCount = parsedAssetsList.Count;
+            var exportedCount = 0;
+
+            foreach (var asset in parsedAssetsList)
+            {
+                string exportPath;
+                switch (options.o_groupAssetsBy.Value)
+                {
+                    case AssetGroupOption.TypeName:
+                        exportPath = Path.Combine(savePath, asset.TypeString);
+                        break;
+                    case AssetGroupOption.ContainerPath:
+                        if (!string.IsNullOrEmpty(asset.Container))
+                        {
+                            exportPath = Path.Combine(savePath, Path.GetDirectoryName(asset.Container));
+                        }
+                        else
+                        {
+                            exportPath = savePath;
+                        }
+                        break;
+                    case AssetGroupOption.SourceFileName:
+                        if (string.IsNullOrEmpty(asset.SourceFile.originalPath))
+                        {
+                            exportPath = Path.Combine(savePath, asset.SourceFile.fileName + "_export");
+                        }
+                        else
+                        {
+                            exportPath = Path.Combine(savePath, Path.GetFileName(asset.SourceFile.originalPath) + "_export", asset.SourceFile.fileName);
+                        }
+                        break;
+                    default:
+                        exportPath = savePath;
+                        break;
+                }
+
+                exportPath += Path.DirectorySeparatorChar;
+                try
+                {
+                    switch (options.o_workMode.Value)
+                    {
+                        case WorkMode.ExportRaw:
+                            Logger.Debug($"{options.o_workMode}: {asset.Type} : {asset.Container} : {asset.Text}");
+                            if (ExportRawFile(asset, exportPath))
+                            {
+                                exportedCount++;
+                            }
+                            break;
+                        case WorkMode.Dump:
+                            Logger.Debug($"{options.o_workMode}: {asset.Type} : {asset.Container} : {asset.Text}");
+                            if (ExportDumpFile(asset, exportPath, options))
+                            {
+                                exportedCount++;
+                            }
+                            break;
+                        case WorkMode.Export:
+                            Logger.Debug($"{options.o_workMode}: {asset.Type} : {asset.Container} : {asset.Text}");
+                            if (ExportConvertFile(asset, exportPath, options))
+                            {
+                                exportedCount++;
+                            }
+                            break;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error($"{asset.SourceFile.originalPath}: [{$"{asset.Type}: {asset.Text}".Color(Ansi.BrightRed)}] : Export error\n{ex}");
+                }
+                Console.Write($"Exported [{exportedCount}/{toExportCount}]\r");
+            }
+            Console.WriteLine("");
+
+            if (exportedCount == 0)
+            {
+                Logger.Default.Log(LoggerEvent.Info, "Nothing exported.", ignoreLevel: true);
+            }
+            else if (toExportCount > exportedCount)
+            {
+                Logger.Default.Log(LoggerEvent.Info, $"Finished exporting {exportedCount} asset(s) to \"{options.o_outputFolder.Value.Color(Ansi.BrightYellow)}\".", ignoreLevel: true);
+            }
+            else
+            {
+                Logger.Default.Log(LoggerEvent.Info, $"Finished exporting {exportedCount} asset(s) to \"{options.o_outputFolder.Value.Color(Ansi.BrightGreen)}\".", ignoreLevel: true);
+            }
+
+            if (toExportCount > exportedCount)
+            {
+                Logger.Default.Log(LoggerEvent.Info, $"{toExportCount - exportedCount} asset(s) skipped (not extractable or file(s) already exist).", ignoreLevel: true);
+            }
+        }
+
+        public void ExportAssetList()
+        {
+            var savePath = options.o_outputFolder.Value;
+
+            switch (options.o_exportAssetList.Value)
+            {
+                case ExportListType.XML:
+                    var filename = Path.Combine(savePath, "assets.xml");
+                    var doc = new XDocument(
+                        new XElement("Assets",
+                            new XAttribute("filename", filename),
+                            new XAttribute("createdAt", DateTime.UtcNow.ToString("s")),
+                            parsedAssetsList.Select(
+                                asset => new XElement("Asset",
+                                    new XElement("Name", asset.Text),
+                                    new XElement("Container", asset.Container),
+                                    new XElement("Type", new XAttribute("id", (int)asset.Type), asset.TypeString),
+                                    new XElement("PathID", asset.m_PathID),
+                                    new XElement("Source", asset.SourceFile.fullName),
+                                    new XElement("Size", asset.FullSize)
+                                )
+                            )
+                        )
+                    );
+                    doc.Save(filename);
+
+                   break;
+            }
+            Logger.Info($"Finished exporting asset list with {parsedAssetsList.Count} items.");
+        }
+    }
+}

AssetStudioFBXNative/AssetStudioFBXNative.vcxproj

@@ -121,6 +121,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -158,6 +159,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>0.16.0.0</Version>
-    <AssemblyVersion>0.16.0.0</AssemblyVersion>
-    <FileVersion>0.16.0.0</FileVersion>
+    <Version>0.16.48.1</Version>
     <Copyright>Copyright © Perfare 2018-2022; Copyright © hozuki 2020</Copyright>
     <DebugType>embedded</DebugType>
   </PropertyGroup>

AssetStudioFBXWrapper/Fbx.cs

@@ -1,16 +1,20 @@
 using AssetStudio.FbxInterop;
-using AssetStudio.PInvoke;
 using System.IO;
 
+#if NETFRAMEWORK
+using AssetStudio.PInvoke;
+#endif
+
 namespace AssetStudio
 {
     public static partial class Fbx
     {
-
+#if NETFRAMEWORK
         static Fbx()
         {
             DllLoader.PreloadDll(FbxDll.DllName);
         }
+#endif
 
         public static Vector3 QuaternionToEuler(Quaternion q)
         {

AssetStudioGUI/AssetStudioGUI.csproj

@@ -1,84 +1,114 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFrameworks>net472;net5.0-windows;net6.0-windows</TargetFrameworks>
-		<UseWindowsForms>true</UseWindowsForms>
-		<ApplicationIcon>Resources\as.ico</ApplicationIcon>
-		<Version>0.16.0.0</Version>
-		<AssemblyVersion>0.16.0.0</AssemblyVersion>
-		<FileVersion>0.16.0.0</FileVersion>
-		<Copyright>Copyright © Perfare 2018-2022</Copyright>
-		<DebugType>embedded</DebugType>
-	</PropertyGroup>
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+        <UseWindowsForms>true</UseWindowsForms>
+        <ApplicationIcon>Resources\as.ico</ApplicationIcon>
+        <AssemblyTitle>AssetStudio Mod by VaDiM</AssemblyTitle>
+        <Version>0.16.48.1</Version>
+        <Copyright>Copyright © Perfare 2018-2022</Copyright>
+        <DebugType>embedded</DebugType>
+    </PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\AssetStudioUtility\AssetStudioUtility.csproj" />
-		<ProjectReference Include="..\AssetStudio\AssetStudio.csproj" />
-	</ItemGroup>
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
+        <IsPublishable>false</IsPublishable>
+    </PropertyGroup>
 
-	<ItemGroup>
-		<None Include="Properties\Settings.settings">
-			<Generator>SettingsSingleFileGenerator</Generator>
-			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
-		</None>
-		<Compile Update="Properties\Settings.Designer.cs">
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Settings.settings</DependentUpon>
-			<DesignTimeSharedInput>True</DesignTimeSharedInput>
-		</Compile>
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\AssetStudioUtility\AssetStudioUtility.csproj" />
+        <ProjectReference Include="..\AssetStudio\AssetStudio.csproj" />
+    </ItemGroup>
+    
+    <ItemGroup>
+        <None Update="Properties\Settings.settings">
+            <Generator>SettingsSingleFileGenerator</Generator>
+            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+        </None>
+        <Compile Update="Properties\Settings.Designer.cs">
+            <DesignTimeSharedInput>True</DesignTimeSharedInput>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Settings.settings</DependentUpon>
+        </Compile>
+    </ItemGroup>
 
-	<ItemGroup>
-		<EmbeddedResource Update="Properties\Resources.resx">
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-		<Compile Update="Properties\Resources.Designer.cs">
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Resources.resx</DependentUpon>
-			<DesignTime>True</DesignTime>
-		</Compile>
-	</ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+        <Compile Update="Properties\Resources.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+            <DesignTime>True</DesignTime>
+        </Compile>
+    </ItemGroup>
 
-	<ItemGroup>
-		<ContentWithTargetPath Include="Libraries\x86\fmod.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<TargetPath>x86\fmod.dll</TargetPath>
-		</ContentWithTargetPath>
-		<ContentWithTargetPath Include="Libraries\x64\fmod.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-			<TargetPath>x64\fmod.dll</TargetPath>
-		</ContentWithTargetPath>
-	</ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
+        <PackageReference Include="OpenTK" Version="4.7.7" />
+        <Reference Include="OpenTK.WinForms">
+            <HintPath>Libraries\OpenTK.WinForms.dll</HintPath>
+        </Reference>
+    </ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
-		<PackageReference Include="OpenTK" Version="4.6.7" />
-		<Reference Include="OpenTK.WinForms">
-			<HintPath>Libraries\OpenTK.WinForms.dll</HintPath>
-		</Reference>
-	</ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
+        <PackageReference Include="OpenTK" Version="3.3.3" />
+        <PackageReference Include="OpenTK.GLControl" Version="3.3.3" />
+    </ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-		<PackageReference Include="OpenTK" Version="3.1.0" />
-		<PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-	</ItemGroup>
+    <!-- Use local compiled win-x86 and win-x64 Texture2DDecoder libs, because libs from Kyaru.Texture2DDecoder.Windows were compiled with /MD flag -->
+    
+    <Target Name="CopyExtraFilesPortable" AfterTargets="AfterBuild" Condition=" '$(RuntimeIdentifier)' == '' OR '$(TargetFramework)' == 'net472' ">
+        <Message Text="Copying extra files for $(TargetFramework)... " Importance="high" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\Win32\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\x64\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)runtimes\win-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(SolutionDir)AssetStudioFBXNative\bin\Win32\$(Configuration)\AssetStudioFBXNative.dll" DestinationFolder="$(TargetDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(SolutionDir)AssetStudioFBXNative\bin\x64\$(Configuration)\AssetStudioFBXNative.dll" DestinationFolder="$(TargetDir)runtimes\win-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\x86\fmod.dll" DestinationFolder="$(TargetDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\x64\fmod.dll" DestinationFolder="$(TargetDir)runtimes\win-x64\native" ContinueOnError="false" />
+    </Target>
 
-	<Target Name="CopyExtraFiles" AfterTargets="AfterBuild">
-		<Copy SourceFiles="$(SolutionDir)AssetStudioFBXNative\bin\Win32\$(Configuration)\AssetStudioFBXNative.dll" DestinationFolder="$(TargetDir)x86" ContinueOnError="true" />
-		<Copy SourceFiles="$(SolutionDir)AssetStudioFBXNative\bin\x64\$(Configuration)\AssetStudioFBXNative.dll" DestinationFolder="$(TargetDir)x64" ContinueOnError="true" />
-		<Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\Win32\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)x86" ContinueOnError="true" />
-		<Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\x64\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)x64" ContinueOnError="true" />
-	</Target>
+    <!-- Publishing an app as framework-dependent produces a cross-platform binary as a dll file, and a platform-specific executable that targets your current platform.
+    The dll is cross-platform while the executable isn't -->
+    <Target Name="PublishExtraFilesPortable" AfterTargets="Publish" Condition=" '$(RuntimeIdentifier)' == '' ">
+        <Message Text="Publishing extra files for Portable build ($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x86\native\AssetStudioFBXNative.dll" DestinationFolder="$(PublishDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x64\native\AssetStudioFBXNative.dll" DestinationFolder="$(PublishDir)runtimes\win-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x86\native\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x64\native\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)runtimes\win-x64\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x86\native\fmod.dll" DestinationFolder="$(PublishDir)runtimes\win-x86\native" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)runtimes\win-x64\native\fmod.dll" DestinationFolder="$(PublishDir)runtimes\win-x64\native" ContinueOnError="false" />
+    </Target>
 
-	<Target Name="PublishExtraFiles" AfterTargets="Publish">
-		<Copy SourceFiles="$(TargetDir)x86\AssetStudioFBXNative.dll" DestinationFolder="$(PublishDir)x86" ContinueOnError="true" />
-		<Copy SourceFiles="$(TargetDir)x64\AssetStudioFBXNative.dll" DestinationFolder="$(PublishDir)x64" ContinueOnError="true" />
-		<Copy SourceFiles="$(TargetDir)x86\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)x86" ContinueOnError="true" />
-		<Copy SourceFiles="$(TargetDir)x64\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)x64" ContinueOnError="true" />
-	</Target>
-</Project>
+    <!-- No need to publish net472 build of AssetStudioGUI -->
+    <Target Name="PublishNet472" AfterTargets="Publish" Condition=" '$(TargetFramework)' == 'net472' ">
+        <Message Text="%0a NOTE: Publishing net472 build of AssetStudioGUI was disabled." Importance="high" />
+        <Message Text=" Instead, use the binaries created after the build.%0a" Importance="high" />
+    </Target>
+
+    <Target Name="CopyExtraFilesWin86" AfterTargets="AfterBuild" Condition=" $(RuntimeIdentifier.Contains('-x86')) AND '$(TargetFramework)' != 'net472' ">
+        <Message Text="Copying extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\Win32\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(SolutionDir)AssetStudioFBXNative\bin\Win32\$(Configuration)\AssetStudioFBXNative.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\x86\fmod.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+    </Target>
+
+    <Target Name="CopyExtraFilesWin64" AfterTargets="AfterBuild" Condition=" '$(RuntimeIdentifier)' == 'win-x64' AND '$(TargetFramework)' != 'net472' ">
+        <Message Text="Copying extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(SolutionDir)Texture2DDecoderNative\bin\x64\$(Configuration)\Texture2DDecoderNative.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(SolutionDir)AssetStudioFBXNative\bin\x64\$(Configuration)\AssetStudioFBXNative.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(ProjectDir)Libraries\x64\fmod.dll" DestinationFolder="$(TargetDir)" ContinueOnError="false" />
+    </Target>
+    
+    <Target Name="PublishExtraFilesWin" AfterTargets="Publish" Condition=" $(RuntimeIdentifier.Contains('win')) AND '$(TargetFramework)' != 'net472' ">
+        <Message Text="Publishing extra files for $(RuntimeIdentifier)($(TargetFramework))... " Importance="high" />
+        <Copy SourceFiles="$(TargetDir)\AssetStudioFBXNative.dll" DestinationFolder="$(PublishDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)\Texture2DDecoderNative.dll" DestinationFolder="$(PublishDir)" ContinueOnError="false" />
+        <Copy SourceFiles="$(TargetDir)\fmod.dll" DestinationFolder="$(PublishDir)" ContinueOnError="false" />
+    </Target>
+
+</Project>

AssetStudioGUI/AssetStudioGUIForm.Designer.cs

@@ -82,6 +82,7 @@
             this.sceneTreeView = new AssetStudioGUI.GOHierarchy();
             this.treeSearch = new System.Windows.Forms.TextBox();
             this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.filterExcludeMode = new System.Windows.Forms.CheckBox();
             this.assetListView = new System.Windows.Forms.ListView();
             this.columnHeaderName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.columnHeaderContainer = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -118,12 +119,19 @@
             this.dumpTextBox = new System.Windows.Forms.TextBox();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.selectNoneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+            this.collapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.expandAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.timer = new System.Windows.Forms.Timer(this.components);
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportSelectedAssetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportAnimatorwithselectedAnimationClipMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.dumpSelectedAssetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.goToSceneHierarchyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.showOriginalFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
@@ -144,6 +152,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.FMODvolumeBar)).BeginInit();
             this.tabPage5.SuspendLayout();
             this.statusStrip1.SuspendLayout();
+            this.contextMenuStrip2.SuspendLayout();
             this.contextMenuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -158,7 +167,7 @@
             this.debugMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(1264, 25);
+            this.menuStrip1.Size = new System.Drawing.Size(1264, 24);
             this.menuStrip1.TabIndex = 0;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -171,39 +180,39 @@
             this.extractFileToolStripMenuItem,
             this.extractFolderToolStripMenuItem});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(39, 21);
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
             this.fileToolStripMenuItem.Text = "File";
             // 
             // loadFileToolStripMenuItem
             // 
             this.loadFileToolStripMenuItem.Name = "loadFileToolStripMenuItem";
-            this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             this.loadFileToolStripMenuItem.Text = "Load file";
             this.loadFileToolStripMenuItem.Click += new System.EventHandler(this.loadFile_Click);
             // 
             // loadFolderToolStripMenuItem
             // 
             this.loadFolderToolStripMenuItem.Name = "loadFolderToolStripMenuItem";
-            this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             this.loadFolderToolStripMenuItem.Text = "Load folder";
             this.loadFolderToolStripMenuItem.Click += new System.EventHandler(this.loadFolder_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(151, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(141, 6);
             // 
             // extractFileToolStripMenuItem
             // 
             this.extractFileToolStripMenuItem.Name = "extractFileToolStripMenuItem";
-            this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             this.extractFileToolStripMenuItem.Text = "Extract file";
             this.extractFileToolStripMenuItem.Click += new System.EventHandler(this.extractFileToolStripMenuItem_Click);
             // 
             // extractFolderToolStripMenuItem
             // 
             this.extractFolderToolStripMenuItem.Name = "extractFolderToolStripMenuItem";
-            this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             this.extractFolderToolStripMenuItem.Text = "Extract folder";
             this.extractFolderToolStripMenuItem.Click += new System.EventHandler(this.extractFolderToolStripMenuItem_Click);
             // 
@@ -216,14 +225,14 @@
             this.toolStripMenuItem14,
             this.showExpOpt});
             this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
-            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(66, 21);
+            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
             this.optionsToolStripMenuItem.Text = "Options";
             // 
             // displayAll
             // 
             this.displayAll.CheckOnClick = true;
             this.displayAll.Name = "displayAll";
-            this.displayAll.Size = new System.Drawing.Size(223, 22);
+            this.displayAll.Size = new System.Drawing.Size(207, 22);
             this.displayAll.Text = "Display all assets";
             this.displayAll.ToolTipText = "Check this option will display all types assets. Not extractable assets can expor" +
     "t the RAW file.";
@@ -235,7 +244,7 @@
             this.enablePreview.CheckOnClick = true;
             this.enablePreview.CheckState = System.Windows.Forms.CheckState.Checked;
             this.enablePreview.Name = "enablePreview";
-            this.enablePreview.Size = new System.Drawing.Size(223, 22);
+            this.enablePreview.Size = new System.Drawing.Size(207, 22);
             this.enablePreview.Text = "Enable preview";
             this.enablePreview.ToolTipText = "Toggle the loading and preview of readable assets, such as images, sounds, text, " +
     "etc.\r\nDisable preview if you have performance or compatibility issues.";
@@ -247,7 +256,7 @@
             this.displayInfo.CheckOnClick = true;
             this.displayInfo.CheckState = System.Windows.Forms.CheckState.Checked;
             this.displayInfo.Name = "displayInfo";
-            this.displayInfo.Size = new System.Drawing.Size(223, 22);
+            this.displayInfo.Size = new System.Drawing.Size(207, 22);
             this.displayInfo.Text = "Display asset infromation";
             this.displayInfo.ToolTipText = "Toggle the overlay that shows information about each asset, eg. image size, forma" +
     "t, audio bitrate, etc.";
@@ -258,7 +267,7 @@
             this.toolStripMenuItem14.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.specifyUnityVersion});
             this.toolStripMenuItem14.Name = "toolStripMenuItem14";
-            this.toolStripMenuItem14.Size = new System.Drawing.Size(223, 22);
+            this.toolStripMenuItem14.Size = new System.Drawing.Size(207, 22);
             this.toolStripMenuItem14.Text = "Specify Unity version";
             // 
             // specifyUnityVersion
@@ -270,7 +279,7 @@
             // showExpOpt
             // 
             this.showExpOpt.Name = "showExpOpt";
-            this.showExpOpt.Size = new System.Drawing.Size(223, 22);
+            this.showExpOpt.Size = new System.Drawing.Size(207, 22);
             this.showExpOpt.Text = "Export options";
             this.showExpOpt.Click += new System.EventHandler(this.showExpOpt_Click);
             // 
@@ -284,46 +293,46 @@
             this.exportSelectedObjectsmergeToolStripMenuItem,
             this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem});
             this.modelToolStripMenuItem.Name = "modelToolStripMenuItem";
-            this.modelToolStripMenuItem.Size = new System.Drawing.Size(58, 21);
+            this.modelToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
             this.modelToolStripMenuItem.Text = "Model";
             // 
             // exportAllObjectssplitToolStripMenuItem1
             // 
             this.exportAllObjectssplitToolStripMenuItem1.Name = "exportAllObjectssplitToolStripMenuItem1";
-            this.exportAllObjectssplitToolStripMenuItem1.Size = new System.Drawing.Size(417, 22);
+            this.exportAllObjectssplitToolStripMenuItem1.Size = new System.Drawing.Size(382, 22);
             this.exportAllObjectssplitToolStripMenuItem1.Text = "Export all objects (split)";
             this.exportAllObjectssplitToolStripMenuItem1.Click += new System.EventHandler(this.exportAllObjectssplitToolStripMenuItem1_Click);
             // 
             // exportSelectedObjectsToolStripMenuItem
             // 
             this.exportSelectedObjectsToolStripMenuItem.Name = "exportSelectedObjectsToolStripMenuItem";
-            this.exportSelectedObjectsToolStripMenuItem.Size = new System.Drawing.Size(417, 22);
+            this.exportSelectedObjectsToolStripMenuItem.Size = new System.Drawing.Size(382, 22);
             this.exportSelectedObjectsToolStripMenuItem.Text = "Export selected objects (split)";
             this.exportSelectedObjectsToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedObjectsToolStripMenuItem_Click);
             // 
             // exportSelectedObjectsWithAnimationClipToolStripMenuItem
             // 
             this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Name = "exportSelectedObjectsWithAnimationClipToolStripMenuItem";
-            this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(417, 22);
+            this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(382, 22);
             this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Text = "Export selected objects (split) + selected AnimationClips";
             this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Click += new System.EventHandler(this.exportObjectswithAnimationClipMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(414, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(379, 6);
             // 
             // exportSelectedObjectsmergeToolStripMenuItem
             // 
             this.exportSelectedObjectsmergeToolStripMenuItem.Name = "exportSelectedObjectsmergeToolStripMenuItem";
-            this.exportSelectedObjectsmergeToolStripMenuItem.Size = new System.Drawing.Size(417, 22);
+            this.exportSelectedObjectsmergeToolStripMenuItem.Size = new System.Drawing.Size(382, 22);
             this.exportSelectedObjectsmergeToolStripMenuItem.Text = "Export selected objects (merge)";
             this.exportSelectedObjectsmergeToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedObjectsmergeToolStripMenuItem_Click);
             // 
             // exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem
             // 
             this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Name = "exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem";
-            this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(417, 22);
+            this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(382, 22);
             this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Text = "Export selected objects (merge) + selected AnimationClips";
             this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem_Click);
             // 
@@ -341,46 +350,46 @@
             this.toolStripSeparator2,
             this.toolStripMenuItem10});
             this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(58, 21);
+            this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
             this.exportToolStripMenuItem.Text = "Export";
             // 
             // exportAllAssetsMenuItem
             // 
             this.exportAllAssetsMenuItem.Name = "exportAllAssetsMenuItem";
-            this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(284, 22);
+            this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(266, 22);
             this.exportAllAssetsMenuItem.Text = "All assets";
             this.exportAllAssetsMenuItem.Click += new System.EventHandler(this.exportAllAssetsMenuItem_Click);
             // 
             // exportSelectedAssetsMenuItem
             // 
             this.exportSelectedAssetsMenuItem.Name = "exportSelectedAssetsMenuItem";
-            this.exportSelectedAssetsMenuItem.Size = new System.Drawing.Size(284, 22);
+            this.exportSelectedAssetsMenuItem.Size = new System.Drawing.Size(266, 22);
             this.exportSelectedAssetsMenuItem.Text = "Selected assets";
             this.exportSelectedAssetsMenuItem.Click += new System.EventHandler(this.exportSelectedAssetsMenuItem_Click);
             // 
             // exportFilteredAssetsMenuItem
             // 
             this.exportFilteredAssetsMenuItem.Name = "exportFilteredAssetsMenuItem";
-            this.exportFilteredAssetsMenuItem.Size = new System.Drawing.Size(284, 22);
+            this.exportFilteredAssetsMenuItem.Size = new System.Drawing.Size(266, 22);
             this.exportFilteredAssetsMenuItem.Text = "Filtered assets";
             this.exportFilteredAssetsMenuItem.Click += new System.EventHandler(this.exportFilteredAssetsMenuItem_Click);
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(281, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(263, 6);
             // 
             // exportAnimatorWithSelectedAnimationClipToolStripMenuItem
             // 
             this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Name = "exportAnimatorWithSelectedAnimationClipToolStripMenuItem";
-            this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(284, 22);
+            this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(266, 22);
             this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Text = "Animator + selected AnimationClips";
             this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Click += new System.EventHandler(this.exportAnimatorwithAnimationClipMenuItem_Click);
             // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(281, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(263, 6);
             // 
             // toolStripMenuItem2
             // 
@@ -389,27 +398,27 @@
             this.toolStripMenuItem5,
             this.toolStripMenuItem6});
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(284, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(266, 22);
             this.toolStripMenuItem2.Text = "Raw";
             // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem4.Text = "All assets";
             this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
             // 
             // toolStripMenuItem5
             // 
             this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem5.Text = "Selected assets";
             this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
             // 
             // toolStripMenuItem6
             // 
             this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem6.Text = "Filtered assets";
             this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
             // 
@@ -420,34 +429,34 @@
             this.toolStripMenuItem8,
             this.toolStripMenuItem9});
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(284, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(266, 22);
             this.toolStripMenuItem3.Text = "Dump";
             // 
             // toolStripMenuItem7
             // 
             this.toolStripMenuItem7.Name = "toolStripMenuItem7";
-            this.toolStripMenuItem7.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem7.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem7.Text = "All assets";
             this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click);
             // 
             // toolStripMenuItem8
             // 
             this.toolStripMenuItem8.Name = "toolStripMenuItem8";
-            this.toolStripMenuItem8.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem8.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem8.Text = "Selected assets";
             this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click);
             // 
             // toolStripMenuItem9
             // 
             this.toolStripMenuItem9.Name = "toolStripMenuItem9";
-            this.toolStripMenuItem9.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem9.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem9.Text = "Filtered assets";
             this.toolStripMenuItem9.Click += new System.EventHandler(this.toolStripMenuItem9_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(281, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(263, 6);
             // 
             // toolStripMenuItem10
             // 
@@ -456,27 +465,27 @@
             this.toolStripMenuItem12,
             this.toolStripMenuItem13});
             this.toolStripMenuItem10.Name = "toolStripMenuItem10";
-            this.toolStripMenuItem10.Size = new System.Drawing.Size(284, 22);
+            this.toolStripMenuItem10.Size = new System.Drawing.Size(266, 22);
             this.toolStripMenuItem10.Text = "Asset list to XML";
             // 
             // toolStripMenuItem11
             // 
             this.toolStripMenuItem11.Name = "toolStripMenuItem11";
-            this.toolStripMenuItem11.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem11.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem11.Text = "All assets";
             this.toolStripMenuItem11.Click += new System.EventHandler(this.toolStripMenuItem11_Click);
             // 
             // toolStripMenuItem12
             // 
             this.toolStripMenuItem12.Name = "toolStripMenuItem12";
-            this.toolStripMenuItem12.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem12.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem12.Text = "Selected assets";
             this.toolStripMenuItem12.Click += new System.EventHandler(this.toolStripMenuItem12_Click);
             // 
             // toolStripMenuItem13
             // 
             this.toolStripMenuItem13.Name = "toolStripMenuItem13";
-            this.toolStripMenuItem13.Size = new System.Drawing.Size(165, 22);
+            this.toolStripMenuItem13.Size = new System.Drawing.Size(152, 22);
             this.toolStripMenuItem13.Text = "Filtered assets";
             this.toolStripMenuItem13.Click += new System.EventHandler(this.toolStripMenuItem13_Click);
             // 
@@ -485,7 +494,7 @@
             this.filterTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.allToolStripMenuItem});
             this.filterTypeToolStripMenuItem.Name = "filterTypeToolStripMenuItem";
-            this.filterTypeToolStripMenuItem.Size = new System.Drawing.Size(80, 21);
+            this.filterTypeToolStripMenuItem.Size = new System.Drawing.Size(72, 20);
             this.filterTypeToolStripMenuItem.Text = "Filter Type";
             // 
             // allToolStripMenuItem
@@ -494,7 +503,7 @@
             this.allToolStripMenuItem.CheckOnClick = true;
             this.allToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.allToolStripMenuItem.Name = "allToolStripMenuItem";
-            this.allToolStripMenuItem.Size = new System.Drawing.Size(90, 22);
+            this.allToolStripMenuItem.Size = new System.Drawing.Size(88, 22);
             this.allToolStripMenuItem.Text = "All";
             this.allToolStripMenuItem.Click += new System.EventHandler(this.typeToolStripMenuItem_Click);
             // 
@@ -504,23 +513,21 @@
             this.toolStripMenuItem15,
             this.exportClassStructuresMenuItem});
             this.debugMenuItem.Name = "debugMenuItem";
-            this.debugMenuItem.Size = new System.Drawing.Size(59, 21);
+            this.debugMenuItem.Size = new System.Drawing.Size(54, 20);
             this.debugMenuItem.Text = "Debug";
             // 
             // toolStripMenuItem15
             // 
-            this.toolStripMenuItem15.Checked = true;
             this.toolStripMenuItem15.CheckOnClick = true;
-            this.toolStripMenuItem15.CheckState = System.Windows.Forms.CheckState.Checked;
             this.toolStripMenuItem15.Name = "toolStripMenuItem15";
-            this.toolStripMenuItem15.Size = new System.Drawing.Size(207, 22);
-            this.toolStripMenuItem15.Text = "Show error message";
+            this.toolStripMenuItem15.Size = new System.Drawing.Size(200, 22);
+            this.toolStripMenuItem15.Text = "Show all error messages";
             this.toolStripMenuItem15.Click += new System.EventHandler(this.toolStripMenuItem15_Click);
             // 
             // exportClassStructuresMenuItem
             // 
             this.exportClassStructuresMenuItem.Name = "exportClassStructuresMenuItem";
-            this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(200, 22);
             this.exportClassStructuresMenuItem.Text = "Export class structures";
             this.exportClassStructuresMenuItem.Click += new System.EventHandler(this.exportClassStructuresMenuItem_Click);
             // 
@@ -528,7 +535,7 @@
             // 
             this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 25);
+            this.splitContainer1.Location = new System.Drawing.Point(0, 24);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
@@ -542,7 +549,7 @@
             this.splitContainer1.Panel2.Controls.Add(this.tabControl2);
             this.splitContainer1.Panel2.Controls.Add(this.statusStrip1);
             this.splitContainer1.Panel2MinSize = 400;
-            this.splitContainer1.Size = new System.Drawing.Size(1264, 656);
+            this.splitContainer1.Size = new System.Drawing.Size(1264, 657);
             this.splitContainer1.SplitterDistance = 482;
             this.splitContainer1.TabIndex = 2;
             this.splitContainer1.TabStop = false;
@@ -557,7 +564,7 @@
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.Padding = new System.Drawing.Point(17, 3);
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(480, 634);
+            this.tabControl1.Size = new System.Drawing.Size(480, 633);
             this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.tabControl1.TabIndex = 0;
             this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabPageSelected);
@@ -568,7 +575,7 @@
             this.tabPage1.Controls.Add(this.treeSearch);
             this.tabPage1.Location = new System.Drawing.Point(4, 22);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(472, 608);
+            this.tabPage1.Size = new System.Drawing.Size(472, 607);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "Scene Hierarchy";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -578,11 +585,12 @@
             this.sceneTreeView.CheckBoxes = true;
             this.sceneTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.sceneTreeView.HideSelection = false;
-            this.sceneTreeView.Location = new System.Drawing.Point(0, 21);
+            this.sceneTreeView.Location = new System.Drawing.Point(0, 20);
             this.sceneTreeView.Name = "sceneTreeView";
             this.sceneTreeView.Size = new System.Drawing.Size(472, 587);
             this.sceneTreeView.TabIndex = 1;
             this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck);
+            this.sceneTreeView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.sceneTreeView_MouseClick);
             // 
             // treeSearch
             // 
@@ -590,7 +598,7 @@
             this.treeSearch.ForeColor = System.Drawing.SystemColors.GrayText;
             this.treeSearch.Location = new System.Drawing.Point(0, 0);
             this.treeSearch.Name = "treeSearch";
-            this.treeSearch.Size = new System.Drawing.Size(472, 21);
+            this.treeSearch.Size = new System.Drawing.Size(472, 20);
             this.treeSearch.TabIndex = 0;
             this.treeSearch.Text = " Search ";
             this.treeSearch.TextChanged += new System.EventHandler(this.treeSearch_TextChanged);
@@ -600,15 +608,34 @@
             // 
             // tabPage2
             // 
+            this.tabPage2.Controls.Add(this.filterExcludeMode);
             this.tabPage2.Controls.Add(this.assetListView);
             this.tabPage2.Controls.Add(this.listSearch);
             this.tabPage2.Location = new System.Drawing.Point(4, 22);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(472, 608);
+            this.tabPage2.Size = new System.Drawing.Size(472, 607);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "Asset List";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
+            // filterExcludeMode
+            // 
+            this.filterExcludeMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.filterExcludeMode.AutoSize = true;
+            this.filterExcludeMode.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.filterExcludeMode.Enabled = false;
+            this.filterExcludeMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.filterExcludeMode.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.filterExcludeMode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.filterExcludeMode.Location = new System.Drawing.Point(409, 2);
+            this.filterExcludeMode.Name = "filterExcludeMode";
+            this.filterExcludeMode.Size = new System.Drawing.Size(61, 17);
+            this.filterExcludeMode.TabIndex = 2;
+            this.filterExcludeMode.Text = "Exclude";
+            this.filterExcludeMode.TextAlign = System.Drawing.ContentAlignment.BottomRight;
+            this.filterExcludeMode.UseVisualStyleBackColor = false;
+            this.filterExcludeMode.CheckedChanged += new System.EventHandler(this.filterExcludeMode_CheckedChanged);
+            // 
             // assetListView
             // 
             this.assetListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@@ -621,7 +648,7 @@
             this.assetListView.FullRowSelect = true;
             this.assetListView.GridLines = true;
             this.assetListView.HideSelection = false;
-            this.assetListView.Location = new System.Drawing.Point(0, 21);
+            this.assetListView.Location = new System.Drawing.Point(0, 20);
             this.assetListView.Name = "assetListView";
             this.assetListView.Size = new System.Drawing.Size(472, 587);
             this.assetListView.TabIndex = 1;
@@ -631,6 +658,8 @@
             this.assetListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.assetListView_ColumnClick);
             this.assetListView.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.selectAsset);
             this.assetListView.RetrieveVirtualItem += new System.Windows.Forms.RetrieveVirtualItemEventHandler(this.assetListView_RetrieveVirtualItem);
+            this.assetListView.SelectedIndexChanged += new System.EventHandler(this.assetListView_SelectedIndexChanged);
+            this.assetListView.VirtualItemsSelectionRangeChanged += new System.Windows.Forms.ListViewVirtualItemsSelectionRangeChangedEventHandler(this.assetListView_VirtualItemsSelectionRangeChanged);
             this.assetListView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.assetListView_MouseClick);
             // 
             // columnHeaderName
@@ -663,7 +692,7 @@
             this.listSearch.ForeColor = System.Drawing.SystemColors.GrayText;
             this.listSearch.Location = new System.Drawing.Point(0, 0);
             this.listSearch.Name = "listSearch";
-            this.listSearch.Size = new System.Drawing.Size(472, 21);
+            this.listSearch.Size = new System.Drawing.Size(472, 20);
             this.listSearch.TabIndex = 0;
             this.listSearch.Text = " Filter ";
             this.listSearch.TextChanged += new System.EventHandler(this.ListSearchTextChanged);
@@ -675,7 +704,7 @@
             this.tabPage3.Controls.Add(this.classesListView);
             this.tabPage3.Location = new System.Drawing.Point(4, 22);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(472, 608);
+            this.tabPage3.Size = new System.Drawing.Size(472, 607);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "Asset Classes";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -691,7 +720,7 @@
             this.classesListView.Location = new System.Drawing.Point(0, 0);
             this.classesListView.MultiSelect = false;
             this.classesListView.Name = "classesListView";
-            this.classesListView.Size = new System.Drawing.Size(472, 608);
+            this.classesListView.Size = new System.Drawing.Size(472, 607);
             this.classesListView.TabIndex = 0;
             this.classesListView.UseCompatibleStateImageBehavior = false;
             this.classesListView.View = System.Windows.Forms.View.Details;
@@ -713,18 +742,19 @@
             // 
             this.progressbarPanel.Controls.Add(this.progressBar1);
             this.progressbarPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.progressbarPanel.Location = new System.Drawing.Point(0, 634);
+            this.progressbarPanel.Location = new System.Drawing.Point(0, 633);
             this.progressbarPanel.Name = "progressbarPanel";
             this.progressbarPanel.Padding = new System.Windows.Forms.Padding(1, 3, 1, 1);
-            this.progressbarPanel.Size = new System.Drawing.Size(480, 20);
+            this.progressbarPanel.Size = new System.Drawing.Size(480, 22);
             this.progressbarPanel.TabIndex = 2;
             // 
             // progressBar1
             // 
             this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.progressBar1.Location = new System.Drawing.Point(1, 2);
+            this.progressBar1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.progressBar1.Location = new System.Drawing.Point(1, 3);
             this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(478, 17);
+            this.progressBar1.Size = new System.Drawing.Size(478, 18);
             this.progressBar1.Step = 1;
             this.progressBar1.TabIndex = 1;
             // 
@@ -736,7 +766,7 @@
             this.tabControl2.Location = new System.Drawing.Point(0, 0);
             this.tabControl2.Name = "tabControl2";
             this.tabControl2.SelectedIndex = 0;
-            this.tabControl2.Size = new System.Drawing.Size(776, 632);
+            this.tabControl2.Size = new System.Drawing.Size(776, 633);
             this.tabControl2.TabIndex = 4;
             this.tabControl2.SelectedIndexChanged += new System.EventHandler(this.tabControl2_SelectedIndexChanged);
             // 
@@ -745,7 +775,7 @@
             this.tabPage4.Controls.Add(this.previewPanel);
             this.tabPage4.Location = new System.Drawing.Point(4, 22);
             this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(768, 606);
+            this.tabPage4.Size = new System.Drawing.Size(768, 607);
             this.tabPage4.TabIndex = 0;
             this.tabPage4.Text = "Preview";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -764,7 +794,7 @@
             this.previewPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.previewPanel.Location = new System.Drawing.Point(0, 0);
             this.previewPanel.Name = "previewPanel";
-            this.previewPanel.Size = new System.Drawing.Size(768, 606);
+            this.previewPanel.Size = new System.Drawing.Size(768, 607);
             this.previewPanel.TabIndex = 1;
             this.previewPanel.Resize += new System.EventHandler(this.preview_Resize);
             // 
@@ -773,9 +803,10 @@
             this.assetInfoLabel.AutoSize = true;
             this.assetInfoLabel.BackColor = System.Drawing.Color.Transparent;
             this.assetInfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.assetInfoLabel.Location = new System.Drawing.Point(4, 7);
+            this.assetInfoLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.assetInfoLabel.Location = new System.Drawing.Point(4, 8);
             this.assetInfoLabel.Name = "assetInfoLabel";
-            this.assetInfoLabel.Size = new System.Drawing.Size(0, 12);
+            this.assetInfoLabel.Size = new System.Drawing.Size(0, 13);
             this.assetInfoLabel.TabIndex = 0;
             // 
             // FMODpanel
@@ -794,7 +825,7 @@
             this.FMODpanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.FMODpanel.Location = new System.Drawing.Point(0, 0);
             this.FMODpanel.Name = "FMODpanel";
-            this.FMODpanel.Size = new System.Drawing.Size(768, 606);
+            this.FMODpanel.Size = new System.Drawing.Size(768, 607);
             this.FMODpanel.TabIndex = 2;
             this.FMODpanel.Visible = false;
             // 
@@ -802,9 +833,10 @@
             // 
             this.FMODcopyright.AutoSize = true;
             this.FMODcopyright.ForeColor = System.Drawing.SystemColors.ControlLight;
-            this.FMODcopyright.Location = new System.Drawing.Point(214, 337);
+            this.FMODcopyright.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODcopyright.Location = new System.Drawing.Point(214, 365);
             this.FMODcopyright.Name = "FMODcopyright";
-            this.FMODcopyright.Size = new System.Drawing.Size(341, 12);
+            this.FMODcopyright.Size = new System.Drawing.Size(283, 13);
             this.FMODcopyright.TabIndex = 9;
             this.FMODcopyright.Text = "Audio Engine supplied by FMOD by Firelight Technologies.";
             // 
@@ -812,38 +844,42 @@
             // 
             this.FMODinfoLabel.AutoSize = true;
             this.FMODinfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.FMODinfoLabel.Location = new System.Drawing.Point(269, 235);
+            this.FMODinfoLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODinfoLabel.Location = new System.Drawing.Point(275, 255);
             this.FMODinfoLabel.Name = "FMODinfoLabel";
-            this.FMODinfoLabel.Size = new System.Drawing.Size(0, 12);
+            this.FMODinfoLabel.Size = new System.Drawing.Size(0, 13);
             this.FMODinfoLabel.TabIndex = 8;
             // 
             // FMODtimerLabel
             // 
             this.FMODtimerLabel.AutoSize = true;
             this.FMODtimerLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.FMODtimerLabel.Location = new System.Drawing.Point(460, 235);
+            this.FMODtimerLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODtimerLabel.Location = new System.Drawing.Point(457, 253);
             this.FMODtimerLabel.Name = "FMODtimerLabel";
-            this.FMODtimerLabel.Size = new System.Drawing.Size(95, 12);
+            this.FMODtimerLabel.Size = new System.Drawing.Size(102, 13);
             this.FMODtimerLabel.TabIndex = 7;
-            this.FMODtimerLabel.Text = "0:00.0 / 0:00.0";
+            this.FMODtimerLabel.Text = "00:00.00 / 00:00.00";
             // 
             // FMODstatusLabel
             // 
             this.FMODstatusLabel.AutoSize = true;
             this.FMODstatusLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.FMODstatusLabel.Location = new System.Drawing.Point(213, 235);
+            this.FMODstatusLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODstatusLabel.Location = new System.Drawing.Point(214, 255);
             this.FMODstatusLabel.Name = "FMODstatusLabel";
-            this.FMODstatusLabel.Size = new System.Drawing.Size(47, 12);
+            this.FMODstatusLabel.Size = new System.Drawing.Size(47, 13);
             this.FMODstatusLabel.TabIndex = 6;
             this.FMODstatusLabel.Text = "Stopped";
             // 
             // FMODprogressBar
             // 
             this.FMODprogressBar.AutoSize = false;
-            this.FMODprogressBar.Location = new System.Drawing.Point(213, 253);
+            this.FMODprogressBar.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODprogressBar.Location = new System.Drawing.Point(213, 274);
             this.FMODprogressBar.Maximum = 1000;
             this.FMODprogressBar.Name = "FMODprogressBar";
-            this.FMODprogressBar.Size = new System.Drawing.Size(350, 22);
+            this.FMODprogressBar.Size = new System.Drawing.Size(350, 24);
             this.FMODprogressBar.TabIndex = 5;
             this.FMODprogressBar.TickStyle = System.Windows.Forms.TickStyle.None;
             this.FMODprogressBar.Scroll += new System.EventHandler(this.FMODprogressBar_Scroll);
@@ -852,8 +888,9 @@
             // 
             // FMODvolumeBar
             // 
+            this.FMODvolumeBar.ImeMode = System.Windows.Forms.ImeMode.NoControl;
             this.FMODvolumeBar.LargeChange = 2;
-            this.FMODvolumeBar.Location = new System.Drawing.Point(460, 280);
+            this.FMODvolumeBar.Location = new System.Drawing.Point(460, 303);
             this.FMODvolumeBar.Name = "FMODvolumeBar";
             this.FMODvolumeBar.Size = new System.Drawing.Size(104, 45);
             this.FMODvolumeBar.TabIndex = 4;
@@ -864,9 +901,10 @@
             // FMODloopButton
             // 
             this.FMODloopButton.Appearance = System.Windows.Forms.Appearance.Button;
-            this.FMODloopButton.Location = new System.Drawing.Point(399, 280);
+            this.FMODloopButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODloopButton.Location = new System.Drawing.Point(399, 303);
             this.FMODloopButton.Name = "FMODloopButton";
-            this.FMODloopButton.Size = new System.Drawing.Size(55, 42);
+            this.FMODloopButton.Size = new System.Drawing.Size(55, 46);
             this.FMODloopButton.TabIndex = 3;
             this.FMODloopButton.Text = "Loop";
             this.FMODloopButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -875,9 +913,10 @@
             // 
             // FMODstopButton
             // 
-            this.FMODstopButton.Location = new System.Drawing.Point(338, 280);
+            this.FMODstopButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODstopButton.Location = new System.Drawing.Point(338, 303);
             this.FMODstopButton.Name = "FMODstopButton";
-            this.FMODstopButton.Size = new System.Drawing.Size(55, 42);
+            this.FMODstopButton.Size = new System.Drawing.Size(55, 46);
             this.FMODstopButton.TabIndex = 2;
             this.FMODstopButton.Text = "Stop";
             this.FMODstopButton.UseVisualStyleBackColor = true;
@@ -885,9 +924,10 @@
             // 
             // FMODpauseButton
             // 
-            this.FMODpauseButton.Location = new System.Drawing.Point(277, 280);
+            this.FMODpauseButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODpauseButton.Location = new System.Drawing.Point(277, 303);
             this.FMODpauseButton.Name = "FMODpauseButton";
-            this.FMODpauseButton.Size = new System.Drawing.Size(55, 42);
+            this.FMODpauseButton.Size = new System.Drawing.Size(55, 46);
             this.FMODpauseButton.TabIndex = 1;
             this.FMODpauseButton.Text = "Pause";
             this.FMODpauseButton.UseVisualStyleBackColor = true;
@@ -895,9 +935,10 @@
             // 
             // FMODplayButton
             // 
-            this.FMODplayButton.Location = new System.Drawing.Point(216, 280);
+            this.FMODplayButton.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.FMODplayButton.Location = new System.Drawing.Point(216, 303);
             this.FMODplayButton.Name = "FMODplayButton";
-            this.FMODplayButton.Size = new System.Drawing.Size(55, 42);
+            this.FMODplayButton.Size = new System.Drawing.Size(55, 46);
             this.FMODplayButton.TabIndex = 0;
             this.FMODplayButton.Text = "Play";
             this.FMODplayButton.UseVisualStyleBackColor = true;
@@ -910,7 +951,7 @@
             this.fontPreviewBox.Location = new System.Drawing.Point(0, 0);
             this.fontPreviewBox.Name = "fontPreviewBox";
             this.fontPreviewBox.ReadOnly = true;
-            this.fontPreviewBox.Size = new System.Drawing.Size(768, 606);
+            this.fontPreviewBox.Size = new System.Drawing.Size(768, 607);
             this.fontPreviewBox.TabIndex = 0;
             this.fontPreviewBox.Text = resources.GetString("fontPreviewBox.Text");
             this.fontPreviewBox.Visible = false;
@@ -922,7 +963,7 @@
             this.glControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.glControl1.Location = new System.Drawing.Point(0, 0);
             this.glControl1.Name = "glControl1";
-            this.glControl1.Size = new System.Drawing.Size(768, 606);
+            this.glControl1.Size = new System.Drawing.Size(768, 607);
             this.glControl1.TabIndex = 4;
             this.glControl1.Visible = false;
             this.glControl1.VSync = false;
@@ -936,13 +977,13 @@
             // textPreviewBox
             // 
             this.textPreviewBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.textPreviewBox.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.textPreviewBox.Font = new System.Drawing.Font("Consolas", 9.75F);
             this.textPreviewBox.Location = new System.Drawing.Point(0, 0);
             this.textPreviewBox.Multiline = true;
             this.textPreviewBox.Name = "textPreviewBox";
             this.textPreviewBox.ReadOnly = true;
             this.textPreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textPreviewBox.Size = new System.Drawing.Size(768, 606);
+            this.textPreviewBox.Size = new System.Drawing.Size(768, 607);
             this.textPreviewBox.TabIndex = 2;
             this.textPreviewBox.Visible = false;
             this.textPreviewBox.WordWrap = false;
@@ -955,7 +996,7 @@
             this.classTextBox.Name = "classTextBox";
             this.classTextBox.ReadOnly = true;
             this.classTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.classTextBox.Size = new System.Drawing.Size(768, 606);
+            this.classTextBox.Size = new System.Drawing.Size(768, 607);
             this.classTextBox.TabIndex = 3;
             this.classTextBox.Visible = false;
             this.classTextBox.WordWrap = false;
@@ -965,7 +1006,7 @@
             this.tabPage5.Controls.Add(this.dumpTextBox);
             this.tabPage5.Location = new System.Drawing.Point(4, 22);
             this.tabPage5.Name = "tabPage5";
-            this.tabPage5.Size = new System.Drawing.Size(768, 606);
+            this.tabPage5.Size = new System.Drawing.Size(768, 607);
             this.tabPage5.TabIndex = 1;
             this.tabPage5.Text = "Dump";
             this.tabPage5.UseVisualStyleBackColor = true;
@@ -978,7 +1019,7 @@
             this.dumpTextBox.Name = "dumpTextBox";
             this.dumpTextBox.ReadOnly = true;
             this.dumpTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.dumpTextBox.Size = new System.Drawing.Size(768, 606);
+            this.dumpTextBox.Size = new System.Drawing.Size(768, 607);
             this.dumpTextBox.TabIndex = 0;
             this.dumpTextBox.WordWrap = false;
             // 
@@ -986,7 +1027,7 @@
             // 
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 632);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 633);
             this.statusStrip1.Name = "statusStrip1";
             this.statusStrip1.Size = new System.Drawing.Size(776, 22);
             this.statusStrip1.TabIndex = 2;
@@ -1001,6 +1042,50 @@
             this.toolStripStatusLabel1.Text = "Ready to go";
             this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // contextMenuStrip2
+            // 
+            this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.selectAllToolStripMenuItem,
+            this.selectNoneToolStripMenuItem,
+            this.toolStripSeparator5,
+            this.expandAllToolStripMenuItem,
+            this.collapseAllToolStripMenuItem});
+            this.contextMenuStrip2.Name = "contextMenuStrip2";
+            this.contextMenuStrip2.Size = new System.Drawing.Size(181, 120);
+            // 
+            // selectAllToolStripMenuItem
+            // 
+            this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
+            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.selectAllToolStripMenuItem.Text = "Select all";
+            this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
+            // 
+            // selectNoneToolStripMenuItem
+            // 
+            this.selectNoneToolStripMenuItem.Name = "selectNoneToolStripMenuItem";
+            this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.selectNoneToolStripMenuItem.Text = "Select none";
+            this.selectNoneToolStripMenuItem.Click += new System.EventHandler(this.selectNoneToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator5
+            // 
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
+            this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
+            // 
+            // collapseAllToolStripMenuItem
+            // 
+            this.collapseAllToolStripMenuItem.Name = "collapseAllToolStripMenuItem";
+            this.collapseAllToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.collapseAllToolStripMenuItem.Text = "Collapse all";
+            this.collapseAllToolStripMenuItem.Click += new System.EventHandler(this.collapseAllToolStripMenuItem_Click);
+            // 
+            // expandAllToolStripMenuItem
+            // 
+            this.expandAllToolStripMenuItem.Name = "expandAllToolStripMenuItem";
+            this.expandAllToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.expandAllToolStripMenuItem.Text = "Expand all";
+            this.expandAllToolStripMenuItem.Click += new System.EventHandler(this.expandAllToolStripMenuItem_Click);
+            // 
             // timer
             // 
             this.timer.Interval = 10;
@@ -1020,37 +1105,45 @@
             this.copyToolStripMenuItem,
             this.exportSelectedAssetsToolStripMenuItem,
             this.exportAnimatorwithselectedAnimationClipMenuItem,
+            this.dumpSelectedAssetsToolStripMenuItem,
             this.goToSceneHierarchyToolStripMenuItem,
             this.showOriginalFileToolStripMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(327, 114);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(304, 136);
             // 
             // copyToolStripMenuItem
             // 
             this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
-            this.copyToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
             this.copyToolStripMenuItem.Text = "Copy text";
             this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
             // 
             // exportSelectedAssetsToolStripMenuItem
             // 
             this.exportSelectedAssetsToolStripMenuItem.Name = "exportSelectedAssetsToolStripMenuItem";
-            this.exportSelectedAssetsToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
+            this.exportSelectedAssetsToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
             this.exportSelectedAssetsToolStripMenuItem.Text = "Export selected assets";
             this.exportSelectedAssetsToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedAssetsToolStripMenuItem_Click);
             // 
             // exportAnimatorwithselectedAnimationClipMenuItem
             // 
             this.exportAnimatorwithselectedAnimationClipMenuItem.Name = "exportAnimatorwithselectedAnimationClipMenuItem";
-            this.exportAnimatorwithselectedAnimationClipMenuItem.Size = new System.Drawing.Size(326, 22);
+            this.exportAnimatorwithselectedAnimationClipMenuItem.Size = new System.Drawing.Size(303, 22);
             this.exportAnimatorwithselectedAnimationClipMenuItem.Text = "Export Animator + selected AnimationClips";
             this.exportAnimatorwithselectedAnimationClipMenuItem.Visible = false;
             this.exportAnimatorwithselectedAnimationClipMenuItem.Click += new System.EventHandler(this.exportAnimatorwithAnimationClipMenuItem_Click);
             // 
+            // dumpSelectedAssetsToolStripMenuItem
+            // 
+            this.dumpSelectedAssetsToolStripMenuItem.Name = "dumpSelectedAssetsToolStripMenuItem";
+            this.dumpSelectedAssetsToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
+            this.dumpSelectedAssetsToolStripMenuItem.Text = "Dump selected assets";
+            this.dumpSelectedAssetsToolStripMenuItem.Click += new System.EventHandler(this.dumpSelectedAssetsToolStripMenuItem_Click);
+            // 
             // goToSceneHierarchyToolStripMenuItem
             // 
             this.goToSceneHierarchyToolStripMenuItem.Name = "goToSceneHierarchyToolStripMenuItem";
-            this.goToSceneHierarchyToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
+            this.goToSceneHierarchyToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
             this.goToSceneHierarchyToolStripMenuItem.Text = "Go to scene hierarchy";
             this.goToSceneHierarchyToolStripMenuItem.Visible = false;
             this.goToSceneHierarchyToolStripMenuItem.Click += new System.EventHandler(this.goToSceneHierarchyToolStripMenuItem_Click);
@@ -1058,7 +1151,7 @@
             // showOriginalFileToolStripMenuItem
             // 
             this.showOriginalFileToolStripMenuItem.Name = "showOriginalFileToolStripMenuItem";
-            this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
+            this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
             this.showOriginalFileToolStripMenuItem.Text = "Show original file";
             this.showOriginalFileToolStripMenuItem.Visible = false;
             this.showOriginalFileToolStripMenuItem.Click += new System.EventHandler(this.showOriginalFileToolStripMenuItem_Click);
@@ -1072,7 +1165,7 @@
             this.Icon = global::AssetStudioGUI.Properties.Resources._as;
             this.KeyPreview = true;
             this.MainMenuStrip = this.menuStrip1;
-            this.MinimumSize = new System.Drawing.Size(620, 372);
+            this.MinimumSize = new System.Drawing.Size(620, 400);
             this.Name = "AssetStudioGUIForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "AssetStudioGUI";
@@ -1105,6 +1198,7 @@
             this.tabPage5.PerformLayout();
             this.statusStrip1.ResumeLayout(false);
             this.statusStrip1.PerformLayout();
+            this.contextMenuStrip2.ResumeLayout(false);
             this.contextMenuStrip1.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -1209,6 +1303,14 @@
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem14;
         private System.Windows.Forms.ToolStripTextBox specifyUnityVersion;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem15;
+        private System.Windows.Forms.ToolStripMenuItem dumpSelectedAssetsToolStripMenuItem;
+        private System.Windows.Forms.CheckBox filterExcludeMode;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
+        private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem selectNoneToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+        private System.Windows.Forms.ToolStripMenuItem collapseAllToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem expandAllToolStripMenuItem;
     }
 }
 

AssetStudioGUI/AssetStudioGUIForm.cs

@@ -43,6 +43,10 @@ namespace AssetStudioGUI
         private uint FMODlenms;
         private float FMODVolume = 0.8f;
 
+        #region SpriteControl
+        private SpriteMaskMode spriteMaskVisibleMode = SpriteMaskMode.On;
+        #endregion
+
         #region TexControl
         private static char[] textureChannelNames = new[] { 'B', 'G', 'R', 'A' };
         private bool[] textureChannels = new[] { true, true, true, true };
@@ -77,6 +81,12 @@ namespace AssetStudioGUI
         private int sortColumn = -1;
         private bool reverseSort;
 
+#if NET6_0_OR_GREATER
+        private AlphanumComparatorFastNet alphanumComparator = new AlphanumComparatorFastNet();
+#else
+        private AlphanumComparatorFast alphanumComparator = new AlphanumComparatorFast();
+#endif
+
         //asset list filter
         private System.Timers.Timer delayTimer;
         private bool enableFiltering;
@@ -176,7 +186,7 @@ namespace AssetStudioGUI
                     var fileNames = openFileDialog1.FileNames;
                     var savePath = saveFolderDialog.Folder;
                     var extractedCount = await Task.Run(() => ExtractFile(fileNames, savePath));
-                    StatusStripUpdate($"Finished extracting {extractedCount} files.");
+                    Logger.Info($"Finished extracting {extractedCount} files.");
                 }
             }
         }
@@ -193,7 +203,7 @@ namespace AssetStudioGUI
                     var path = openFolderDialog.Folder;
                     var savePath = saveFolderDialog.Folder;
                     var extractedCount = await Task.Run(() => ExtractFolder(path, savePath));
-                    StatusStripUpdate($"Finished extracting {extractedCount} files.");
+                    Logger.Info($"Finished extracting {extractedCount} files.");
                 }
             }
         }
@@ -202,7 +212,8 @@ namespace AssetStudioGUI
         {
             if (assetsManager.assetsFileList.Count == 0)
             {
-                StatusStripUpdate("No Unity file can be loaded.");
+                filterExcludeModeCheck(assetsManager.assetsFileList.Count);
+                Logger.Info("No Unity file can be loaded.");
                 return;
             }
 
@@ -240,6 +251,8 @@ namespace AssetStudioGUI
             typeMap.Clear();
             classesListView.EndUpdate();
 
+            filterExcludeModeCheck(exportableAssets.Count);
+
             var types = exportableAssets.Select(x => x.Type).Distinct().OrderBy(x => x.ToString()).ToArray();
             foreach (var type in types)
             {
@@ -261,7 +274,7 @@ namespace AssetStudioGUI
             {
                 log += $" and {m_ObjectsCount - objectsCount} assets failed to read";
             }
-            StatusStripUpdate(log);
+            Logger.Info(log);
         }
 
         private void typeToolStripMenuItem_Click(object sender, EventArgs e)
@@ -314,24 +327,41 @@ namespace AssetStudioGUI
                 if (e.Control)
                 {
                     var need = false;
-                    switch (e.KeyCode)
+                    if (lastSelectedItem?.Type == ClassIDType.Texture2D)
                     {
-                        case Keys.B:
-                            textureChannels[0] = !textureChannels[0];
-                            need = true;
-                            break;
-                        case Keys.G:
-                            textureChannels[1] = !textureChannels[1];
-                            need = true;
-                            break;
-                        case Keys.R:
-                            textureChannels[2] = !textureChannels[2];
-                            need = true;
-                            break;
-                        case Keys.A:
-                            textureChannels[3] = !textureChannels[3];
-                            need = true;
-                            break;
+                        switch (e.KeyCode)
+                        {
+                            case Keys.B:
+                                textureChannels[0] = !textureChannels[0];
+                                need = true;
+                                break;
+                            case Keys.G:
+                                textureChannels[1] = !textureChannels[1];
+                                need = true;
+                                break;
+                            case Keys.R:
+                                textureChannels[2] = !textureChannels[2];
+                                need = true;
+                                break;
+                            case Keys.A:
+                                textureChannels[3] = !textureChannels[3];
+                                need = true;
+                                break;
+                        }
+                    }
+                    else if (lastSelectedItem?.Type == ClassIDType.Sprite && !((Sprite)lastSelectedItem.Asset).m_RD.alphaTexture.IsNull)
+                    {
+                        switch (e.KeyCode)
+                        {
+                            case Keys.A:
+                                spriteMaskVisibleMode = spriteMaskVisibleMode == SpriteMaskMode.On ? SpriteMaskMode.Off : SpriteMaskMode.On;
+                                need = true;
+                                break;
+                            case Keys.M:
+                                spriteMaskVisibleMode = spriteMaskVisibleMode == SpriteMaskMode.MaskOnly ? SpriteMaskMode.On : SpriteMaskMode.MaskOnly;
+                                need = true;
+                                break;
+                        }
                     }
                     if (need)
                     {
@@ -367,7 +397,7 @@ namespace AssetStudioGUI
                         Progress.Report(++i, count);
                     }
 
-                    StatusStripUpdate("Finished exporting class structures");
+                    Logger.Info("Finished exporting class structures");
                 }
             }
         }
@@ -410,7 +440,7 @@ namespace AssetStudioGUI
                         {
                             FMODpanel.Visible = !FMODpanel.Visible;
 
-                            if (sound != null && channel != null)
+                            if (sound.hasHandle() && channel.hasHandle())
                             {
                                 var result = channel.isPlaying(out var playing);
                                 if (result == FMOD.RESULT.OK && playing)
@@ -620,13 +650,23 @@ namespace AssetStudioGUI
                     return reverseSort ? pathID_Y.CompareTo(pathID_X) : pathID_X.CompareTo(pathID_Y);
                 });
             }
-            else
+            else if (sortColumn == 0) // Name
             {
                 visibleAssets.Sort((a, b) =>
                 {
                     var at = a.SubItems[sortColumn].Text;
                     var bt = b.SubItems[sortColumn].Text;
-                    return reverseSort ? bt.CompareTo(at) : at.CompareTo(bt);
+                    return reverseSort ? alphanumComparator.Compare(bt, at) : alphanumComparator.Compare(at, bt);
+                });
+            }
+            else
+            {
+                visibleAssets.Sort((a, b) =>
+                {
+                    var at = a.SubItems[sortColumn].Text.AsSpan();
+                    var bt = b.SubItems[sortColumn].Text.AsSpan();
+
+                    return reverseSort ? MemoryExtensions.CompareTo(bt, at, StringComparison.OrdinalIgnoreCase) : MemoryExtensions.CompareTo(at, bt, StringComparison.OrdinalIgnoreCase);
                 });
             }
             assetListView.EndUpdate();
@@ -721,7 +761,9 @@ namespace AssetStudioGUI
                     case Mesh m_Mesh:
                         PreviewMesh(m_Mesh);
                         break;
-                    case VideoClip _:
+                    case VideoClip m_VideoClip:
+                        PreviewVideoClip(assetItem, m_VideoClip);
+                        break;
                     case MovieTexture _:
                         StatusStripUpdate("Only supported export.");
                         break;
@@ -755,7 +797,7 @@ namespace AssetStudioGUI
             var image = m_Texture2D.ConvertToImage(true);
             if (image != null)
             {
-                var bitmap = new DirectBitmap(image.ConvertToBytes(), m_Texture2D.m_Width, m_Texture2D.m_Height);
+                var bitmap = new DirectBitmap(image);
                 image.Dispose();
                 assetItem.InfoText = $"Width: {m_Texture2D.m_Width}\nHeight: {m_Texture2D.m_Height}\nFormat: {m_Texture2D.m_TextureFormat}";
                 switch (m_Texture2D.m_TextureSettings.m_FilterMode)
@@ -853,7 +895,7 @@ namespace AssetStudioGUI
                         assetItem.InfoText += "iPhone";
                         break;
                     default:
-                        assetItem.InfoText += "Unknown";
+                        assetItem.InfoText += $"Unknown ({m_AudioClip.m_Type})";
                         break;
                 }
             }
@@ -922,7 +964,8 @@ namespace AssetStudioGUI
             result = sound.getLength(out FMODlenms, FMOD.TIMEUNIT.MS);
             if (ERRCHECK(result)) return;
 
-            result = system.playSound(sound, null, true, out channel);
+            _ = system.getMasterChannelGroup(out var channelGroup);
+            result = system.playSound(sound, channelGroup, true, out channel);
             if (ERRCHECK(result)) return;
 
             FMODpanel.Visible = true;
@@ -931,7 +974,19 @@ namespace AssetStudioGUI
             if (ERRCHECK(result)) return;
 
             FMODinfoLabel.Text = frequency + " Hz";
-            FMODtimerLabel.Text = $"0:0.0 / {FMODlenms / 1000 / 60}:{FMODlenms / 1000 % 60}.{FMODlenms / 10 % 100}";
+            FMODtimerLabel.Text = $"00:00.00 / {(FMODlenms / 1000 / 60):00}:{(FMODlenms / 1000 % 60):00}.{(FMODlenms / 10 % 100):00}";
+        }
+
+        private void PreviewVideoClip(AssetItem assetItem, VideoClip m_VideoClip)
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine($"Width: {m_VideoClip.Width}");
+            sb.AppendLine($"Height: {m_VideoClip.Height}");
+            sb.AppendLine($"Frame rate: {m_VideoClip.m_FrameRate}");
+            sb.AppendLine($"Split alpha: {m_VideoClip.m_HasSplitAlpha}");
+            assetItem.InfoText = sb.ToString();
+            
+            StatusStripUpdate("Only supported export.");
         }
 
         private void PreviewShader(Shader m_Shader)
@@ -1160,13 +1215,19 @@ namespace AssetStudioGUI
 
         private void PreviewSprite(AssetItem assetItem, Sprite m_Sprite)
         {
-            var image = m_Sprite.GetImage();
+            var image = m_Sprite.GetImage(spriteMaskMode: spriteMaskVisibleMode);
             if (image != null)
             {
-                var bitmap = new DirectBitmap(image.ConvertToBytes(), image.Width, image.Height);
+                var bitmap = new DirectBitmap(image);
                 image.Dispose();
                 assetItem.InfoText = $"Width: {bitmap.Width}\nHeight: {bitmap.Height}\n";
                 PreviewTexture(bitmap);
+
+                if (!m_Sprite.m_RD.alphaTexture.IsNull)
+                {
+                    assetItem.InfoText += $"Alpha Mask: {spriteMaskVisibleMode}\n";
+                    StatusStripUpdate("'Ctrl'+'A' - Enable/Disable alpha mask usage. 'Ctrl'+'M' - Show alpha mask only.");
+                }
             }
             else
             {
@@ -1207,7 +1268,7 @@ namespace AssetStudioGUI
         {
             if (InvokeRequired)
             {
-                BeginInvoke(new Action(() => { toolStripStatusLabel1.Text = statusText; }));
+                Invoke(new Action(() => { toolStripStatusLabel1.Text = statusText; }));
             }
             else
             {
@@ -1241,6 +1302,8 @@ namespace AssetStudioGUI
             reverseSort = false;
             enableFiltering = false;
             listSearch.Text = " Filter ";
+            if (tabControl1.SelectedIndex == 1)
+                assetListView.Select();
 
             var count = filterTypeToolStripMenuItem.DropDownItems.Count;
             for (var i = 1; i < count; i++)
@@ -1251,6 +1314,14 @@ namespace AssetStudioGUI
             FMODreset();
         }
 
+        private void tabControl2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (tabControl2.SelectedIndex == 1 && lastSelectedItem != null)
+            {
+                dumpTextBox.Text = DumpAsset(lastSelectedItem.Asset);
+            }
+        }
+
         private void assetListView_MouseClick(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Right && assetListView.SelectedIndices.Count > 0)
@@ -1273,7 +1344,10 @@ namespace AssetStudioGUI
                     }
                 }
 
-                tempClipboard = assetListView.HitTest(new Point(e.X, e.Y)).SubItem.Text;
+                var selectedElement = assetListView.HitTest(new Point(e.X, e.Y));
+                var subItemIndex = selectedElement.Item.SubItems.IndexOf(selectedElement.SubItem);
+                tempClipboard = selectedElement.SubItem.Text;
+                copyToolStripMenuItem.Text = $"Copy {assetListView.Columns[subItemIndex].Text}";
                 contextMenuStrip1.Show(assetListView, e.X, e.Y);
             }
         }
@@ -1288,6 +1362,11 @@ namespace AssetStudioGUI
             ExportAssets(ExportFilter.Selected, ExportType.Convert);
         }
 
+        private void dumpSelectedAssetsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            ExportAssets(ExportFilter.Selected, ExportType.Dump);
+        }
+
         private void showOriginalFileToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var selectasset = (AssetItem)assetListView.Items[assetListView.SelectedIndices[0]];
@@ -1499,6 +1578,18 @@ namespace AssetStudioGUI
             }
         }
 
+        private void assetListView_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (assetListView.SelectedIndices.Count > 1)
+                StatusStripUpdate($"Selected {assetListView.SelectedIndices.Count} assets.");
+        }
+
+        private void assetListView_VirtualItemsSelectionRangeChanged(object sender, ListViewVirtualItemsSelectionRangeChangedEventArgs e)
+        {
+            if (assetListView.SelectedIndices.Count > 1)
+                StatusStripUpdate($"Selected {assetListView.SelectedIndices.Count} assets.");
+        }
+
         private List<AssetItem> GetSelectedAssets()
         {
             var selectedAssets = new List<AssetItem>(assetListView.SelectedIndices.Count);
@@ -1510,6 +1601,20 @@ namespace AssetStudioGUI
             return selectedAssets;
         }
 
+        private void filterExcludeMode_CheckedChanged(object sender, EventArgs e)
+        {
+            FilterAssetList();
+        }
+
+        private void filterExcludeModeCheck(int itemCount)
+        {
+            filterExcludeMode.Enabled = itemCount > 0;
+            if (!filterExcludeMode.Enabled)
+            {
+                filterExcludeMode.Checked = false;
+            }
+        }
+
         private void FilterAssetList()
         {
             assetListView.BeginUpdate();
@@ -1533,10 +1638,20 @@ namespace AssetStudioGUI
             }
             if (listSearch.Text != " Filter ")
             {
-                visibleAssets = visibleAssets.FindAll(
-                    x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
-                    x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
-                    x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0);
+                if (filterExcludeMode.Checked)
+                {
+                    visibleAssets = visibleAssets.FindAll(
+                        x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0 &&
+                        x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0 &&
+                        x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) <= 0);
+                }
+                else
+                {
+                    visibleAssets = visibleAssets.FindAll(
+                        x => x.Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
+                        x.SubItems[1].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0 ||
+                        x.SubItems[3].Text.IndexOf(listSearch.Text, StringComparison.OrdinalIgnoreCase) >= 0);
+                }
             }
             assetListView.VirtualListSize = visibleAssets.Count;
             assetListView.EndUpdate();
@@ -1608,6 +1723,65 @@ namespace AssetStudioGUI
             }
         }
 
+        private void toolStripMenuItem15_Click(object sender, EventArgs e)
+        {
+            logger.ShowErrorMessage = toolStripMenuItem15.Checked;
+        }
+
+        private void sceneTreeView_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Right && sceneTreeView.Nodes.Count > 0)
+            {
+                contextMenuStrip2.Show(sceneTreeView, e.Location.X, e.Location.Y);
+            }
+        }
+
+        private void selectAllToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            sceneTreeView.BeginUpdate();
+            foreach (TreeNode node in sceneTreeView.Nodes)
+            {
+                node.Checked = true;
+            }
+            sceneTreeView.EndUpdate();
+        }
+
+        private void selectNoneToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            sceneTreeView.BeginUpdate();
+            foreach (TreeNode node in sceneTreeView.Nodes)
+            {
+                node.Checked = false;
+            }
+            sceneTreeView.EndUpdate();
+        }
+
+        private void expandAllToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (sceneTreeView.Nodes.Count > 500)
+            {
+                MessageBox.Show("Too many elements.");
+                return;
+            }
+
+            sceneTreeView.BeginUpdate();
+            foreach (TreeNode node in sceneTreeView.Nodes)
+            {
+                node.ExpandAll();
+            }
+            sceneTreeView.EndUpdate();
+        }
+
+        private void collapseAllToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            sceneTreeView.BeginUpdate();
+            foreach (TreeNode node in sceneTreeView.Nodes)
+            {
+                node.Collapse(ignoreChildren: false);
+            }
+            sceneTreeView.EndUpdate();
+        }
+
         #region FMOD
         private void FMODinit()
         {
@@ -1620,7 +1794,7 @@ namespace AssetStudioGUI
             ERRCHECK(result);
             if (version < FMOD.VERSION.number)
             {
-                MessageBox.Show($"Error!  You are using an old version of FMOD {version:X}.  This program requires {FMOD.VERSION.number:X}.");
+                Logger.Error($"Error!  You are using an old version of FMOD {version:X}.  This program requires {FMOD.VERSION.number:X}.");
                 Application.Exit();
             }
 
@@ -1638,22 +1812,23 @@ namespace AssetStudioGUI
         {
             timer.Stop();
             FMODprogressBar.Value = 0;
-            FMODtimerLabel.Text = "0:00.0 / 0:00.0";
+            FMODtimerLabel.Text = "00:00.00 / 00:00.00";
             FMODstatusLabel.Text = "Stopped";
             FMODinfoLabel.Text = "";
 
-            if (sound != null && sound.isValid())
+            if (sound.hasHandle())
             {
                 var result = sound.release();
                 ERRCHECK(result);
-                sound = null;
+                sound.clearHandle();
             }
         }
 
         private void FMODplayButton_Click(object sender, EventArgs e)
         {
-            if (sound != null && channel != null)
+            if (sound.hasHandle() && channel.hasHandle())
             {
+                _ = system.getMasterChannelGroup(out var channelGroup);
                 timer.Start();
                 var result = channel.isPlaying(out var playing);
                 if ((result != FMOD.RESULT.OK) && (result != FMOD.RESULT.ERR_INVALID_HANDLE))
@@ -1666,14 +1841,14 @@ namespace AssetStudioGUI
                     result = channel.stop();
                     if (ERRCHECK(result)) { return; }
 
-                    result = system.playSound(sound, null, false, out channel);
+                    result = system.playSound(sound, channelGroup, false, out channel);
                     if (ERRCHECK(result)) { return; }
 
                     FMODpauseButton.Text = "Pause";
                 }
                 else
                 {
-                    result = system.playSound(sound, null, false, out channel);
+                    result = system.playSound(sound, channelGroup, false, out channel);
                     if (ERRCHECK(result)) { return; }
                     FMODstatusLabel.Text = "Playing";
 
@@ -1694,7 +1869,7 @@ namespace AssetStudioGUI
 
         private void FMODpauseButton_Click(object sender, EventArgs e)
         {
-            if (sound != null && channel != null)
+            if (sound.hasHandle() && channel.hasHandle())
             {
                 var result = channel.isPlaying(out var playing);
                 if ((result != FMOD.RESULT.OK) && (result != FMOD.RESULT.ERR_INVALID_HANDLE))
@@ -1727,7 +1902,7 @@ namespace AssetStudioGUI
 
         private void FMODstopButton_Click(object sender, EventArgs e)
         {
-            if (channel != null)
+            if (channel.hasHandle())
             {
                 var result = channel.isPlaying(out var playing);
                 if ((result != FMOD.RESULT.OK) && (result != FMOD.RESULT.ERR_INVALID_HANDLE))
@@ -1743,7 +1918,7 @@ namespace AssetStudioGUI
                     //don't FMODreset, it will nullify the sound
                     timer.Stop();
                     FMODprogressBar.Value = 0;
-                    FMODtimerLabel.Text = "0:00.0 / 0:00.0";
+                    FMODtimerLabel.Text = "00:00.00 / 00:00.00";
                     FMODstatusLabel.Text = "Stopped";
                     FMODpauseButton.Text = "Pause";
                 }
@@ -1756,13 +1931,13 @@ namespace AssetStudioGUI
 
             loopMode = FMODloopButton.Checked ? FMOD.MODE.LOOP_NORMAL : FMOD.MODE.LOOP_OFF;
 
-            if (sound != null)
+            if (sound.hasHandle())
             {
                 result = sound.setMode(loopMode);
                 if (ERRCHECK(result)) { return; }
             }
 
-            if (channel != null)
+            if (channel.hasHandle())
             {
                 result = channel.isPlaying(out var playing);
                 if ((result != FMOD.RESULT.OK) && (result != FMOD.RESULT.ERR_INVALID_HANDLE))
@@ -1794,10 +1969,10 @@ namespace AssetStudioGUI
 
         private void FMODprogressBar_Scroll(object sender, EventArgs e)
         {
-            if (channel != null)
+            if (channel.hasHandle())
             {
                 uint newms = FMODlenms / 1000 * (uint)FMODprogressBar.Value;
-                FMODtimerLabel.Text = $"{newms / 1000 / 60}:{newms / 1000 % 60}.{newms / 10 % 100}/{FMODlenms / 1000 / 60}:{FMODlenms / 1000 % 60}.{FMODlenms / 10 % 100}";
+                FMODtimerLabel.Text = $"{newms / 1000 / 60:00}:{newms / 1000 % 60:00}.{newms / 10 % 100:00} / {FMODlenms / 1000 / 60:00}:{FMODlenms / 1000 % 60:00}.{FMODlenms / 10 % 100:00}";
             }
         }
 
@@ -1808,7 +1983,7 @@ namespace AssetStudioGUI
 
         private void FMODprogressBar_MouseUp(object sender, MouseEventArgs e)
         {
-            if (channel != null)
+            if (channel.hasHandle())
             {
                 uint newms = FMODlenms / 1000 * (uint)FMODprogressBar.Value;
 
@@ -1835,7 +2010,7 @@ namespace AssetStudioGUI
             bool playing = false;
             bool paused = false;
 
-            if (channel != null)
+            if (channel.hasHandle())
             {
                 var result = channel.getPosition(out ms, FMOD.TIMEUNIT.MS);
                 if ((result != FMOD.RESULT.OK) && (result != FMOD.RESULT.ERR_INVALID_HANDLE))
@@ -1856,11 +2031,15 @@ namespace AssetStudioGUI
                 }
             }
 
-            FMODtimerLabel.Text = $"{ms / 1000 / 60}:{ms / 1000 % 60}.{ms / 10 % 100} / {FMODlenms / 1000 / 60}:{FMODlenms / 1000 % 60}.{FMODlenms / 10 % 100}";
-            FMODprogressBar.Value = (int)(ms * 1000 / FMODlenms);
+            FMODtimerLabel.Text = $"{ms / 1000 / 60:00}:{ms / 1000 % 60:00}.{ms / 10 % 100:00} / {FMODlenms / 1000 / 60:00}:{FMODlenms / 1000 % 60:00}.{FMODlenms / 10 % 100:00}";
+#if NETFRAMEWORK
+            FMODprogressBar.Value = (int)Math.Max(0, Math.Min(ms * 1000f / FMODlenms, 1000));
+#else
+            FMODprogressBar.Value = (int)Math.Clamp(ms * 1000f / FMODlenms, 0, 1000);
+#endif
             FMODstatusLabel.Text = paused ? "Paused " : playing ? "Playing" : "Stopped";
 
-            if (system != null && channel != null)
+            if (system.hasHandle() && channel.hasHandle())
             {
                 system.update();
             }
@@ -1871,7 +2050,7 @@ namespace AssetStudioGUI
             if (result != FMOD.RESULT.OK)
             {
                 FMODreset();
-                StatusStripUpdate($"FMOD error! {result} - {FMOD.Error.String(result)}");
+                Logger.Warning($"FMOD error! {result} - {FMOD.Error.String(result)}");
                 return true;
             }
             return false;
@@ -2036,19 +2215,6 @@ namespace AssetStudioGUI
             glControl1.SwapBuffers();
         }
 
-        private void tabControl2_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (tabControl2.SelectedIndex == 1 && lastSelectedItem != null)
-            {
-                dumpTextBox.Text = DumpAsset(lastSelectedItem.Asset);
-            }
-        }
-
-        private void toolStripMenuItem15_Click(object sender, EventArgs e)
-        {
-            logger.ShowErrorMessage = toolStripMenuItem15.Checked;
-        }
-
         private void glControl1_MouseWheel(object sender, MouseEventArgs e)
         {
             if (glControl1.Visible)

AssetStudioGUI/AssetStudioGUIForm.resx

@@ -141,6 +141,9 @@ The quick brown fox jumps over the lazy dog. 1234567890</value>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>432, 17</value>
   </metadata>
+  <metadata name="contextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>775, 21</value>
+  </metadata>
   <metadata name="timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>553, 17</value>
   </metadata>

AssetStudioGUI/Components/AlphanumComparatorFast.cs

@@ -0,0 +1,93 @@
+// AlphanumComparatorFast mod by VaDiM
+// Original code was developed by Dot Net Perls
+// For more detail visit: https://www.dotnetperls.com/alphanumeric-sorting
+
+using System;
+using System.Collections.Generic;
+
+namespace AssetStudioGUI
+{
+    internal class AlphanumComparatorFast : IComparer<string>
+    {
+        public int Compare(string s1, string s2)
+        {
+            int len1 = s1.Length;
+            int len2 = s2.Length;
+            int marker1 = 0;
+            int marker2 = 0;
+
+            // Walk through two the strings with two markers.
+            while (marker1 < len1 && marker2 < len2)
+            {
+                char ch1 = s1[marker1];
+                char ch2 = s2[marker2];
+
+                // Some buffers we can build up characters in for each chunk.
+                char[] space1 = new char[len1];
+                int loc1 = 0;
+                char[] space2 = new char[len2];
+                int loc2 = 0;
+
+                // Walk through all following characters that are digits or
+                // characters in BOTH strings starting at the appropriate marker.
+                // Collect char arrays.
+                do
+                {
+                    space1[loc1++] = ch1;
+                    marker1++;
+
+                    if (marker1 < len1)
+                    {
+                        ch1 = s1[marker1];
+                    }
+                    else
+                    {
+                        break;
+                    }
+                } while (char.IsDigit(ch1) == char.IsDigit(space1[0]));
+
+                do
+                {
+                    space2[loc2++] = ch2;
+                    marker2++;
+
+                    if (marker2 < len2)
+                    {
+                        ch2 = s2[marker2];
+                    }
+                    else
+                    {
+                        break;
+                    }
+                } while (char.IsDigit(ch2) == char.IsDigit(space2[0]));
+
+                // If we have collected numbers, compare them numerically.
+                // Otherwise, if we have strings, compare them alphabetically.
+                int result;
+
+                if (char.IsDigit(space1[0]) && char.IsDigit(space2[0]))
+                {
+                    if (long.TryParse(new string(space1), out long thisNumericChunk) &&
+                        long.TryParse(new string(space2), out long thatNumericChunk))
+                    {
+                        result = thisNumericChunk.CompareTo(thatNumericChunk);
+                    }
+                    else
+                    {
+                        result = MemoryExtensions.CompareTo(space1, space2, StringComparison.Ordinal);
+                    }
+                }
+                else
+                {
+                    result = MemoryExtensions.CompareTo(space1, space2, StringComparison.InvariantCultureIgnoreCase);
+                }
+
+                if (result != 0)
+                {
+                    return result;
+                }
+            }
+            return len1 - len2;
+        }
+    }
+}

AssetStudioGUI/Components/AlphanumComparatorFastNet.cs

@@ -0,0 +1,99 @@
+// AlphanumComparatorFast mod by VaDiM
+// Original code was developed by Dot Net Perls
+// For more detail visit: https://www.dotnetperls.com/alphanumeric-sorting
+
+using System;
+using System.Collections.Generic;
+
+#if NET6_0_OR_GREATER
+namespace AssetStudioGUI
+{
+    internal class AlphanumComparatorFastNet : IComparer<string>
+    {
+        public int Compare(string s1, string s2)
+        {
+            const int maxStackSize = 256;
+            int len1 = s1.Length;
+            int len2 = s2.Length;
+            int marker1 = 0;
+            int marker2 = 0;
+
+            // Some buffers we can build up characters in for each chunk.
+            Span<char> space1 = len1 > maxStackSize ? new char[len1] : stackalloc char[len1];
+            Span<char> space2 = len2 > maxStackSize ? new char[len2] : stackalloc char[len2];
+
+            // Walk through two the strings with two markers.
+            while (marker1 < len1 && marker2 < len2)
+            {
+                char ch1 = s1[marker1];
+                char ch2 = s2[marker2];
+
+                int loc1 = 0;
+                int loc2 = 0;
+                space1.Clear();
+                space2.Clear();
+
+                // Walk through all following characters that are digits or
+                // characters in BOTH strings starting at the appropriate marker.
+                // Collect char arrays.
+                do
+                {
+                    space1[loc1++] = ch1;
+                    marker1++;
+
+                    if (marker1 < len1)
+                    {
+                        ch1 = s1[marker1];
+                    }
+                    else
+                    {
+                        break;
+                    }
+                } while (char.IsDigit(ch1) == char.IsDigit(space1[0]));
+
+                do
+                {
+                    space2[loc2++] = ch2;
+                    marker2++;
+
+                    if (marker2 < len2)
+                    {
+                        ch2 = s2[marker2];
+                    }
+                    else
+                    {
+                        break;
+                    }
+                } while (char.IsDigit(ch2) == char.IsDigit(space2[0]));
+
+                // If we have collected numbers, compare them numerically.
+                // Otherwise, if we have strings, compare them alphabetically.
+                int result;
+
+                if (char.IsDigit(space1[0]) && char.IsDigit(space2[0]))
+                {
+                    if (long.TryParse(space1, out long thisNumericChunk) &&
+                        long.TryParse(space2, out long thatNumericChunk))
+                    {
+                        result = thisNumericChunk.CompareTo(thatNumericChunk);
+                    }
+                    else
+                    {
+                        result = MemoryExtensions.CompareTo(space1, space2, StringComparison.Ordinal);
+                    }
+                }
+                else
+                {
+                    result = MemoryExtensions.CompareTo(space1, space2, StringComparison.InvariantCultureIgnoreCase);
+                }
+
+                if (result != 0)
+                {
+                    return result;
+                }
+            }
+            return len1 - len2;
+        }
+    }
+}
+#endif

AssetStudioGUI/DirectBitmap.cs

@@ -1,4 +1,7 @@
-using System;
+using AssetStudio;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
@@ -7,11 +10,12 @@ namespace AssetStudioGUI
 {
     public sealed class DirectBitmap : IDisposable
     {
-        public DirectBitmap(byte[] buff, int width, int height)
+        public DirectBitmap(Image<Bgra32> image)
         {
-            Width = width;
-            Height = height;
-            Bits = buff;
+            Width = image.Width;
+            Height = image.Height;
+            Bits = BigArrayPool<byte>.Shared.Rent(Width * Height * 4);
+            image.CopyPixelDataTo(Bits);
             m_handle = GCHandle.Alloc(Bits, GCHandleType.Pinned);
             m_bitmap = new Bitmap(Width, Height, Stride, PixelFormat.Format32bppArgb, m_handle.AddrOfPinnedObject());
         }
@@ -22,6 +26,7 @@ namespace AssetStudioGUI
             {
                 m_bitmap.Dispose();
                 m_handle.Free();
+                BigArrayPool<byte>.Shared.Return(Bits);
             }
             m_bitmap = null;
         }

AssetStudioGUI/ExportOptions.Designer.cs

@@ -32,12 +32,14 @@
             this.OKbutton = new System.Windows.Forms.Button();
             this.Cancel = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.exportSpriteWithAlphaMask = new System.Windows.Forms.CheckBox();
             this.openAfterExport = new System.Windows.Forms.CheckBox();
             this.restoreExtensionName = new System.Windows.Forms.CheckBox();
             this.assetGroupOptions = new System.Windows.Forms.ComboBox();
             this.label6 = new System.Windows.Forms.Label();
             this.convertAudio = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.towebp = new System.Windows.Forms.RadioButton();
             this.totga = new System.Windows.Forms.RadioButton();
             this.tojpg = new System.Windows.Forms.RadioButton();
             this.topng = new System.Windows.Forms.RadioButton();
@@ -72,9 +74,9 @@
             // 
             // OKbutton
             // 
-            this.OKbutton.Location = new System.Drawing.Point(318, 351);
+            this.OKbutton.Location = new System.Drawing.Point(381, 380);
             this.OKbutton.Name = "OKbutton";
-            this.OKbutton.Size = new System.Drawing.Size(75, 21);
+            this.OKbutton.Size = new System.Drawing.Size(75, 23);
             this.OKbutton.TabIndex = 6;
             this.OKbutton.Text = "OK";
             this.OKbutton.UseVisualStyleBackColor = true;
@@ -83,9 +85,9 @@
             // Cancel
             // 
             this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.Cancel.Location = new System.Drawing.Point(399, 351);
+            this.Cancel.Location = new System.Drawing.Point(462, 380);
             this.Cancel.Name = "Cancel";
-            this.Cancel.Size = new System.Drawing.Size(75, 21);
+            this.Cancel.Size = new System.Drawing.Size(75, 23);
             this.Cancel.TabIndex = 7;
             this.Cancel.Text = "Cancel";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -94,6 +96,7 @@
             // groupBox1
             // 
             this.groupBox1.AutoSize = true;
+            this.groupBox1.Controls.Add(this.exportSpriteWithAlphaMask);
             this.groupBox1.Controls.Add(this.openAfterExport);
             this.groupBox1.Controls.Add(this.restoreExtensionName);
             this.groupBox1.Controls.Add(this.assetGroupOptions);
@@ -101,21 +104,33 @@
             this.groupBox1.Controls.Add(this.convertAudio);
             this.groupBox1.Controls.Add(this.panel1);
             this.groupBox1.Controls.Add(this.converttexture);
-            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Location = new System.Drawing.Point(12, 13);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(232, 334);
+            this.groupBox1.Size = new System.Drawing.Size(301, 362);
             this.groupBox1.TabIndex = 9;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Export";
             // 
+            // exportSpriteWithAlphaMask
+            // 
+            this.exportSpriteWithAlphaMask.AutoSize = true;
+            this.exportSpriteWithAlphaMask.Checked = true;
+            this.exportSpriteWithAlphaMask.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.exportSpriteWithAlphaMask.Location = new System.Drawing.Point(6, 150);
+            this.exportSpriteWithAlphaMask.Name = "exportSpriteWithAlphaMask";
+            this.exportSpriteWithAlphaMask.Size = new System.Drawing.Size(205, 17);
+            this.exportSpriteWithAlphaMask.TabIndex = 11;
+            this.exportSpriteWithAlphaMask.Text = "Export sprites with alpha mask applied";
+            this.exportSpriteWithAlphaMask.UseVisualStyleBackColor = true;
+            // 
             // openAfterExport
             // 
             this.openAfterExport.AutoSize = true;
             this.openAfterExport.Checked = true;
             this.openAfterExport.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.openAfterExport.Location = new System.Drawing.Point(6, 160);
+            this.openAfterExport.Location = new System.Drawing.Point(6, 196);
             this.openAfterExport.Name = "openAfterExport";
-            this.openAfterExport.Size = new System.Drawing.Size(168, 16);
+            this.openAfterExport.Size = new System.Drawing.Size(137, 17);
             this.openAfterExport.TabIndex = 10;
             this.openAfterExport.Text = "Open folder after export";
             this.openAfterExport.UseVisualStyleBackColor = true;
@@ -125,9 +140,9 @@
             this.restoreExtensionName.AutoSize = true;
             this.restoreExtensionName.Checked = true;
             this.restoreExtensionName.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.restoreExtensionName.Location = new System.Drawing.Point(6, 58);
+            this.restoreExtensionName.Location = new System.Drawing.Point(6, 63);
             this.restoreExtensionName.Name = "restoreExtensionName";
-            this.restoreExtensionName.Size = new System.Drawing.Size(216, 16);
+            this.restoreExtensionName.Size = new System.Drawing.Size(190, 17);
             this.restoreExtensionName.TabIndex = 9;
             this.restoreExtensionName.Text = "Restore TextAsset extension name";
             this.restoreExtensionName.UseVisualStyleBackColor = true;
@@ -141,17 +156,17 @@
             "container path",
             "source file name",
             "do not group"});
-            this.assetGroupOptions.Location = new System.Drawing.Point(6, 32);
+            this.assetGroupOptions.Location = new System.Drawing.Point(6, 35);
             this.assetGroupOptions.Name = "assetGroupOptions";
-            this.assetGroupOptions.Size = new System.Drawing.Size(149, 20);
+            this.assetGroupOptions.Size = new System.Drawing.Size(149, 21);
             this.assetGroupOptions.TabIndex = 8;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(6, 17);
+            this.label6.Location = new System.Drawing.Point(6, 18);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(149, 12);
+            this.label6.Size = new System.Drawing.Size(127, 13);
             this.label6.TabIndex = 7;
             this.label6.Text = "Group exported assets by";
             // 
@@ -160,30 +175,42 @@
             this.convertAudio.AutoSize = true;
             this.convertAudio.Checked = true;
             this.convertAudio.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.convertAudio.Location = new System.Drawing.Point(6, 138);
+            this.convertAudio.Location = new System.Drawing.Point(6, 173);
             this.convertAudio.Name = "convertAudio";
-            this.convertAudio.Size = new System.Drawing.Size(198, 16);
+            this.convertAudio.Size = new System.Drawing.Size(179, 17);
             this.convertAudio.TabIndex = 6;
             this.convertAudio.Text = "Convert AudioClip to WAV(PCM)";
             this.convertAudio.UseVisualStyleBackColor = true;
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.towebp);
             this.panel1.Controls.Add(this.totga);
             this.panel1.Controls.Add(this.tojpg);
             this.panel1.Controls.Add(this.topng);
             this.panel1.Controls.Add(this.tobmp);
-            this.panel1.Location = new System.Drawing.Point(20, 102);
+            this.panel1.Location = new System.Drawing.Point(18, 111);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(202, 30);
+            this.panel1.Size = new System.Drawing.Size(260, 33);
             this.panel1.TabIndex = 5;
             // 
+            // towebp
+            // 
+            this.towebp.AutoSize = true;
+            this.towebp.Location = new System.Drawing.Point(201, 7);
+            this.towebp.Name = "towebp";
+            this.towebp.Size = new System.Drawing.Size(54, 17);
+            this.towebp.TabIndex = 5;
+            this.towebp.TabStop = true;
+            this.towebp.Text = "Webp";
+            this.towebp.UseVisualStyleBackColor = true;
+            // 
             // totga
             // 
             this.totga.AutoSize = true;
-            this.totga.Location = new System.Drawing.Point(150, 6);
+            this.totga.Location = new System.Drawing.Point(150, 7);
             this.totga.Name = "totga";
-            this.totga.Size = new System.Drawing.Size(41, 16);
+            this.totga.Size = new System.Drawing.Size(44, 17);
             this.totga.TabIndex = 2;
             this.totga.Text = "Tga";
             this.totga.UseVisualStyleBackColor = true;
@@ -191,9 +218,9 @@
             // tojpg
             // 
             this.tojpg.AutoSize = true;
-            this.tojpg.Location = new System.Drawing.Point(97, 6);
+            this.tojpg.Location = new System.Drawing.Point(97, 7);
             this.tojpg.Name = "tojpg";
-            this.tojpg.Size = new System.Drawing.Size(47, 16);
+            this.tojpg.Size = new System.Drawing.Size(48, 17);
             this.tojpg.TabIndex = 4;
             this.tojpg.Text = "Jpeg";
             this.tojpg.UseVisualStyleBackColor = true;
@@ -202,9 +229,9 @@
             // 
             this.topng.AutoSize = true;
             this.topng.Checked = true;
-            this.topng.Location = new System.Drawing.Point(50, 6);
+            this.topng.Location = new System.Drawing.Point(50, 7);
             this.topng.Name = "topng";
-            this.topng.Size = new System.Drawing.Size(41, 16);
+            this.topng.Size = new System.Drawing.Size(44, 17);
             this.topng.TabIndex = 3;
             this.topng.TabStop = true;
             this.topng.Text = "Png";
@@ -213,9 +240,9 @@
             // tobmp
             // 
             this.tobmp.AutoSize = true;
-            this.tobmp.Location = new System.Drawing.Point(3, 6);
+            this.tobmp.Location = new System.Drawing.Point(3, 7);
             this.tobmp.Name = "tobmp";
-            this.tobmp.Size = new System.Drawing.Size(41, 16);
+            this.tobmp.Size = new System.Drawing.Size(46, 17);
             this.tobmp.TabIndex = 2;
             this.tobmp.Text = "Bmp";
             this.tobmp.UseVisualStyleBackColor = true;
@@ -225,9 +252,9 @@
             this.converttexture.AutoSize = true;
             this.converttexture.Checked = true;
             this.converttexture.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.converttexture.Location = new System.Drawing.Point(6, 80);
+            this.converttexture.Location = new System.Drawing.Point(6, 87);
             this.converttexture.Name = "converttexture";
-            this.converttexture.Size = new System.Drawing.Size(126, 16);
+            this.converttexture.Size = new System.Drawing.Size(116, 17);
             this.converttexture.TabIndex = 1;
             this.converttexture.Text = "Convert Texture2D";
             this.converttexture.UseVisualStyleBackColor = true;
@@ -252,9 +279,9 @@
             this.groupBox2.Controls.Add(this.castToBone);
             this.groupBox2.Controls.Add(this.exportAllNodes);
             this.groupBox2.Controls.Add(this.eulerFilter);
-            this.groupBox2.Location = new System.Drawing.Point(250, 12);
+            this.groupBox2.Location = new System.Drawing.Point(313, 13);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(224, 334);
+            this.groupBox2.Size = new System.Drawing.Size(224, 362);
             this.groupBox2.TabIndex = 11;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Fbx";
@@ -263,9 +290,9 @@
             // 
             this.exportAllUvsAsDiffuseMaps.AccessibleDescription = "";
             this.exportAllUvsAsDiffuseMaps.AutoSize = true;
-            this.exportAllUvsAsDiffuseMaps.Location = new System.Drawing.Point(6, 171);
+            this.exportAllUvsAsDiffuseMaps.Location = new System.Drawing.Point(6, 185);
             this.exportAllUvsAsDiffuseMaps.Name = "exportAllUvsAsDiffuseMaps";
-            this.exportAllUvsAsDiffuseMaps.Size = new System.Drawing.Size(204, 16);
+            this.exportAllUvsAsDiffuseMaps.Size = new System.Drawing.Size(168, 17);
             this.exportAllUvsAsDiffuseMaps.TabIndex = 23;
             this.exportAllUvsAsDiffuseMaps.Text = "Export all UVs as diffuse maps";
             this.exportUvsTooltip.SetToolTip(this.exportAllUvsAsDiffuseMaps, "Unchecked: UV1 exported as normal map. Check this if your export is missing a UV " +
@@ -277,9 +304,9 @@
             this.exportBlendShape.AutoSize = true;
             this.exportBlendShape.Checked = true;
             this.exportBlendShape.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.exportBlendShape.Location = new System.Drawing.Point(6, 127);
+            this.exportBlendShape.Location = new System.Drawing.Point(6, 138);
             this.exportBlendShape.Name = "exportBlendShape";
-            this.exportBlendShape.Size = new System.Drawing.Size(126, 16);
+            this.exportBlendShape.Size = new System.Drawing.Size(114, 17);
             this.exportBlendShape.TabIndex = 22;
             this.exportBlendShape.Text = "Export blendshape";
             this.exportBlendShape.UseVisualStyleBackColor = true;
@@ -289,9 +316,9 @@
             this.exportAnimations.AutoSize = true;
             this.exportAnimations.Checked = true;
             this.exportAnimations.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.exportAnimations.Location = new System.Drawing.Point(6, 105);
+            this.exportAnimations.Location = new System.Drawing.Point(6, 114);
             this.exportAnimations.Name = "exportAnimations";
-            this.exportAnimations.Size = new System.Drawing.Size(126, 16);
+            this.exportAnimations.Size = new System.Drawing.Size(109, 17);
             this.exportAnimations.TabIndex = 21;
             this.exportAnimations.Text = "Export animations";
             this.exportAnimations.UseVisualStyleBackColor = true;
@@ -304,9 +331,9 @@
             0,
             0,
             131072});
-            this.scaleFactor.Location = new System.Drawing.Point(83, 224);
+            this.scaleFactor.Location = new System.Drawing.Point(83, 243);
             this.scaleFactor.Name = "scaleFactor";
-            this.scaleFactor.Size = new System.Drawing.Size(60, 21);
+            this.scaleFactor.Size = new System.Drawing.Size(60, 20);
             this.scaleFactor.TabIndex = 20;
             this.scaleFactor.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.scaleFactor.Value = new decimal(new int[] {
@@ -318,9 +345,9 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(6, 226);
+            this.label5.Location = new System.Drawing.Point(6, 245);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(71, 12);
+            this.label5.Size = new System.Drawing.Size(64, 13);
             this.label5.TabIndex = 19;
             this.label5.Text = "ScaleFactor";
             // 
@@ -331,17 +358,17 @@
             this.fbxFormat.Items.AddRange(new object[] {
             "Binary",
             "Ascii"});
-            this.fbxFormat.Location = new System.Drawing.Point(77, 254);
+            this.fbxFormat.Location = new System.Drawing.Point(77, 275);
             this.fbxFormat.Name = "fbxFormat";
-            this.fbxFormat.Size = new System.Drawing.Size(61, 20);
+            this.fbxFormat.Size = new System.Drawing.Size(61, 21);
             this.fbxFormat.TabIndex = 18;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(6, 258);
+            this.label4.Location = new System.Drawing.Point(6, 280);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(59, 12);
+            this.label4.Size = new System.Drawing.Size(59, 13);
             this.label4.TabIndex = 17;
             this.label4.Text = "FBXFormat";
             // 
@@ -356,25 +383,25 @@
             "7.3",
             "7.4",
             "7.5"});
-            this.fbxVersion.Location = new System.Drawing.Point(77, 284);
+            this.fbxVersion.Location = new System.Drawing.Point(77, 308);
             this.fbxVersion.Name = "fbxVersion";
-            this.fbxVersion.Size = new System.Drawing.Size(47, 20);
+            this.fbxVersion.Size = new System.Drawing.Size(47, 21);
             this.fbxVersion.TabIndex = 16;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(6, 287);
+            this.label3.Location = new System.Drawing.Point(6, 311);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(65, 12);
+            this.label3.Size = new System.Drawing.Size(62, 13);
             this.label3.TabIndex = 15;
             this.label3.Text = "FBXVersion";
             // 
             // boneSize
             // 
-            this.boneSize.Location = new System.Drawing.Point(65, 197);
+            this.boneSize.Location = new System.Drawing.Point(65, 213);
             this.boneSize.Name = "boneSize";
-            this.boneSize.Size = new System.Drawing.Size(46, 21);
+            this.boneSize.Size = new System.Drawing.Size(46, 20);
             this.boneSize.TabIndex = 11;
             this.boneSize.Value = new decimal(new int[] {
             10,
@@ -385,9 +412,9 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(6, 199);
+            this.label2.Location = new System.Drawing.Point(6, 216);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.Size = new System.Drawing.Size(52, 13);
             this.label2.TabIndex = 10;
             this.label2.Text = "BoneSize";
             // 
@@ -396,9 +423,9 @@
             this.exportSkins.AutoSize = true;
             this.exportSkins.Checked = true;
             this.exportSkins.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.exportSkins.Location = new System.Drawing.Point(6, 83);
+            this.exportSkins.Location = new System.Drawing.Point(6, 90);
             this.exportSkins.Name = "exportSkins";
-            this.exportSkins.Size = new System.Drawing.Size(96, 16);
+            this.exportSkins.Size = new System.Drawing.Size(83, 17);
             this.exportSkins.TabIndex = 8;
             this.exportSkins.Text = "Export skins";
             this.exportSkins.UseVisualStyleBackColor = true;
@@ -406,9 +433,9 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(26, 39);
+            this.label1.Location = new System.Drawing.Point(26, 42);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(95, 12);
+            this.label1.Size = new System.Drawing.Size(72, 13);
             this.label1.TabIndex = 7;
             this.label1.Text = "FilterPrecision";
             // 
@@ -420,9 +447,9 @@
             0,
             0,
             131072});
-            this.filterPrecision.Location = new System.Drawing.Point(127, 37);
+            this.filterPrecision.Location = new System.Drawing.Point(127, 40);
             this.filterPrecision.Name = "filterPrecision";
-            this.filterPrecision.Size = new System.Drawing.Size(51, 21);
+            this.filterPrecision.Size = new System.Drawing.Size(51, 20);
             this.filterPrecision.TabIndex = 6;
             this.filterPrecision.Value = new decimal(new int[] {
             25,
@@ -433,9 +460,9 @@
             // castToBone
             // 
             this.castToBone.AutoSize = true;
-            this.castToBone.Location = new System.Drawing.Point(6, 149);
+            this.castToBone.Location = new System.Drawing.Point(6, 161);
             this.castToBone.Name = "castToBone";
-            this.castToBone.Size = new System.Drawing.Size(156, 16);
+            this.castToBone.Size = new System.Drawing.Size(131, 17);
             this.castToBone.TabIndex = 5;
             this.castToBone.Text = "All nodes cast to bone";
             this.castToBone.UseVisualStyleBackColor = true;
@@ -445,9 +472,9 @@
             this.exportAllNodes.AutoSize = true;
             this.exportAllNodes.Checked = true;
             this.exportAllNodes.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.exportAllNodes.Location = new System.Drawing.Point(6, 61);
+            this.exportAllNodes.Location = new System.Drawing.Point(6, 66);
             this.exportAllNodes.Name = "exportAllNodes";
-            this.exportAllNodes.Size = new System.Drawing.Size(120, 16);
+            this.exportAllNodes.Size = new System.Drawing.Size(101, 17);
             this.exportAllNodes.TabIndex = 4;
             this.exportAllNodes.Text = "Export all nodes";
             this.exportAllNodes.UseVisualStyleBackColor = true;
@@ -457,9 +484,9 @@
             this.eulerFilter.AutoSize = true;
             this.eulerFilter.Checked = true;
             this.eulerFilter.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.eulerFilter.Location = new System.Drawing.Point(6, 20);
+            this.eulerFilter.Location = new System.Drawing.Point(6, 22);
             this.eulerFilter.Name = "eulerFilter";
-            this.eulerFilter.Size = new System.Drawing.Size(90, 16);
+            this.eulerFilter.Size = new System.Drawing.Size(72, 17);
             this.eulerFilter.TabIndex = 3;
             this.eulerFilter.Text = "EulerFilter";
             this.eulerFilter.UseVisualStyleBackColor = true;
@@ -467,19 +494,19 @@
             // ExportOptions
             // 
             this.AcceptButton = this.OKbutton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.Cancel;
-            this.ClientSize = new System.Drawing.Size(486, 384);
+            this.ClientSize = new System.Drawing.Size(549, 416);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.Cancel);
             this.Controls.Add(this.OKbutton);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "ExportOptions";
             this.ShowIcon = false;
-            this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Export options";
             this.TopMost = true;
@@ -531,5 +558,7 @@
         private System.Windows.Forms.CheckBox openAfterExport;
         private System.Windows.Forms.CheckBox exportAllUvsAsDiffuseMaps;
         private System.Windows.Forms.ToolTip exportUvsTooltip;
+        private System.Windows.Forms.CheckBox exportSpriteWithAlphaMask;
+        private System.Windows.Forms.RadioButton towebp;
     }
 }

AssetStudioGUI/ExportOptions.cs

@@ -12,6 +12,7 @@ namespace AssetStudioGUI
             assetGroupOptions.SelectedIndex = Properties.Settings.Default.assetGroupOption;
             restoreExtensionName.Checked = Properties.Settings.Default.restoreExtensionName;
             converttexture.Checked = Properties.Settings.Default.convertTexture;
+            exportSpriteWithAlphaMask.Checked = Properties.Settings.Default.exportSpriteWithMask;
             convertAudio.Checked = Properties.Settings.Default.convertAudio;
             var str = Properties.Settings.Default.convertType.ToString();
             foreach (Control c in panel1.Controls)
@@ -43,6 +44,7 @@ namespace AssetStudioGUI
             Properties.Settings.Default.assetGroupOption = assetGroupOptions.SelectedIndex;
             Properties.Settings.Default.restoreExtensionName = restoreExtensionName.Checked;
             Properties.Settings.Default.convertTexture = converttexture.Checked;
+            Properties.Settings.Default.exportSpriteWithMask = exportSpriteWithAlphaMask.Checked;
             Properties.Settings.Default.convertAudio = convertAudio.Checked;
             foreach (Control c in panel1.Controls)
             {
@@ -75,6 +77,5 @@ namespace AssetStudioGUI
             DialogResult = DialogResult.Cancel;
             Close();
         }
-
     }
 }

AssetStudioGUI/Exporter.cs

@@ -49,7 +49,7 @@ namespace AssetStudioGUI
             {
                 if (!TryExportFile(exportPath, item, ".wav", out var exportFullPath))
                     return false;
-                var buffer = converter.ConvertToWav();
+                var buffer = converter.ConvertToWav(m_AudioData);
                 if (buffer == null)
                     return false;
                 File.WriteAllBytes(exportFullPath, buffer);
@@ -231,9 +231,10 @@ namespace AssetStudioGUI
         public static bool ExportSprite(AssetItem item, string exportPath)
         {
             var type = Properties.Settings.Default.convertType;
+            var spriteMaskMode = Properties.Settings.Default.exportSpriteWithMask ? SpriteMaskMode.Export : SpriteMaskMode.Off;
             if (!TryExportFile(exportPath, item, "." + type.ToString().ToLower(), out var exportFullPath))
                 return false;
-            var image = ((Sprite)item.Asset).GetImage();
+            var image = ((Sprite)item.Asset).GetImage(spriteMaskMode: spriteMaskMode);
             if (image != null)
             {
                 using (image)

AssetStudioGUI/GUILogger.cs

@@ -6,7 +6,7 @@ namespace AssetStudioGUI
 {
     class GUILogger : ILogger
     {
-        public bool ShowErrorMessage = true;
+        public bool ShowErrorMessage = false;
         private Action<string> action;
 
         public GUILogger(Action<string> action)
@@ -14,21 +14,29 @@ namespace AssetStudioGUI
             this.action = action;
         }
 
-        public void Log(LoggerEvent loggerEvent, string message)
+        public void Log(LoggerEvent loggerEvent, string message, bool ignoreLevel)
         {
             switch (loggerEvent)
             {
                 case LoggerEvent.Error:
+                    MessageBox.Show(message, "Error");
+                    break;
+                case LoggerEvent.Warning:
                     if (ShowErrorMessage)
                     {
-                        MessageBox.Show(message);
+                        MessageBox.Show(message, "Warning");
                     }
+                    else
+                    {
+                        action("An error has occurred. Turn on \"Show all error messages\" to see details next time.");
+                    }
+                    break;
+                case LoggerEvent.Debug:
                     break;
                 default:
                     action(message);
                     break;
             }
-
         }
     }
 }

AssetStudioGUI/Properties/Settings.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ namespace AssetStudioGUI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -274,5 +274,17 @@ namespace AssetStudioGUI.Properties {
                 this["exportAllUvsAsDiffuseMaps"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool exportSpriteWithMask {
+            get {
+                return ((bool)(this["exportSpriteWithMask"]));
+            }
+            set {
+                this["exportSpriteWithMask"] = value;
+            }
+        }
     }
 }

AssetStudioGUI/Properties/Settings.settings

@@ -65,5 +65,8 @@
     <Setting Name="exportAllUvsAsDiffuseMaps" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="exportSpriteWithMask" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

AssetStudioGUI/Studio.cs

@@ -84,8 +84,8 @@ namespace AssetStudioGUI
 
         private static int ExtractBundleFile(FileReader reader, string savePath)
         {
-            StatusStripUpdate($"Decompressing {reader.FileName} ...");
-            var bundleFile = new BundleFile(reader);
+            Logger.Info($"Decompressing {reader.FileName} ...");
+            var bundleFile = new BundleFile(reader, assetsManager.SpecifyUnityVersion);
             reader.Dispose();
             if (bundleFile.fileList.Length > 0)
             {
@@ -97,7 +97,7 @@ namespace AssetStudioGUI
 
         private static int ExtractWebDataFile(FileReader reader, string savePath)
         {
-            StatusStripUpdate($"Decompressing {reader.FileName} ...");
+            Logger.Info($"Decompressing {reader.FileName} ...");
             var webFile = new WebFile(reader);
             reader.Dispose();
             if (webFile.fileList.Length > 0)
@@ -134,7 +134,7 @@ namespace AssetStudioGUI
 
         public static (string, List<TreeNode>) BuildAssetData()
         {
-            StatusStripUpdate("Building asset list...");
+            Logger.Info("Building asset list...");
 
             string productName = null;
             var objectCount = assetsManager.assetsFileList.Sum(x => x.Objects.Count);
@@ -256,7 +256,7 @@ namespace AssetStudioGUI
 
             visibleAssets = exportableAssets;
 
-            StatusStripUpdate("Building tree structure...");
+            Logger.Info("Building tree structure...");
 
             var treeNodeCollection = new List<TreeNode>();
             var treeNodeDictionary = new Dictionary<GameObject, GameObjectTreeNode>();
@@ -414,7 +414,7 @@ namespace AssetStudioGUI
                             break;
                     }
                     exportPath += Path.DirectorySeparatorChar;
-                    StatusStripUpdate($"[{exportedCount}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}");
+                    Logger.Info($"[{exportedCount}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}");
                     try
                     {
                         switch (exportType)
@@ -441,7 +441,7 @@ namespace AssetStudioGUI
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show($"Export {asset.Type}:{asset.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}");
+                        Logger.Error($"Export {asset.Type}:{asset.Text} error", ex);
                     }
 
                     Progress.Report(++i, toExportCount);
@@ -454,7 +454,7 @@ namespace AssetStudioGUI
                     statusText += $" {toExportCount - exportedCount} assets skipped (not extractable or files already exist)";
                 }
 
-                StatusStripUpdate(statusText);
+                Logger.Info(statusText);
 
                 if (Properties.Settings.Default.openAfterExport && exportedCount > 0)
                 {
@@ -499,7 +499,7 @@ namespace AssetStudioGUI
 
                 var statusText = $"Finished exporting asset list with {toExportAssets.Count()} items.";
 
-                StatusStripUpdate(statusText);
+                Logger.Info(statusText);
 
                 if (Properties.Settings.Default.openAfterExport && toExportAssets.Count() > 0)
                 {
@@ -547,25 +547,25 @@ namespace AssetStudioGUI
                         }
                         Directory.CreateDirectory(targetPath);
                         //导出FBX
-                        StatusStripUpdate($"Exporting {filename}.fbx");
+                        Logger.Info($"Exporting {filename}.fbx");
                         try
                         {
                             ExportGameObject(j.gameObject, targetPath);
                         }
                         catch (Exception ex)
                         {
-                            MessageBox.Show($"Export GameObject:{j.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}");
+                            Logger.Error($"Export GameObject:{j.Text} error", ex);
                         }
 
                         Progress.Report(++k, count);
-                        StatusStripUpdate($"Finished exporting {filename}.fbx");
+                        Logger.Info($"Finished exporting {filename}.fbx");
                     }
                 }
                 if (Properties.Settings.Default.openAfterExport)
                 {
                     OpenFolderInExplorer(savePath);
                 }
-                StatusStripUpdate("Finished");
+                Logger.Info("Finished");
             });
         }
 
@@ -583,7 +583,7 @@ namespace AssetStudioGUI
             ThreadPool.QueueUserWorkItem(state =>
             {
                 Progress.Reset();
-                StatusStripUpdate($"Exporting {animator.Text}");
+                Logger.Info($"Exporting {animator.Text}");
                 try
                 {
                     ExportAnimator(animator, exportPath, animationList);
@@ -592,12 +592,12 @@ namespace AssetStudioGUI
                         OpenFolderInExplorer(exportPath);
                     }
                     Progress.Report(1, 1);
-                    StatusStripUpdate($"Finished exporting {animator.Text}");
+                    Logger.Info($"Finished exporting {animator.Text}");
                 }
                 catch (Exception ex)
                 {
-                    MessageBox.Show($"Export Animator:{animator.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}");
-                    StatusStripUpdate("Error in export");
+                    Logger.Error($"Export Animator:{animator.Text} error", ex);
+                    Logger.Info("Error in export");
                 }
             });
         }
@@ -615,16 +615,16 @@ namespace AssetStudioGUI
                     Progress.Reset();
                     foreach (var gameObject in gameObjects)
                     {
-                        StatusStripUpdate($"Exporting {gameObject.m_Name}");
+                        Logger.Info($"Exporting {gameObject.m_Name}");
                         try
                         {
                             ExportGameObject(gameObject, exportPath, animationList);
-                            StatusStripUpdate($"Finished exporting {gameObject.m_Name}");
+                            Logger.Info($"Finished exporting {gameObject.m_Name}");
                         }
                         catch (Exception ex)
                         {
-                            MessageBox.Show($"Export GameObject:{gameObject.m_Name} error\r\n{ex.Message}\r\n{ex.StackTrace}");
-                            StatusStripUpdate("Error in export");
+                            Logger.Error($"Export GameObject:{gameObject.m_Name} error", ex);
+                            Logger.Info("Error in export");
                         }
 
                         Progress.Report(++i, count);
@@ -636,7 +636,7 @@ namespace AssetStudioGUI
                 }
                 else
                 {
-                    StatusStripUpdate("No Object selected for export.");
+                    Logger.Info("No Object selected for export.");
                 }
             });
         }
@@ -647,17 +647,17 @@ namespace AssetStudioGUI
             {
                 var name = Path.GetFileName(exportPath);
                 Progress.Reset();
-                StatusStripUpdate($"Exporting {name}");
+                Logger.Info($"Exporting {name}");
                 try
                 {
                     ExportGameObjectMerge(gameObjects, exportPath, animationList);
                     Progress.Report(1, 1);
-                    StatusStripUpdate($"Finished exporting {name}");
+                    Logger.Info($"Finished exporting {name}");
                 }
                 catch (Exception ex)
                 {
-                    MessageBox.Show($"Export Model:{name} error\r\n{ex.Message}\r\n{ex.StackTrace}");
-                    StatusStripUpdate("Error in export");
+                    Logger.Error($"Export Model:{name} error", ex);
+                    Logger.Info("Error in export");
                 }
                 if (Properties.Settings.Default.openAfterExport)
                 {

AssetStudioUtility/AssetStudioUtility.csproj

@@ -1,24 +1,37 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;net5.0;net6.0</TargetFrameworks>
-    <Version>0.16.0.0</Version>
-    <AssemblyVersion>0.16.0.0</AssemblyVersion>
-    <FileVersion>0.16.0.0</FileVersion>
-    <Copyright>Copyright © Perfare 2018-2022</Copyright>
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>net472;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+        <Version>0.16.48.1</Version>
+        <Copyright>Copyright © Perfare 2018-2022</Copyright>
+        <DebugType>embedded</DebugType>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.11.3" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Mono.Cecil" Version="0.11.3" />
+        <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\AssetStudio.PInvoke\AssetStudio.PInvoke.csproj" />
-    <ProjectReference Include="..\AssetStudioFBXWrapper\AssetStudioFBXWrapper.csproj" />
-    <ProjectReference Include="..\AssetStudio\AssetStudio.csproj" />
-    <ProjectReference Include="..\Texture2DDecoderWrapper\Texture2DDecoderWrapper.csproj" />
-  </ItemGroup>
+    <ItemGroup Condition=" !$(TargetFramework.Contains('windows')) ">
+        <PackageReference Include="Kyaru.Texture2DDecoder.Linux" Version="0.1.0" />
+        <PackageReference Include="Kyaru.Texture2DDecoder.macOS" Version="0.1.0" />
+    </ItemGroup>
+    
+    <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
+        <PackageReference Include="Kyaru.Texture2DDecoder.Windows" Version="0.1.0" />
+        <PackageReference Include="Kyaru.Texture2DDecoder">
+            <Version>0.17.0</Version>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\AssetStudio.PInvoke\AssetStudio.PInvoke.csproj" />
+        <ProjectReference Include="..\AssetStudioFBXWrapper\AssetStudioFBXWrapper.csproj" />
+        <ProjectReference Include="..\AssetStudio\AssetStudio.csproj" />
+    </ItemGroup>
+    
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
+        <ProjectReference Include="..\Texture2DDecoderWrapper\Texture2DDecoderWrapper.csproj" />
+    </ItemGroup>
 
 </Project>

AssetStudioUtility/AudioClipConverter.cs

@@ -14,11 +14,8 @@ namespace AssetStudio
             m_AudioClip = audioClip;
         }
 
-        public byte[] ConvertToWav()
+        public byte[] ConvertToWav(byte[] m_AudioData)
         {
-            var m_AudioData = m_AudioClip.m_AudioData.GetData();
-            if (m_AudioData == null || m_AudioData.Length == 0)
-                return null;
             var exinfo = new CREATESOUNDEXINFO();
             var result = Factory.System_Create(out var system);
             if (result != RESULT.OK)
@@ -54,9 +51,14 @@ namespace AssetStudio
 
         public byte[] SoundToWav(Sound sound)
         {
-            var result = sound.getFormat(out _, out _, out int channels, out int bits);
+            Logger.Debug($"[Fmod] Detecting sound format..\n");
+            var result = sound.getFormat(out SOUND_TYPE soundType, out SOUND_FORMAT soundFormat, out int channels, out int bits);
             if (result != RESULT.OK)
                 return null;
+            Logger.Debug($"Detected sound type: {soundType}\n" +
+                $"Detected sound format: {soundFormat}\n" +
+                $"Detected channels: {channels}\n" +
+                $"Detected bit depth: {bits}");
             result = sound.getDefaults(out var frequency, out _);
             if (result != RESULT.OK)
                 return null;

AssetStudioUtility/FMOD Studio API/fmod_errors.cs

@@ -1,10 +1,13 @@
-/* =================================================================================================== */
-/* FMOD Studio - Error string header file. Copyright (c), Firelight Technologies Pty, Ltd. 2004-2016.  */
-/*                                                                                                     */
-/* Use this header if you want to store or display a string version / english explanation of           */
-/* the FMOD error codes.                                                                               */
-/*                                                                                                     */
-/* =================================================================================================== */
+/* ==============================================================================================  */
+/* FMOD Core / Studio API - Error string header file.                                              */
+/* Copyright (c), Firelight Technologies Pty, Ltd. 2004-2020.                                      */
+/*                                                                                                 */
+/* Use this header if you want to store or display a string version / english explanation          */
+/* of the FMOD error codes.                                                                        */
+/*                                                                                                 */
+/* For more detail visit:                                                                          */
+/* https://fmod.com/resources/documentation-api?version=2.0&page=core-api-common.html#fmod_result  */
+/* =============================================================================================== */
 
 namespace FMOD
 {

AssetStudioUtility/ImageExtensions.cs

@@ -1,9 +1,8 @@
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.Formats.Tga;
-using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Formats.Webp;
 using System.IO;
-using System.Runtime.InteropServices;
 
 namespace AssetStudio
 {
@@ -33,6 +32,13 @@ namespace AssetStudio
                         Compression = TgaCompression.None
                     });
                     break;
+                case ImageFormat.Webp:
+                    image.Save(stream, new WebpEncoder
+                    {
+                        FileFormat = WebpFileFormatType.Lossless,
+                        Quality = 50
+                    });
+                    break;
             }
         }
 
@@ -42,14 +48,5 @@ namespace AssetStudio
             image.WriteToStream(stream, imageFormat);
             return stream;
         }
-
-        public static byte[] ConvertToBytes<TPixel>(this Image<TPixel> image) where TPixel : unmanaged, IPixel<TPixel>
-        {
-            if (image.TryGetSinglePixelSpan(out var pixelSpan))
-            {
-                return MemoryMarshal.AsBytes(pixelSpan).ToArray();
-            }
-            return null;
-        }
     }
 }

AssetStudioUtility/ImageFormat.cs

@@ -5,6 +5,7 @@
         Jpeg,
         Png,
         Bmp,
-        Tga
+        Tga,
+        Webp,
     }
 }

AssetStudioUtility/SpriteHelper.cs

@@ -11,9 +11,17 @@ using System.Numerics;
 
 namespace AssetStudio
 {
+    public enum SpriteMaskMode
+    {
+        Off,
+        On,
+        MaskOnly,
+        Export
+    }
+
     public static class SpriteHelper
     {
-        public static Image<Bgra32> GetImage(this Sprite m_Sprite)
+        public static Image<Bgra32> GetImage(this Sprite m_Sprite, SpriteMaskMode spriteMaskMode = SpriteMaskMode.On)
         {
             if (m_Sprite.m_SpriteAtlas != null && m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlas))
             {
@@ -24,7 +32,25 @@ namespace AssetStudio
             }
             else
             {
-                if (m_Sprite.m_RD.texture.TryGet(out var m_Texture2D))
+                if (m_Sprite.m_RD.texture.TryGet(out var m_Texture2D) && m_Sprite.m_RD.alphaTexture.TryGet(out var m_AlphaTexture2D) && spriteMaskMode != SpriteMaskMode.Off)
+                {
+                    var tex = CutImage(m_Sprite, m_Texture2D, m_Sprite.m_RD.textureRect, m_Sprite.m_RD.textureRectOffset, m_Sprite.m_RD.downscaleMultiplier, m_Sprite.m_RD.settingsRaw);
+                    var alphaTex = CutImage(m_Sprite, m_AlphaTexture2D, m_Sprite.m_RD.textureRect, m_Sprite.m_RD.textureRectOffset, m_Sprite.m_RD.downscaleMultiplier, m_Sprite.m_RD.settingsRaw);
+
+                    switch (spriteMaskMode)
+                    {
+                        case SpriteMaskMode.On:
+                            tex.ApplyRGBMask(alphaTex, isPreview: true);
+                            return tex;
+                        case SpriteMaskMode.Export:
+                            tex.ApplyRGBMask(alphaTex);
+                            return tex;
+                        case SpriteMaskMode.MaskOnly:
+                            tex.Dispose();
+                            return alphaTex;
+                    }
+                }
+                else if (m_Sprite.m_RD.texture.TryGet(out m_Texture2D))
                 {
                     return CutImage(m_Sprite, m_Texture2D, m_Sprite.m_RD.textureRect, m_Sprite.m_RD.textureRectOffset, m_Sprite.m_RD.downscaleMultiplier, m_Sprite.m_RD.settingsRaw);
                 }
@@ -32,6 +58,32 @@ namespace AssetStudio
             return null;
         }
 
+        private static void ApplyRGBMask(this Image<Bgra32> tex, Image<Bgra32> texMask, bool isPreview = false)
+        {
+            using (texMask)
+            {
+                if (tex.Width != texMask.Width || tex.Height != texMask.Height)
+                {
+                    var resampler = isPreview ? KnownResamplers.NearestNeighbor : KnownResamplers.Bicubic;
+                    texMask.Mutate(x => x.Resize(tex.Width, tex.Height, resampler));
+                }
+
+                tex.ProcessPixelRows(texMask, (sourceTex, targetTexMask) =>
+                {
+                    for (int y = 0; y < texMask.Height; y++)
+                    {
+                        var texRow = sourceTex.GetRowSpan(y);
+                        var maskRow = targetTexMask.GetRowSpan(y);
+                        for (int x = 0; x < maskRow.Length; x++)
+                        {
+                            var grayscale = (byte)((maskRow[x].R + maskRow[x].G + maskRow[x].B) / 3);
+                            texRow[x].A = grayscale;
+                        }
+                    }
+                });
+            }
+        }
+
         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);
@@ -96,8 +148,8 @@ namespace AssetStudio
                             using (var mask = new Image<Bgra32>(rect.Width, rect.Height, SixLabors.ImageSharp.Color.Black))
                             {
                                 mask.Mutate(x => x.Fill(options, SixLabors.ImageSharp.Color.Red, path));
-                                var bursh = new ImageBrush(mask);
-                                spriteImage.Mutate(x => x.Fill(graphicsOptions, bursh));
+                                var brush = new ImageBrush(mask);
+                                spriteImage.Mutate(x => x.Fill(options, brush));
                                 spriteImage.Mutate(x => x.Flip(FlipMode.Vertical));
                                 return spriteImage;
                             }

AssetStudioUtility/Texture2DConverter.cs

@@ -219,9 +219,7 @@ namespace AssetStudio
             {
                 for (var i = 0; i < reader.Size / 2; i++)
                 {
-                    var b = image_data[i * 2];
-                    image_data[i * 2] = image_data[i * 2 + 1];
-                    image_data[i * 2 + 1] = b;
+                    (image_data[i * 2 + 1], image_data[i * 2]) = (image_data[i * 2], image_data[i * 2 + 1]);
                 }
             }
         }

Texture2DDecoderNative/CMakeLists.txt

@@ -0,0 +1,52 @@
+# Set the minimum version of CMake that can be used
+cmake_minimum_required (VERSION 3.8)
+
+# Set the project name
+project("Texture2DDecoderNative")
+
+# Set the C++ standard to C++ 14
+set(CMAKE_CXX_STANDARD 14)
+
+# Add definitions from the project file
+# 'Release|x64'
+# <PreprocessorDefinitions>_T2D_DLL;NDEBUG;TEXTURE2DDECODERNATIVE_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+add_compile_definitions(_T2D_DLL)
+add_compile_definitions(NDEBUG)
+add_compile_definitions(TEXTURE2DDECODERNATIVE_EXPORTS)
+
+# Add the given directories to those the compiler uses to search for include files
+include_directories(.)
+include_directories(crunch)
+include_directories(fp16)
+include_directories(unitycrunch)
+
+# Generate the shared library from the library sources
+add_library(Texture2DDecoderNative SHARED
+        crunch/crn_decomp.h
+        crunch/crnlib.h
+        fp16/bitcasts.h
+        fp16/fp16.h
+        unitycrunch/crn_decomp.h
+        unitycrunch/crn_defs.h
+        unitycrunch/crnlib.h
+        astc.cpp
+        astc.h
+        atc.cpp
+        atc.h
+        bcn.cpp
+        bcn.h
+        bool32_t.h
+        color.h
+        crunch.cpp
+        crunch.h
+        dllexport.h
+        dllmain.cpp
+        endianness.h
+        etc.cpp
+        etc.h
+        fp16.h
+        pvrtc.cpp
+        pvrtc.h
+        resource.h
+        unitycrunch.cpp
+        unitycrunch.h)

Texture2DDecoderNative/Texture2DDecoderNative.vcxproj

@@ -154,6 +154,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -189,6 +190,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

Texture2DDecoderNative/crunch.cpp

@@ -21,14 +21,43 @@ bool crunch_unpack_level(const uint8_t* data, uint32_t data_size, uint32_t level
 	const crn_uint32 blocks_x = std::max(1U, (width + 3) >> 2);
 	const crn_uint32 blocks_y = std::max(1U, (height + 3) >> 2);
 	const crn_uint32 row_pitch = blocks_x * crnd::crnd_get_bytes_per_dxt_block(tex_info.m_format);
-	const crn_uint32 total_face_size = row_pitch * blocks_y;
-	*ret = new uint8_t[total_face_size];
-	*ret_size = total_face_size;
-	if (!crnd::crnd_unpack_level(pContext, ret, total_face_size, row_pitch, level_index))
+	const crn_uint32 face_count = tex_info.m_faces;
+	const crn_uint32 face_size = row_pitch * blocks_y;
+	const crn_uint32 total_face_size = face_size * face_count;
+
+	void* out_ptrs[cCRNMaxFaces]{};
+	if (face_count == 1)
+	{
+		out_ptrs[0] = new uint8_t[face_size]{};
+		*ret_size = face_size;
+	}
+	else if (1 < face_count < 7)
+	{
+		for (uint8_t i = 0; i < face_count; i++)
+		{
+			out_ptrs[i] = new uint8_t[face_size]{};
+		}
+		*ret_size = total_face_size;
+	}
+	else
+	{
+		return false;
+	}
+
+	if (!crnd::crnd_unpack_level(pContext, out_ptrs, face_size, row_pitch, level_index))
 	{
 		crnd::crnd_unpack_end(pContext);
 		return false;
 	}
+
+	uint8_t* buff = new uint8_t[total_face_size]{};
+	for (uint8_t i = 0; i < face_count; i++)
+	{
+		memcpy(buff + (face_size * i), out_ptrs[i], face_size);
+		free(out_ptrs[i]);
+	}
+	*ret = buff;
+
 	crnd::crnd_unpack_end(pContext);
 	return true;
 }

Texture2DDecoderNative/crunch/crn_decomp.h

@@ -316,9 +316,16 @@ namespace crnd
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef _WIN32
-#include <memory.h>
-#else
-#include <malloc.h>
+    #include <memory.h>
+    #define MALLOC_SIZE _msize
+#elif __APPLE__
+    #include <cstring>
+    #include <malloc/malloc.h>
+    #define MALLOC_SIZE malloc_size
+#else // Linux
+    #include <cstring>
+    #include <malloc.h>
+    #define MALLOC_SIZE malloc_usable_size
 #endif
 #include <stdarg.h>
 #include <new> // needed for placement new, _msize, _expand
@@ -2424,11 +2431,7 @@ namespace crnd
 
          if (pActual_size)
          {
-#ifdef _WIN32
-            *pActual_size = p_new ? ::_msize(p_new) : 0;
-#else
-            *pActual_size = p_new ? malloc_usable_size(p_new) : 0;
-#endif
+            *pActual_size = p_new ? MALLOC_SIZE(p_new) : 0;
          }
       }
       else if (!size)
@@ -2460,11 +2463,7 @@ namespace crnd
 
          if (pActual_size)
          {
-#ifdef _WIN32
-            *pActual_size = ::_msize(p_final_block);
-#else
-            *pActual_size = ::malloc_usable_size(p_final_block);
-#endif
+            *pActual_size = ::MALLOC_SIZE(p_final_block);
          }
       }
 
@@ -2474,11 +2473,7 @@ namespace crnd
    static size_t crnd_default_msize(void* p, void* pUser_data)
    {
       pUser_data;
-#ifdef _WIN32
-      return p ? _msize(p) : 0;
-#else
-      return p ? malloc_usable_size(p) : 0;
-#endif
+      return p ? MALLOC_SIZE(p) : 0;
    }
 
    static crnd_realloc_func        g_pRealloc = crnd_default_realloc;

Texture2DDecoderNative/unitycrunch.cpp

@@ -21,14 +21,43 @@ bool unity_crunch_unpack_level(const uint8_t* data, uint32_t data_size, uint32_t
 	const crn_uint32 blocks_x = std::max(1U, (width + 3) >> 2);
 	const crn_uint32 blocks_y = std::max(1U, (height + 3) >> 2);
 	const crn_uint32 row_pitch = blocks_x * unitycrnd::crnd_get_bytes_per_dxt_block(tex_info.m_format);
-	const crn_uint32 total_face_size = row_pitch * blocks_y;
-	*ret = new uint8_t[total_face_size];
-	*ret_size = total_face_size;
-	if (!unitycrnd::crnd_unpack_level(pContext, ret, total_face_size, row_pitch, level_index))
+	const crn_uint32 face_count = tex_info.m_faces;
+	const crn_uint32 face_size = row_pitch * blocks_y;
+	const crn_uint32 total_face_size = face_size * face_count;
+
+	void* out_ptrs[cCRNMaxFaces]{};
+	if (face_count == 1) 
+	{
+		out_ptrs[0] = new uint8_t[face_size]{};
+		*ret_size = face_size;
+	}
+	else if (1 < face_count < 7) 
+	{
+		for (uint8_t i = 0; i < face_count; i++) 
+		{
+			out_ptrs[i] = new uint8_t[face_size]{};
+		}
+		*ret_size = total_face_size;
+	}
+	else 
+	{
+		return false;
+	}
+
+	if (!unitycrnd::crnd_unpack_level(pContext, out_ptrs, face_size, row_pitch, level_index))
 	{
 		unitycrnd::crnd_unpack_end(pContext);
 		return false;
 	}
+
+	uint8_t* buff = new uint8_t[total_face_size]{};
+	for (uint8_t i = 0; i < face_count; i++) 
+	{
+		memcpy(buff + (face_size * i), out_ptrs[i], face_size);
+		free(out_ptrs[i]);
+	}
+	*ret = buff;
+
 	unitycrnd::crnd_unpack_end(pContext);
 	return true;
 }

Texture2DDecoderNative/unitycrunch/crn_decomp.h

@@ -18,9 +18,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef _WIN32
-#include <memory.h>
-#else
-#include <malloc.h>
+    #include <memory.h>
+    #define MALLOC_SIZE _msize
+#elif __APPLE__
+    #include <cstring>
+    #include <malloc/malloc.h>
+    #define MALLOC_SIZE malloc_size
+#else // Linux
+    #include <cstring>
+    #include <malloc.h>
+    #define MALLOC_SIZE malloc_usable_size
 #endif
 #include <stdarg.h>
 #include <new>  // needed for placement new, _msize, _expand
@@ -1923,11 +1930,7 @@ static void* crnd_default_realloc(void* p, size_t size, size_t* pActual_size, bo
     p_new = ::malloc(size);
 
     if (pActual_size) {
-#ifdef _WIN32
-      *pActual_size = p_new ? ::_msize(p_new) : 0;
-#else
-      *pActual_size = p_new ? malloc_usable_size(p_new) : 0;
-#endif
+      *pActual_size = p_new ? MALLOC_SIZE(p_new) : 0;
     }
   } else if (!size) {
     ::free(p);
@@ -1953,11 +1956,7 @@ static void* crnd_default_realloc(void* p, size_t size, size_t* pActual_size, bo
     }
 
     if (pActual_size) {
-#ifdef _WIN32
-      *pActual_size = ::_msize(p_final_block);
-#else
-      *pActual_size = ::malloc_usable_size(p_final_block);
-#endif
+      *pActual_size = ::MALLOC_SIZE(p_final_block);
     }
   }
 
@@ -1966,11 +1965,7 @@ static void* crnd_default_realloc(void* p, size_t size, size_t* pActual_size, bo
 
 static size_t crnd_default_msize(void* p, void* pUser_data) {
   pUser_data;
-#ifdef _WIN32
-  return p ? _msize(p) : 0;
-#else
-  return p ? malloc_usable_size(p) : 0;
-#endif
+  return p ? MALLOC_SIZE(p) : 0;
 }
 
 static crnd_realloc_func g_pRealloc = crnd_default_realloc;

Texture2DDecoderWrapper/Texture2DDecoderWrapper.csproj

@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>0.16.0.0</Version>
-    <AssemblyVersion>0.16.0.0</AssemblyVersion>
-    <FileVersion>0.16.0.0</FileVersion>
+    <Version>0.16.48.1</Version>
     <Copyright>Copyright © Perfare 2020-2022; Copyright © hozuki 2020</Copyright>
     <DebugType>embedded</DebugType>
   </PropertyGroup>

Texture2DDecoderWrapper/TextureDecoder.cs

@@ -1,16 +1,20 @@
 using System;
 using System.Runtime.InteropServices;
+
+#if NETFRAMEWORK
 using AssetStudio.PInvoke;
+#endif
 
 namespace Texture2DDecoder
 {
     public static unsafe partial class TextureDecoder
     {
-
+#if NETFRAMEWORK
         static TextureDecoder()
         {
             DllLoader.PreloadDll(T2DDll.DllName);
         }
+#endif
 
         public static bool DecodeDXT1(byte[] data, int width, int height, byte[] image)
         {