support 2022.1

Fixed #944
Fixed #923

.github/workflows/build.yml

@@ -0,0 +1,57 @@
+name: AssetStudioBuild
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/setup-msbuild@v1.1
+      
+      - name: Download FBX SDK
+        run: |
+          md fbx
+          cd fbx
+          Invoke-WebRequest "https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-2-1/fbx202021_fbxsdk_vs2019_win.exe" -OutFile "fbxsdk.exe"
+          Start-Process -FilePath "fbxsdk.exe" /S -Wait
+          Invoke-WebRequest "https://damassets.autodesk.net/content/dam/autodesk/www/adn/fbx/2020-2-1/fbx202021_fbxsdk_vs2019_pdbs.exe" -OutFile "fbxpdb.exe"
+          Start-Process -FilePath "fbxpdb.exe" /S -Wait
+          cd ..
+
+      - name: Nuget Restore
+        run: nuget restore
+      
+      - name: Build .Net472
+        run: msbuild /p:Configuration=Release /p:TargetFramework=net472 /verbosity:minimal
+
+      - name: Build .Net5
+        run: msbuild /t:AssetStudioGUI:publish /p:Configuration=Release /p:TargetFramework=net5.0-windows /p:SelfContained=false /verbosity:minimal
+
+      - name: Build .Net6
+        run: msbuild /t:AssetStudioGUI:publish /p:Configuration=Release /p:TargetFramework=net6.0-windows /p:SelfContained=false /verbosity:minimal
+
+      - name: Upload .Net472 Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: AssetStudio.net472
+          path: AssetStudioGUI/bin/Release/net472
+
+      - name: Upload .Net5 Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: AssetStudio.net5
+          path: AssetStudioGUI/bin/Release/net5.0-windows/publish
+
+      - name: Upload .Net6 Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: AssetStudio.net6
+          path: AssetStudioGUI/bin/Release/net6.0-windows/publish

AssetStudio.PInvoke/AssetStudio.PInvoke.csproj

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

AssetStudio.PInvoke/DllLoader.cs

@@ -0,0 +1,124 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace AssetStudio.PInvoke
+{
+    public static class DllLoader
+    {
+
+        public static void PreloadDll(string dllName)
+        {
+            var dllDir = GetDirectedDllDirectory();
+
+            // 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);
+            }
+        }
+
+        private static string GetDirectedDllDirectory()
+        {
+            var localPath = Process.GetCurrentProcess().MainModule.FileName;
+            var localDir = Path.GetDirectoryName(localPath);
+
+            var subDir = Environment.Is64BitProcess ? "x64" : "x86";
+
+            var directedDllDir = Path.Combine(localDir, subDir);
+
+            return directedDllDir;
+        }
+
+        private static class Win32
+        {
+
+            internal static void LoadDll(string dllDir, string dllName)
+            {
+                var dllFileName = $"{dllName}.dll";
+                var directedDllPath = Path.Combine(dllDir, dllFileName);
+
+                // Specify SEARCH_DLL_LOAD_DIR to load dependent libraries located in the same platform-specific directory.
+                var hLibrary = LoadLibraryEx(directedDllPath, IntPtr.Zero, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
+
+                if (hLibrary == IntPtr.Zero)
+                {
+                    var errorCode = Marshal.GetLastWin32Error();
+                    var exception = new Win32Exception(errorCode);
+
+                    throw new DllNotFoundException(exception.Message, exception);
+                }
+            }
+
+            // HMODULE LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
+            // HMODULE LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
+            [DllImport("kernel32.dll", SetLastError = true)]
+            private static extern IntPtr LoadLibraryEx(string lpLibFileName, IntPtr hFile, uint dwFlags);
+
+            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;
+
+        }
+
+    }
+}

AssetStudio.PInvoke/Utf8StringHandle.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using Microsoft.Win32.SafeHandles;
+
+namespace AssetStudio.PInvoke
+{
+    // Generally the technique from Steamworks.NET
+    public class Utf8StringHandle : SafeHandleZeroOrMinusOneIsInvalid
+    {
+
+        static Utf8StringHandle()
+        {
+            Utf8 = new UTF8Encoding(false);
+        }
+
+        public Utf8StringHandle(string str)
+            : base(true)
+        {
+            IntPtr buffer;
+
+            if (str == null)
+            {
+                buffer = IntPtr.Zero;
+            }
+            else
+            {
+                if (str.Length == 0)
+                {
+                    buffer = Marshal.AllocHGlobal(1);
+
+                    unsafe
+                    {
+                        *(byte*)buffer = 0;
+                    }
+                }
+                else
+                {
+                    var strlen = Utf8.GetByteCount(str);
+                    var strBuffer = new byte[strlen + 1];
+
+                    Utf8.GetBytes(str, 0, str.Length, strBuffer, 0);
+
+                    buffer = Marshal.AllocHGlobal(strBuffer.Length);
+
+                    Marshal.Copy(strBuffer, 0, buffer, strBuffer.Length);
+                }
+            }
+
+            SetHandle(buffer);
+        }
+
+        public static string ReadUtf8StringFromPointer(IntPtr lpstr)
+        {
+            if (lpstr == IntPtr.Zero || lpstr == new IntPtr(-1))
+            {
+                return null;
+            }
+
+            var byteCount = 0;
+
+            unsafe
+            {
+                var p = (byte*)lpstr.ToPointer();
+
+                while (*p != 0)
+                {
+                    byteCount += 1;
+                    p += 1;
+                }
+            }
+
+            if (byteCount == 0)
+            {
+                return string.Empty;
+            }
+
+            var strBuffer = new byte[byteCount];
+
+            Marshal.Copy(lpstr, strBuffer, 0, byteCount);
+
+            var str = Utf8.GetString(strBuffer);
+
+            return str;
+        }
+
+        protected override bool ReleaseHandle()
+        {
+            if (!IsInvalid)
+            {
+                Marshal.FreeHGlobal(handle);
+            }
+
+            return true;
+        }
+
+        private static readonly UTF8Encoding Utf8;
+
+    }
+}

AssetStudio.sln

@@ -1,71 +1,141 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29920.165
+VisualStudioVersion = 16.0.31410.357
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudio", "AssetStudio\AssetStudio.csproj", "{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetStudio", "AssetStudio\AssetStudio.csproj", "{422FEC21-EF60-4F29-AA56-95DFDA23C913}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetStudioFBX", "AssetStudioFBX\AssetStudioFBX.vcxproj", "{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetStudio.PInvoke", "AssetStudio.PInvoke\AssetStudio.PInvoke.csproj", "{0B2BE613-3049-4021-85D1-21C325F729F4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture2DDecoder", "Texture2DDecoder\Texture2DDecoder.vcxproj", "{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetStudioFBXWrapper", "AssetStudioFBXWrapper\AssetStudioFBXWrapper.csproj", "{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027} = {11EA25A3-ED68-40EE-A9D0-7FDE3B583027}
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudioUtility", "AssetStudioUtility\AssetStudioUtility.csproj", "{80AEC261-21EE-4E4F-A93B-7A744DC84888}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetStudioGUI", "AssetStudioGUI\AssetStudioGUI.csproj", "{29EAD018-1C67-497A-AB8E-727D595AD756}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetStudioGUI", "AssetStudioGUI\AssetStudioGUI.csproj", "{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetStudioUtility", "AssetStudioUtility\AssetStudioUtility.csproj", "{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Texture2DDecoderWrapper", "Texture2DDecoderWrapper\Texture2DDecoderWrapper.csproj", "{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{29356642-C46E-4144-83D8-22DC09D0D7FD} = {29356642-C46E-4144-83D8-22DC09D0D7FD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetStudioFBXNative", "AssetStudioFBXNative\AssetStudioFBXNative.vcxproj", "{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Texture2DDecoderNative", "Texture2DDecoderNative\Texture2DDecoderNative.vcxproj", "{29356642-C46E-4144-83D8-22DC09D0D7FD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x64.Build.0 = Debug|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Debug|x86.Build.0 = Debug|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Debug|x64.Build.0 = Debug|Any CPU
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x64.ActiveCfg = Release|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x64.Build.0 = Release|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Debug|x86.Build.0 = Debug|Any CPU
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x86.ActiveCfg = Release|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}.Release|x86.Build.0 = Release|Any CPU
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x64.ActiveCfg = Debug|x64
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Release|x64.ActiveCfg = Release|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x64.Build.0 = Debug|x64
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Release|x64.Build.0 = Release|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x86.ActiveCfg = Debug|Win32
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Release|x86.ActiveCfg = Release|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Debug|x86.Build.0 = Debug|Win32
+		{422FEC21-EF60-4F29-AA56-95DFDA23C913}.Release|x86.Build.0 = Release|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x64.ActiveCfg = Release|x64
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x64.Build.0 = Release|x64
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x86.ActiveCfg = Release|Win32
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}.Release|x86.Build.0 = Release|Win32
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x64.ActiveCfg = Debug|x64
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x64.Build.0 = Debug|x64
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Debug|x86.Build.0 = Debug|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x86.ActiveCfg = Debug|Win32
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Debug|x86.Build.0 = Debug|Win32
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x64.ActiveCfg = Release|x64
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x64.Build.0 = Release|x64
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Release|x64.Build.0 = Release|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x86.ActiveCfg = Release|Win32
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{BEC7B5E6-0A7B-4824-97A7-EEA04D9EBA29}.Release|x86.Build.0 = Release|Win32
+		{0B2BE613-3049-4021-85D1-21C325F729F4}.Release|x86.Build.0 = Release|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x64.ActiveCfg = Debug|x64
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x64.Build.0 = Debug|x64
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x86.ActiveCfg = Debug|x86
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Debug|x86.Build.0 = Debug|x86
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Debug|x64.Build.0 = Debug|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x64.ActiveCfg = Release|x64
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x64.Build.0 = Release|x64
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Debug|x86.Build.0 = Debug|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x86.ActiveCfg = Release|x86
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80AEC261-21EE-4E4F-A93B-7A744DC84888}.Release|x86.Build.0 = Release|x86
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x64.ActiveCfg = Debug|x64
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Release|x64.ActiveCfg = Release|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x64.Build.0 = Debug|x64
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Release|x64.Build.0 = Release|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x86.ActiveCfg = Debug|x86
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Release|x86.ActiveCfg = Release|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Debug|x86.Build.0 = Debug|x86
+		{E301AFEA-84E7-4BCE-8D65-A2576D8D105B}.Release|x86.Build.0 = Release|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x64.ActiveCfg = Release|x64
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x64.Build.0 = Release|x64
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x86.ActiveCfg = Release|x86
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}.Release|x86.Build.0 = Release|x86
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Debug|x64.Build.0 = Debug|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Debug|x86.Build.0 = Debug|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Release|x64.ActiveCfg = Release|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Release|x64.Build.0 = Release|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Release|x86.ActiveCfg = Release|Any CPU
+		{29EAD018-1C67-497A-AB8E-727D595AD756}.Release|x86.Build.0 = Release|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Release|x64.Build.0 = Release|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{65EAFFA3-01D3-4EF5-B092-8B4647E9A1FF}.Release|x86.Build.0 = Release|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Debug|x86.Build.0 = Debug|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Release|x64.ActiveCfg = Release|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Release|x64.Build.0 = Release|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Release|x86.ActiveCfg = Release|Any CPU
+		{6438FEC1-56B0-488C-A5E2-FBDB23E9574B}.Release|x86.Build.0 = Release|Any CPU
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Debug|Any CPU.Build.0 = Debug|Win32
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Debug|x64.ActiveCfg = Debug|x64
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Debug|x64.Build.0 = Debug|x64
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Debug|x86.ActiveCfg = Debug|Win32
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Debug|x86.Build.0 = Debug|Win32
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Release|Any CPU.ActiveCfg = Release|Win32
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Release|Any CPU.Build.0 = Release|Win32
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Release|x64.ActiveCfg = Release|x64
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Release|x64.Build.0 = Release|x64
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Release|x86.ActiveCfg = Release|Win32
+		{11EA25A3-ED68-40EE-A9D0-7FDE3B583027}.Release|x86.Build.0 = Release|Win32
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Debug|Any CPU.Build.0 = Debug|Win32
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Debug|x64.ActiveCfg = Debug|x64
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Debug|x64.Build.0 = Debug|x64
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Debug|x86.ActiveCfg = Debug|Win32
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Debug|x86.Build.0 = Debug|Win32
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Release|Any CPU.ActiveCfg = Release|Win32
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Release|Any CPU.Build.0 = Release|Win32
+		{29356642-C46E-4144-83D8-22DC09D0D7FD}.Release|x64.ActiveCfg = Release|x64
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F8734F96-97B6-40CA-B791-6D5467F2F713}
+		SolutionGuid = {3C074481-9CDD-4780-B9F6-57BBC5092EA2}
 	EndGlobalSection
 EndGlobal

AssetStudio/AssetStudio.csproj

@@ -1,154 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFrameworks>net472;netstandard2.0;net5.0;net6.0</TargetFrameworks>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Version>0.16.0.0</Version>
-    <ProjectGuid>{7662F8C2-7BFD-442E-A948-A43B4F7EB06E}</ProjectGuid>
+    <AssemblyVersion>0.16.0.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
+    <FileVersion>0.16.0.0</FileVersion>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <Copyright>Copyright © Perfare 2018-2022</Copyright>
-    <RootNamespace>AssetStudio</RootNamespace>
+    <DebugType>embedded</DebugType>
-    <AssemblyName>AssetStudio</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+
-    <DebugSymbols>true</DebugSymbols>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
-    <DebugType>full</DebugType>
+    <PackageReference Include="K4os.Compression.LZ4" Version="1.2.16" />
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
+
-    <Compile Include="7zip\Common\CommandLineParser.cs" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <Compile Include="7zip\Common\CRC.cs" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
-    <Compile Include="7zip\Common\InBuffer.cs" />
+    <PackageReference Include="System.IO.Compression" Version="4.0.0" />
-    <Compile Include="7zip\Common\OutBuffer.cs" />
+    <PackageReference Include="K4os.Compression.LZ4" Version="1.1.11" />
-    <Compile Include="7zip\Compress\LZMA\LzmaBase.cs" />
-    <Compile Include="7zip\Compress\LZMA\LzmaDecoder.cs" />
-    <Compile Include="7zip\Compress\LZMA\LzmaEncoder.cs" />
-    <Compile Include="7zip\Compress\LZ\IMatchFinder.cs" />
-    <Compile Include="7zip\Compress\LZ\LzBinTree.cs" />
-    <Compile Include="7zip\Compress\LZ\LzInWindow.cs" />
-    <Compile Include="7zip\Compress\LZ\LzOutWindow.cs" />
-    <Compile Include="7zip\Compress\RangeCoder\RangeCoder.cs" />
-    <Compile Include="7zip\Compress\RangeCoder\RangeCoderBit.cs" />
-    <Compile Include="7zip\Compress\RangeCoder\RangeCoderBitTree.cs" />
-    <Compile Include="7zip\ICoder.cs" />
-    <Compile Include="AssetsManager.cs" />
-    <Compile Include="Brotli\BitReader.cs" />
-    <Compile Include="Brotli\BrotliInputStream.cs" />
-    <Compile Include="Brotli\BrotliRuntimeException.cs" />
-    <Compile Include="Brotli\Context.cs" />
-    <Compile Include="Brotli\Decode.cs" />
-    <Compile Include="Brotli\Dictionary.cs" />
-    <Compile Include="Brotli\Huffman.cs" />
-    <Compile Include="Brotli\HuffmanTreeGroup.cs" />
-    <Compile Include="Brotli\IntReader.cs" />
-    <Compile Include="Brotli\Prefix.cs" />
-    <Compile Include="Brotli\RunningState.cs" />
-    <Compile Include="Brotli\State.cs" />
-    <Compile Include="Brotli\Transform.cs" />
-    <Compile Include="Brotli\Utils.cs" />
-    <Compile Include="Brotli\WordTransformType.cs" />
-    <Compile Include="BuildTarget.cs" />
-    <Compile Include="BuildType.cs" />
-    <Compile Include="BundleFile.cs" />
-    <Compile Include="Classes\Animation.cs" />
-    <Compile Include="Classes\AnimationClip.cs" />
-    <Compile Include="Classes\Animator.cs" />
-    <Compile Include="Classes\AnimatorController.cs" />
-    <Compile Include="Classes\AnimatorOverrideController.cs" />
-    <Compile Include="Classes\AssetBundle.cs" />
-    <Compile Include="Classes\AudioClip.cs" />
-    <Compile Include="Classes\Avatar.cs" />
-    <Compile Include="Classes\Behaviour.cs" />
-    <Compile Include="Classes\BuildSettings.cs" />
-    <Compile Include="Classes\Component.cs" />
-    <Compile Include="Classes\EditorExtension.cs" />
-    <Compile Include="Classes\Font.cs" />
-    <Compile Include="Classes\GameObject.cs" />
-    <Compile Include="Classes\Material.cs" />
-    <Compile Include="Classes\Mesh.cs" />
-    <Compile Include="Classes\MeshFilter.cs" />
-    <Compile Include="Classes\MeshRenderer.cs" />
-    <Compile Include="Classes\MonoBehaviour.cs" />
-    <Compile Include="Classes\MonoScript.cs" />
-    <Compile Include="Classes\MovieTexture.cs" />
-    <Compile Include="Classes\NamedObject.cs" />
-    <Compile Include="Classes\Object.cs" />
-    <Compile Include="Classes\PlayerSettings.cs" />
-    <Compile Include="Classes\PPtr.cs" />
-    <Compile Include="Classes\RectTransform.cs" />
-    <Compile Include="Classes\Renderer.cs" />
-    <Compile Include="Classes\RuntimeAnimatorController.cs" />
-    <Compile Include="Classes\Shader.cs" />
-    <Compile Include="Classes\SkinnedMeshRenderer.cs" />
-    <Compile Include="Classes\Sprite.cs" />
-    <Compile Include="Classes\SpriteAtlas.cs" />
-    <Compile Include="Classes\TextAsset.cs" />
-    <Compile Include="Classes\Texture.cs" />
-    <Compile Include="Classes\Texture2D.cs" />
-    <Compile Include="Classes\Transform.cs" />
-    <Compile Include="Classes\VideoClip.cs" />
-    <Compile Include="ClassIDType.cs" />
-    <Compile Include="CommonString.cs" />
-    <Compile Include="EndianBinaryReader.cs" />
-    <Compile Include="Extensions\BinaryReaderExtensions.cs" />
-    <Compile Include="Extensions\BinaryWriterExtensions.cs" />
-    <Compile Include="Extensions\StreamExtensions.cs" />
-    <Compile Include="FileIdentifier.cs" />
-    <Compile Include="IImported.cs" />
-    <Compile Include="ILogger.cs" />
-    <Compile Include="ImportHelper.cs" />
-    <Compile Include="IProgress.cs" />
-    <Compile Include="LocalSerializedObjectIdentifier.cs" />
-    <Compile Include="Logger.cs" />
-    <Compile Include="Lz4DecoderStream.cs" />
-    <Compile Include="Math\Color.cs" />
-    <Compile Include="Math\Half.cs" />
-    <Compile Include="Math\HalfHelper.cs" />
-    <Compile Include="Math\Matrix4x4.cs" />
-    <Compile Include="Math\Quaternion.cs" />
-    <Compile Include="Math\Vector2.cs" />
-    <Compile Include="Math\Vector3.cs" />
-    <Compile Include="Math\Vector4.cs" />
-    <Compile Include="ObjectInfo.cs" />
-    <Compile Include="ObjectReader.cs" />
-    <Compile Include="Progress.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ResourceReader.cs" />
-    <Compile Include="SerializedFile.cs" />
-    <Compile Include="SerializedFileHeader.cs" />
-    <Compile Include="SerializedType.cs" />
-    <Compile Include="SevenZipHelper.cs" />
-    <Compile Include="StreamFile.cs" />
-    <Compile Include="TypeTreeHelper.cs" />
-    <Compile Include="TypeTreeNode.cs" />
-    <Compile Include="UType.cs" />
-    <Compile Include="WebFile.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>

AssetStudio/AssetsManager.cs

@@ -1,24 +1,29 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
+using System.Text;
 using static AssetStudio.ImportHelper;
 
 namespace AssetStudio
 {
     public class AssetsManager
     {
+        public string SpecifyUnityVersion;
         public List<SerializedFile> assetsFileList = new List<SerializedFile>();
+
         internal Dictionary<string, int> assetsFileIndexCache = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
         internal Dictionary<string, BinaryReader> resourceFileReaders = new Dictionary<string, BinaryReader>(StringComparer.OrdinalIgnoreCase);
 
         private List<string> importFiles = new List<string>();
         private HashSet<string> importFilesHash = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private HashSet<string> noexistFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private HashSet<string> assetsFileListHash = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         public void LoadFiles(params string[] files)
         {
-            var path = Path.GetDirectoryName(files[0]);
+            var path = Path.GetDirectoryName(Path.GetFullPath(files[0]));
             MergeSplitAssets(path);
             var toReadFile = ProcessingSplitFiles(files.ToList());
             Load(toReadFile);
@@ -50,6 +55,7 @@ namespace AssetStudio
 
             importFiles.Clear();
             importFilesHash.Clear();
+            noexistFiles.Clear();
             assetsFileListHash.Clear();
 
             ReadAssets();
@@ -58,121 +64,144 @@ namespace AssetStudio
 
         private void LoadFile(string fullName)
         {
-            switch (CheckFileType(fullName, out var reader))
+            var reader = new FileReader(fullName);
+            LoadFile(reader);
+        }
+
+        private void LoadFile(FileReader reader)
+        {
+            switch (reader.FileType)
             {
                 case FileType.AssetsFile:
-                    LoadAssetsFile(fullName, reader);
+                    LoadAssetsFile(reader);
                     break;
                 case FileType.BundleFile:
-                    LoadBundleFile(fullName, reader);
+                    LoadBundleFile(reader);
                     break;
                 case FileType.WebFile:
-                    LoadWebFile(fullName, reader);
+                    LoadWebFile(reader);
+                    break;
+                case FileType.GZipFile:
+                    LoadFile(DecompressGZip(reader));
+                    break;
+                case FileType.BrotliFile:
+                    LoadFile(DecompressBrotli(reader));
+                    break;
+                case FileType.ZipFile:
+                    LoadZipFile(reader);
                     break;
             }
         }
 
-        private void LoadAssetsFile(string fullName, EndianBinaryReader reader)
+        private void LoadAssetsFile(FileReader reader)
         {
-            var fileName = Path.GetFileName(fullName);
+            if (!assetsFileListHash.Contains(reader.FileName))
-            if (!assetsFileListHash.Contains(fileName))
             {
-                Logger.Info($"Loading {fileName}");
+                Logger.Info($"Loading {reader.FullPath}");
                 try
                 {
-                    var assetsFile = new SerializedFile(this, fullName, reader);
+                    var assetsFile = new SerializedFile(reader, this);
+                    CheckStrippedVersion(assetsFile);
                     assetsFileList.Add(assetsFile);
                     assetsFileListHash.Add(assetsFile.fileName);
 
                     foreach (var sharedFile in assetsFile.m_Externals)
                     {
-                        var sharedFilePath = Path.GetDirectoryName(fullName) + "\\" + sharedFile.fileName;
                         var sharedFileName = sharedFile.fileName;
 
                         if (!importFilesHash.Contains(sharedFileName))
+                        {
+                            var sharedFilePath = Path.Combine(Path.GetDirectoryName(reader.FullPath), sharedFileName);
+                            if (!noexistFiles.Contains(sharedFilePath))
                             {
                                 if (!File.Exists(sharedFilePath))
                                 {
-                                var findFiles = Directory.GetFiles(Path.GetDirectoryName(fullName), sharedFileName, SearchOption.AllDirectories);
+                                    var findFiles = Directory.GetFiles(Path.GetDirectoryName(reader.FullPath), sharedFileName, SearchOption.AllDirectories);
                                     if (findFiles.Length > 0)
                                     {
                                         sharedFilePath = findFiles[0];
                                     }
                                 }
-
                                 if (File.Exists(sharedFilePath))
                                 {
                                     importFiles.Add(sharedFilePath);
                                     importFilesHash.Add(sharedFileName);
                                 }
-                        }
+                                else
-                    }
-                }
-                catch
                                 {
+                                    noexistFiles.Add(sharedFilePath);
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    Logger.Error($"Error while reading assets file {reader.FullPath}", e);
                     reader.Dispose();
-                    //Logger.Warning($"Unable to load assets file {fileName}");
                 }
             }
             else
             {
+                Logger.Info($"Skipping {reader.FullPath}");
                 reader.Dispose();
             }
         }
 
-        private void LoadAssetsFromMemory(string fullName, EndianBinaryReader reader, string originalPath, string unityVersion = null)
+        private void LoadAssetsFromMemory(FileReader reader, string originalPath, string unityVersion = null)
         {
-            var fileName = Path.GetFileName(fullName);
+            if (!assetsFileListHash.Contains(reader.FileName))
-            if (!assetsFileListHash.Contains(fileName))
             {
                 try
                 {
-                    var assetsFile = new SerializedFile(this, fullName, reader);
+                    var assetsFile = new SerializedFile(reader, this);
                     assetsFile.originalPath = originalPath;
-                    if (assetsFile.header.m_Version < 7)
+                    if (!string.IsNullOrEmpty(unityVersion) && assetsFile.header.m_Version < SerializedFileFormatVersion.Unknown_7)
                     {
                         assetsFile.SetVersion(unityVersion);
                     }
+                    CheckStrippedVersion(assetsFile);
                     assetsFileList.Add(assetsFile);
                     assetsFileListHash.Add(assetsFile.fileName);
                 }
-                catch
+                catch (Exception e)
                 {
-                    //Logger.Error($"Unable to load assets file {fileName} from {Path.GetFileName(originalPath)}");
+                    Logger.Error($"Error while reading assets file {reader.FullPath} from {Path.GetFileName(originalPath)}", e);
-                    resourceFileReaders.Add(fileName, reader);
+                    resourceFileReaders.Add(reader.FileName, reader);
                 }
             }
+            else
+                Logger.Info($"Skipping {originalPath} ({reader.FileName})");
         }
 
-        private void LoadBundleFile(string fullName, EndianBinaryReader reader, string parentPath = null)
+        private void LoadBundleFile(FileReader reader, string originalPath = null)
         {
-            var fileName = Path.GetFileName(fullName);
+            Logger.Info("Loading " + reader.FullPath);
-            Logger.Info("Loading " + fileName);
             try
             {
-                var bundleFile = new BundleFile(reader, fullName);
+                var bundleFile = new BundleFile(reader);
                 foreach (var file in bundleFile.fileList)
                 {
-                    var subReader = new EndianBinaryReader(file.stream);
+                    var dummyPath = Path.Combine(Path.GetDirectoryName(reader.FullPath), file.fileName);
-                    if (SerializedFile.IsSerializedFile(subReader))
+                    var subReader = new FileReader(dummyPath, file.stream);
+                    if (subReader.FileType == FileType.AssetsFile)
                     {
-                        var dummyPath = Path.GetDirectoryName(fullName) + Path.DirectorySeparatorChar + file.fileName;
+                        LoadAssetsFromMemory(subReader, originalPath ?? reader.FullPath, bundleFile.m_Header.unityRevision);
-                        LoadAssetsFromMemory(dummyPath, subReader, parentPath ?? fullName, bundleFile.m_Header.unityRevision);
                     }
                     else
                     {
-                        resourceFileReaders.Add(file.fileName, subReader);
+                        resourceFileReaders[file.fileName] = subReader; //TODO
                     }
                 }
             }
-            catch
+            catch (Exception e)
             {
-                /*var str = $"Unable to load bundle file {fileName}";
+                var str = $"Error while reading bundle file {reader.FullPath}";
-                if (parentPath != null)
+                if (originalPath != null)
                 {
-                    str += $" from {Path.GetFileName(parentPath)}";
+                    str += $" from {Path.GetFileName(originalPath)}";
                 }
-                Logger.Error(str);*/
+                Logger.Error(str, e);
             }
             finally
             {
@@ -180,36 +209,36 @@ namespace AssetStudio
             }
         }
 
-        private void LoadWebFile(string fullName, EndianBinaryReader reader)
+        private void LoadWebFile(FileReader reader)
         {
-            var fileName = Path.GetFileName(fullName);
+            Logger.Info("Loading " + reader.FullPath);
-            Logger.Info("Loading " + fileName);
             try
             {
                 var webFile = new WebFile(reader);
                 foreach (var file in webFile.fileList)
                 {
-                    var dummyPath = Path.GetDirectoryName(fullName) + "\\" + file.fileName;
+                    var dummyPath = Path.Combine(Path.GetDirectoryName(reader.FullPath), file.fileName);
-                    switch (CheckFileType(file.stream, out var fileReader))
+                    var subReader = new FileReader(dummyPath, file.stream);
+                    switch (subReader.FileType)
                     {
                         case FileType.AssetsFile:
-                            LoadAssetsFromMemory(dummyPath, fileReader, fullName);
+                            LoadAssetsFromMemory(subReader, reader.FullPath);
                             break;
                         case FileType.BundleFile:
-                            LoadBundleFile(dummyPath, fileReader, fullName);
+                            LoadBundleFile(subReader, reader.FullPath);
                             break;
                         case FileType.WebFile:
-                            LoadWebFile(dummyPath, fileReader);
+                            LoadWebFile(subReader);
                             break;
                         case FileType.ResourceFile:
-                            resourceFileReaders.Add(file.fileName, fileReader);
+                            resourceFileReaders[file.fileName] = subReader; //TODO
                             break;
                     }
                 }
             }
-            catch
+            catch (Exception e)
             {
-                //Logger.Error($"Unable to load web file {fileName}");
+                Logger.Error($"Error while reading web file {reader.FullPath}", e);
             }
             finally
             {
@@ -217,6 +246,118 @@ namespace AssetStudio
             }
         }
 
+        private void LoadZipFile(FileReader reader)
+        {
+            Logger.Info("Loading " + reader.FileName);
+            try
+            {
+                using (ZipArchive archive = new ZipArchive(reader.BaseStream, ZipArchiveMode.Read))
+                {
+                    List<string> splitFiles = new List<string>();
+                    // register all files before parsing the assets so that the external references can be found
+                    // and find split files
+                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    {
+                        if (entry.Name.Contains(".split"))
+                        {
+                            string baseName = Path.GetFileNameWithoutExtension(entry.Name);
+                            string basePath = Path.Combine(Path.GetDirectoryName(entry.FullName), baseName);
+                            if (!splitFiles.Contains(basePath))
+                            {
+                                splitFiles.Add(basePath);
+                                importFilesHash.Add(baseName);
+                            }
+                        }
+                        else
+                        {
+                            importFilesHash.Add(entry.Name);
+                        }
+                    }
+
+                    // merge split files and load the result
+                    foreach (string basePath in splitFiles)
+                    {
+                        try
+                        {
+                            Stream splitStream = new MemoryStream();
+                            int i = 0;
+                            while (true)
+                            {
+                                string path = $"{basePath}.split{i++}";
+                                ZipArchiveEntry entry = archive.GetEntry(path);
+                                if (entry == null)
+                                    break;
+                                using (Stream entryStream = entry.Open())
+                                {
+                                    entryStream.CopyTo(splitStream);
+                                }
+                            }
+                            splitStream.Seek(0, SeekOrigin.Begin);
+                            FileReader entryReader = new FileReader(basePath, splitStream);
+                            LoadFile(entryReader);
+                        }
+                        catch (Exception e)
+                        {
+                            Logger.Error($"Error while reading zip split file {basePath}", e);
+                        }
+                    }
+
+                    // load all entries
+                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    {
+                        try
+                        {
+                            string dummyPath = Path.Combine(Path.GetDirectoryName(reader.FullPath), reader.FileName, entry.FullName);
+                            // create a new stream
+                            // - to store the deflated stream in
+                            // - to keep the data for later extraction
+                            Stream streamReader = new MemoryStream();
+                            using (Stream entryStream = entry.Open())
+                            {
+                                entryStream.CopyTo(streamReader);
+                            }
+                            streamReader.Position = 0;
+
+                            FileReader entryReader = new FileReader(dummyPath, streamReader);
+                            LoadFile(entryReader);
+                            if (entryReader.FileType == FileType.ResourceFile)
+                            {
+                                entryReader.Position = 0;
+                                if (!resourceFileReaders.ContainsKey(entry.Name))
+                                {
+                                    resourceFileReaders.Add(entry.Name, entryReader);
+                                }
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            Logger.Error($"Error while reading zip entry {entry.FullName}", e);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Error($"Error while reading zip file {reader.FileName}", e);
+            }
+            finally
+            {
+                reader.Dispose();
+            }
+        }
+
+        public void CheckStrippedVersion(SerializedFile assetsFile)
+        {
+            if (assetsFile.IsVersionStripped && string.IsNullOrEmpty(SpecifyUnityVersion))
+            {
+                throw new Exception("The Unity version has been stripped, please set the version in the options");
+            }
+            if (!string.IsNullOrEmpty(SpecifyUnityVersion))
+            {
+                assetsFile.SetVersion(SpecifyUnityVersion);
+            }
+        }
+
         public void Clear()
         {
             foreach (var assetsFile in assetsFileList)
@@ -333,6 +474,9 @@ namespace AssetStudio
                             case ClassIDType.VideoClip:
                                 obj = new VideoClip(objectReader);
                                 break;
+                            case ClassIDType.ResourceManager:
+                                obj = new ResourceManager(objectReader);
+                                break;
                             default:
                                 obj = new Object(objectReader);
                                 break;
@@ -341,13 +485,14 @@ namespace AssetStudio
                     }
                     catch (Exception e)
                     {
-                        /*var sb = new StringBuilder();
+                        var sb = new StringBuilder();
                         sb.AppendLine("Unable to load object")
                             .AppendLine($"Assets {assetsFile.fileName}")
+                            .AppendLine($"Path {assetsFile.originalPath}")
                             .AppendLine($"Type {objectReader.type}")
                             .AppendLine($"PathID {objectInfo.m_PathID}")
                             .Append(e);
-                        Logger.Error(sb.ToString());*/
+                        Logger.Error(sb.ToString());
                     }
 
                     Progress.Report(++i, progressCount);
@@ -403,6 +548,14 @@ namespace AssetStudio
                                 {
                                     m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas);
                                 }
+                                else
+                                {
+                                    m_Sprite.m_SpriteAtlas.TryGet(out var m_SpriteAtlaOld);
+                                    if (m_SpriteAtlaOld.m_IsVariant)
+                                    {
+                                        m_Sprite.m_SpriteAtlas.Set(m_SpriteAtlas);
+                                    }
+                                }
                             }
                         }
                     }

AssetStudio/BigArrayPool.cs

@@ -0,0 +1,10 @@
+using System.Buffers;
+
+namespace AssetStudio
+{
+    public static class BigArrayPool<T>
+    {
+        private static readonly ArrayPool<T> s_shared = ArrayPool<T>.Create(64 * 1024 * 1024, 3);
+        public static ArrayPool<T> Shared => s_shared;
+    }
+}

AssetStudio/BuildTarget.cs

@@ -7,8 +7,9 @@ namespace AssetStudio
 {
     public enum BuildTarget
     {
-        UnknownPlatform = 3716,
+        NoTarget = -2,
-        DashboardWidget = 1,
+        AnyPlayer = -1,
+        ValidPlayer = 1,
         StandaloneOSX = 2,
         StandaloneOSXPPC = 3,
         StandaloneOSXIntel = 4,
@@ -19,8 +20,10 @@ namespace AssetStudio
         iOS = 9,
         PS3,
         XBOX360,
+        Broadcom = 12,
         Android = 13,
         StandaloneGLESEmu = 14,
+        StandaloneGLES20Emu = 15,
         NaCl = 16,
         StandaloneLinux = 17,
         FlashPlayer = 18,
@@ -42,6 +45,14 @@ namespace AssetStudio
         WiiU,
         tvOS,
         Switch,
-        NoTarget = -2
+        Lumin,
+        Stadia,
+        CloudRendering,
+        GameCoreXboxSeries,
+        GameCoreXboxOne,
+        PS5,
+        EmbeddedLinux,
+        QNX,
+        UnknownPlatform = 9999
     }
 }

AssetStudio/BundleFile.cs

@@ -1,11 +1,36 @@
-using System;
+using K4os.Compression.LZ4;
-using System.Collections.Generic;
+using System;
 using System.IO;
 using System.Linq;
-using Lz4;
 
 namespace AssetStudio
 {
+    [Flags]
+    public enum ArchiveFlags
+    {
+        CompressionTypeMask = 0x3f,
+        BlocksAndDirectoryInfoCombined = 0x40,
+        BlocksInfoAtTheEnd = 0x80,
+        OldWebPluginCompatibility = 0x100,
+        BlockInfoNeedPaddingAtStart = 0x200
+    }
+
+    [Flags]
+    public enum StorageBlockFlags
+    {
+        CompressionTypeMask = 0x3f,
+        Streamed = 0x40
+    }
+
+    public enum CompressionType
+    {
+        None,
+        Lzma,
+        Lz4,
+        Lz4HC,
+        Lzham
+    }
+
     public class BundleFile
     {
         public class Header
@@ -17,14 +42,14 @@ namespace AssetStudio
             public long size;
             public uint compressedBlocksInfoSize;
             public uint uncompressedBlocksInfoSize;
-            public uint flags;
+            public ArchiveFlags flags;
         }
 
         public class StorageBlock
         {
             public uint compressedSize;
             public uint uncompressedSize;
-            public ushort flags;
+            public StorageBlockFlags flags;
         }
 
         public class Node
@@ -41,30 +66,37 @@ namespace AssetStudio
 
         public StreamFile[] fileList;
 
-        public BundleFile(EndianBinaryReader reader, string path)
+        public BundleFile(FileReader reader)
         {
             m_Header = new Header();
             m_Header.signature = reader.ReadStringToNull();
+            m_Header.version = reader.ReadUInt32();
+            m_Header.unityVersion = reader.ReadStringToNull();
+            m_Header.unityRevision = reader.ReadStringToNull();
             switch (m_Header.signature)
             {
                 case "UnityArchive":
                     break; //TODO
                 case "UnityWeb":
                 case "UnityRaw":
+                    if (m_Header.version == 6)
+                    {
+                        goto case "UnityFS";
+                    }
                     ReadHeaderAndBlocksInfo(reader);
-                    using (var blocksStream = CreateBlocksStream(path))
+                    using (var blocksStream = CreateBlocksStream(reader.FullPath))
                     {
                         ReadBlocksAndDirectory(reader, blocksStream);
-                        ReadFiles(blocksStream, path);
+                        ReadFiles(blocksStream, reader.FullPath);
                     }
                     break;
                 case "UnityFS":
                     ReadHeader(reader);
                     ReadBlocksInfoAndDirectory(reader);
-                    using (var blocksStream = CreateBlocksStream(path))
+                    using (var blocksStream = CreateBlocksStream(reader.FullPath))
                     {
                         ReadBlocks(reader, blocksStream);
-                        ReadFiles(blocksStream, path);
+                        ReadFiles(blocksStream, reader.FullPath);
                     }
                     break;
             }
@@ -72,17 +104,13 @@ namespace AssetStudio
 
         private void ReadHeaderAndBlocksInfo(EndianBinaryReader reader)
         {
-            var isCompressed = m_Header.signature == "UnityWeb";
-            m_Header.version = reader.ReadUInt32();
-            m_Header.unityVersion = reader.ReadStringToNull();
-            m_Header.unityRevision = reader.ReadStringToNull();
             if (m_Header.version >= 4)
             {
                 var hash = reader.ReadBytes(16);
                 var crc = reader.ReadUInt32();
             }
             var minimumStreamedBytes = reader.ReadUInt32();
-            var headerSize = reader.ReadUInt32();
+            m_Header.size = reader.ReadUInt32();
             var numberOfLevelsToDownloadBeforeStreaming = reader.ReadUInt32();
             var levelCount = reader.ReadInt32();
             m_BlocksInfo = new StorageBlock[1];
@@ -92,7 +120,6 @@ namespace AssetStudio
                 {
                     compressedSize = reader.ReadUInt32(),
                     uncompressedSize = reader.ReadUInt32(),
-                    flags = (ushort)(isCompressed ? 1 : 0)
                 };
                 if (i == levelCount - 1)
                 {
@@ -107,7 +134,7 @@ namespace AssetStudio
             {
                 var fileInfoHeaderSize = reader.ReadUInt32();
             }
-            reader.Position = headerSize;
+            reader.Position = m_Header.size;
         }
 
         private Stream CreateBlocksStream(string path)
@@ -116,7 +143,7 @@ namespace AssetStudio
             var uncompressedSizeSum = m_BlocksInfo.Sum(x => x.uncompressedSize);
             if (uncompressedSizeSum >= int.MaxValue)
             {
-                /*var memoryMappedFile = MemoryMappedFile.CreateNew(Path.GetFileName(path), uncompressedSizeSum);
+                /*var memoryMappedFile = MemoryMappedFile.CreateNew(null, uncompressedSizeSum);
                 assetsDataStream = memoryMappedFile.CreateViewStream();*/
                 blocksStream = new FileStream(path + ".temp", FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4096, FileOptions.DeleteOnClose);
             }
@@ -129,10 +156,11 @@ namespace AssetStudio
 
         private void ReadBlocksAndDirectory(EndianBinaryReader reader, Stream blocksStream)
         {
+            var isCompressed = m_Header.signature == "UnityWeb";
             foreach (var blockInfo in m_BlocksInfo)
             {
                 var uncompressedBytes = reader.ReadBytes((int)blockInfo.compressedSize);
-                if (blockInfo.flags == 1)
+                if (isCompressed)
                 {
                     using (var memoryStream = new MemoryStream(uncompressedBytes))
                     {
@@ -167,14 +195,15 @@ namespace AssetStudio
                 var node = m_DirectoryInfo[i];
                 var file = new StreamFile();
                 fileList[i] = file;
+                file.path = node.path;
                 file.fileName = Path.GetFileName(node.path);
                 if (node.size >= int.MaxValue)
                 {
-                    /*var memoryMappedFile = MemoryMappedFile.CreateNew(file.fileName, entryinfo_size);
+                    /*var memoryMappedFile = MemoryMappedFile.CreateNew(null, entryinfo_size);
                     file.stream = memoryMappedFile.CreateViewStream();*/
                     var extractPath = path + "_unpacked" + Path.DirectorySeparatorChar;
                     Directory.CreateDirectory(extractPath);
-                    file.stream = File.Create(extractPath + file.fileName);
+                    file.stream = new FileStream(extractPath + file.fileName, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite);
                 }
                 else
                 {
@@ -188,59 +217,68 @@ namespace AssetStudio
 
         private void ReadHeader(EndianBinaryReader reader)
         {
-            m_Header.version = reader.ReadUInt32();
-            m_Header.unityVersion = reader.ReadStringToNull();
-            m_Header.unityRevision = reader.ReadStringToNull();
             m_Header.size = reader.ReadInt64();
             m_Header.compressedBlocksInfoSize = reader.ReadUInt32();
             m_Header.uncompressedBlocksInfoSize = reader.ReadUInt32();
-            m_Header.flags = reader.ReadUInt32();
+            m_Header.flags = (ArchiveFlags)reader.ReadUInt32();
+            if (m_Header.signature != "UnityFS")
+            {
+                reader.ReadByte();
+            }
         }
 
         private void ReadBlocksInfoAndDirectory(EndianBinaryReader reader)
         {
             byte[] blocksInfoBytes;
-            if ((m_Header.flags & 0x80) != 0) //kArchiveBlocksInfoAtTheEnd
+            if (m_Header.version >= 7)
+            {
+                reader.AlignStream(16);
+            }
+            if ((m_Header.flags & ArchiveFlags.BlocksInfoAtTheEnd) != 0)
             {
                 var position = reader.Position;
                 reader.Position = reader.BaseStream.Length - m_Header.compressedBlocksInfoSize;
                 blocksInfoBytes = reader.ReadBytes((int)m_Header.compressedBlocksInfoSize);
                 reader.Position = position;
             }
-            else //0x40 kArchiveBlocksAndDirectoryInfoCombined
+            else //0x40 BlocksAndDirectoryInfoCombined
             {
-                if (m_Header.version >= 7)
-                {
-                    reader.AlignStream(16);
-                }
                 blocksInfoBytes = reader.ReadBytes((int)m_Header.compressedBlocksInfoSize);
             }
-            var blocksInfoCompressedStream = new MemoryStream(blocksInfoBytes);
             MemoryStream blocksInfoUncompresseddStream;
-            switch (m_Header.flags & 0x3F) //kArchiveCompressionTypeMask
+            var uncompressedSize = m_Header.uncompressedBlocksInfoSize;
+            var compressionType = (CompressionType)(m_Header.flags & ArchiveFlags.CompressionTypeMask);
+            switch (compressionType)
             {
-                default: //None
+                case CompressionType.None:
                     {
-                        blocksInfoUncompresseddStream = blocksInfoCompressedStream;
+                        blocksInfoUncompresseddStream = new MemoryStream(blocksInfoBytes);
                         break;
                     }
-                case 1: //LZMA
+                case CompressionType.Lzma:
                     {
-                        blocksInfoUncompresseddStream = SevenZipHelper.StreamDecompress(blocksInfoCompressedStream);
+                        blocksInfoUncompresseddStream = new MemoryStream((int)(uncompressedSize));
-                        blocksInfoCompressedStream.Close();
+                        using (var blocksInfoCompressedStream = new MemoryStream(blocksInfoBytes))
+                        {
+                            SevenZipHelper.StreamDecompress(blocksInfoCompressedStream, blocksInfoUncompresseddStream, m_Header.compressedBlocksInfoSize, m_Header.uncompressedBlocksInfoSize);
+                        }
+                        blocksInfoUncompresseddStream.Position = 0;
                         break;
                     }
-                case 2: //LZ4
+                case CompressionType.Lz4:
-                case 3: //LZ4HC
+                case CompressionType.Lz4HC:
                     {
-                        var uncompressedBytes = new byte[m_Header.uncompressedBlocksInfoSize];
+                        var uncompressedBytes = new byte[uncompressedSize];
-                        using (var decoder = new Lz4DecoderStream(blocksInfoCompressedStream))
+                        var numWrite = LZ4Codec.Decode(blocksInfoBytes, uncompressedBytes);
+                        if (numWrite != uncompressedSize)
                         {
-                            decoder.Read(uncompressedBytes, 0, uncompressedBytes.Length);
+                            throw new IOException($"Lz4 decompression error, write {numWrite} bytes but expected {uncompressedSize} bytes");
                         }
                         blocksInfoUncompresseddStream = new MemoryStream(uncompressedBytes);
                         break;
                     }
+                default:
+                    throw new IOException($"Unsupported compression type {compressionType}");
             }
             using (var blocksInfoReader = new EndianBinaryReader(blocksInfoUncompresseddStream))
             {
@@ -253,7 +291,7 @@ namespace AssetStudio
                     {
                         uncompressedSize = blocksInfoReader.ReadUInt32(),
                         compressedSize = blocksInfoReader.ReadUInt32(),
-                        flags = blocksInfoReader.ReadUInt16()
+                        flags = (StorageBlockFlags)blocksInfoReader.ReadUInt16()
                     };
                 }
 
@@ -270,34 +308,49 @@ namespace AssetStudio
                     };
                 }
             }
+            if ((m_Header.flags & ArchiveFlags.BlockInfoNeedPaddingAtStart) != 0)
+            {
+                reader.AlignStream(16);
+            }
         }
 
         private void ReadBlocks(EndianBinaryReader reader, Stream blocksStream)
         {
             foreach (var blockInfo in m_BlocksInfo)
             {
-                switch (blockInfo.flags & 0x3F) //kStorageBlockCompressionTypeMask
+                var compressionType = (CompressionType)(blockInfo.flags & StorageBlockFlags.CompressionTypeMask);
+                switch (compressionType)
                 {
-                    default: //None
+                    case CompressionType.None:
                         {
                             reader.BaseStream.CopyTo(blocksStream, blockInfo.compressedSize);
                             break;
                         }
-                    case 1: //LZMA
+                    case CompressionType.Lzma:
                         {
                             SevenZipHelper.StreamDecompress(reader.BaseStream, blocksStream, blockInfo.compressedSize, blockInfo.uncompressedSize);
                             break;
                         }
-                    case 2: //LZ4
+                    case CompressionType.Lz4:
-                    case 3: //LZ4HC
+                    case CompressionType.Lz4HC:
                         {
-                            var compressedStream = new MemoryStream(reader.ReadBytes((int)blockInfo.compressedSize));
+                            var compressedSize = (int)blockInfo.compressedSize;
-                            using (var lz4Stream = new Lz4DecoderStream(compressedStream))
+                            var compressedBytes = BigArrayPool<byte>.Shared.Rent(compressedSize);
+                            reader.Read(compressedBytes, 0, compressedSize);
+                            var uncompressedSize = (int)blockInfo.uncompressedSize;
+                            var uncompressedBytes = BigArrayPool<byte>.Shared.Rent(uncompressedSize);
+                            var numWrite = LZ4Codec.Decode(compressedBytes, 0, compressedSize, uncompressedBytes, 0, uncompressedSize);
+                            if (numWrite != uncompressedSize)
                             {
-                                lz4Stream.CopyTo(blocksStream, blockInfo.uncompressedSize);
+                                throw new IOException($"Lz4 decompression error, write {numWrite} bytes but expected {uncompressedSize} bytes");
                             }
+                            blocksStream.Write(uncompressedBytes, 0, uncompressedSize);
+                            BigArrayPool<byte>.Shared.Return(compressedBytes);
+                            BigArrayPool<byte>.Shared.Return(uncompressedBytes);
                             break;
                         }
+                    default:
+                        throw new IOException($"Unsupported compression type {compressionType}");
                 }
             }
             blocksStream.Position = 0;

AssetStudio/ClassIDType.cs

@@ -1,4 +1,5 @@
-namespace AssetStudio
+// official Class ID Reference: https://docs.unity3d.com/Manual/ClassIDReference.html
+namespace AssetStudio
 {
     public enum ClassIDType
     {
@@ -26,7 +27,7 @@
         ParticleRenderer = 26,
         Texture = 27,
         Texture2D = 28,
-        SceneSettings = 29,
+        OcclusionCullingSettings = 29,
         GraphicsSettings = 30,
         MeshFilter = 33,
         OcclusionPortal = 41,
@@ -49,7 +50,7 @@
         PhysicsMaterial2D = 62,
         MeshCollider = 64,
         BoxCollider = 65,
-        SpriteCollider2D = 66,
+        CompositeCollider2D = 66,
         EdgeCollider2D = 68,
         CapsuleCollider2D = 70,
         ComputeShader = 72,
@@ -92,6 +93,7 @@
         FlareLayer = 124,
         HaloLayer = 125,
         NavMeshAreas = 126,
+        NavMeshProjectSettings = 126,
         HaloManager = 127,
         Font = 128,
         PlayerSettings = 129,
@@ -158,7 +160,7 @@
         BlendTree = 206,
         Motion = 207,
         NavMeshObstacle = 208,
-        TerrainInstance = 210,
+        SortingGroup = 210,
         SpriteRenderer = 212,
         Sprite = 213,
         CachedSpriteAtlas = 214,
@@ -216,15 +218,19 @@
         PerformanceReportingManager = 305,
         UnityConnectSettings = 310,
         AvatarMask = 319,
+        PlayableDirector = 320,
         VideoPlayer = 328,
         VideoClip = 329,
+        ParticleSystemForceField = 330,
+        SpriteMask = 331,
+        WorldAnchor = 362,
         OcclusionCullingData = 363,
         //kLargestRuntimeClassID = 364
         SmallestEditorClassID = 1000,
-        Prefab = 1001,
+        PrefabInstance = 1001,
         EditorExtensionImpl = 1002,
         AssetImporter = 1003,
-        AssetDatabase = 1004,
+        AssetDatabaseV1 = 1004,
         Mesh3DSImporter = 1005,
         TextureImporter = 1006,
         ShaderImporter = 1007,
@@ -259,13 +265,13 @@
         AnimatorState = 1102,
         HumanTemplate = 1105,
         AnimatorStateMachine = 1107,
-        PreviewAssetType = 1108,
+        PreviewAnimationClip = 1108,
         AnimatorTransition = 1109,
         SpeedTreeImporter = 1110,
         AnimatorTransitionBase = 1111,
         SubstanceImporter = 1112,
         LightmapParameters = 1113,
-        LightmapSnapshot = 1120,
+        LightingDataAsset = 1120,
         GISRaster = 1121,
         GISRasterImporter = 1122,
         CadImporter = 1123,
@@ -276,11 +282,98 @@
         ActivationLogComponent = 2000,
         //kLargestEditorClassID = 2001
         //kClassIdOutOfHierarchy = 100000
-        SubDerived = 367388927,
+        //int = 100000,
+        //bool = 100001,
+        //float = 100002,
+        MonoObject = 100003,
+        Collision = 100004,
+        Vector3f = 100005,
+        RootMotionData = 100006,
+        Collision2D = 100007,
+        AudioMixerLiveUpdateFloat = 100008,
+        AudioMixerLiveUpdateBool = 100009,
+        Polygon2D = 100010,
+        //void = 100011,
+        TilemapCollider2D = 19719996,
+        AssetImporterLog = 41386430,
+        VFXRenderer = 73398921,
+        SerializableManagedRefTestClass = 76251197,
+        Grid = 156049354,
+        ScenesUsingAssets = 156483287,
+        ArticulationBody = 171741748,
+        Preset = 181963792,
+        EmptyObject = 277625683,
+        IConstraint = 285090594,
+        TestObjectWithSpecialLayoutOne = 293259124,
+        AssemblyDefinitionReferenceImporter = 294290339,
         SiblingDerived = 334799969,
+        TestObjectWithSerializedMapStringNonAlignedStruct = 342846651,
+        SubDerived = 367388927,
+        AssetImportInProgressProxy = 369655926,
+        PluginBuildInfo = 382020655,
+        EditorProjectAccess = 426301858,
+        PrefabImporter = 468431735,
+        TestObjectWithSerializedArray = 478637458,
+        TestObjectWithSerializedAnimationCurve = 478637459,
+        TilemapRenderer = 483693784,
+        ScriptableCamera = 488575907,
+        SpriteAtlasAsset = 612988286,
+        SpriteAtlasDatabase = 638013454,
+        AudioBuildInfo = 641289076,
+        CachedSpriteAtlasRuntimeData = 644342135,
+        RendererFake = 646504946,
+        AssemblyDefinitionReferenceAsset = 662584278,
+        BuiltAssetBundleInfoSet = 668709126,
         SpriteAtlas = 687078895,
+        RayTracingShaderImporter = 747330370,
+        RayTracingShader = 825902497,
+        LightingSettings = 850595691,
+        PlatformModuleSetup = 877146078,
+        VersionControlSettings = 890905787,
+        AimConstraint = 895512359,
+        VFXManager = 937362698,
+        VisualEffectSubgraph = 994735392,
+        VisualEffectSubgraphOperator = 994735403,
+        VisualEffectSubgraphBlock = 994735404,
+        LocalizationImporter = 1027052791,
         Derived = 1091556383,
+        PropertyModificationsTargetTestObject = 1111377672,
+        ReferencesArtifactGenerator = 1114811875,
+        AssemblyDefinitionAsset = 1152215463,
+        SceneVisibilityState = 1154873562,
+        LookAtConstraint = 1183024399,
+        SpriteAtlasImporter = 1210832254,
+        MultiArtifactTestImporter = 1223240404,
+        GameObjectRecorder = 1268269756,
+        LightingDataAssetParent = 1325145578,
+        PresetManager = 1386491679,
+        TestObjectWithSpecialLayoutTwo = 1392443030,
+        StreamingManager = 1403656975,
         LowerResBlitTexture = 1480428607,
-        RenderPassAttachment = 1571458007
+        StreamingController = 1542919678,
+        RenderPassAttachment = 1571458007,
+        TestObjectVectorPairStringBool = 1628831178,
+        GridLayout = 1742807556,
+        AssemblyDefinitionImporter = 1766753193,
+        ParentConstraint = 1773428102,
+        FakeComponent = 1803986026,
+        PositionConstraint = 1818360608,
+        RotationConstraint = 1818360609,
+        ScaleConstraint = 1818360610,
+        Tilemap = 1839735485,
+        PackageManifest = 1896753125,
+        PackageManifestImporter = 1896753126,
+        TerrainLayer = 1953259897,
+        SpriteShapeRenderer = 1971053207,
+        NativeObjectType = 1977754360,
+        TestObjectWithSerializedMapStringBool = 1981279845,
+        SerializableManagedHost = 1995898324,
+        VisualEffectAsset = 2058629509,
+        VisualEffectImporter = 2058629510,
+        VisualEffectResource = 2058629511,
+        VisualEffectObject = 2059678085,
+        VisualEffect = 2083052967,
+        LocalizationAsset = 2083778819,
+        ScriptedImporter = 2089858483
     }
 }

AssetStudio/Classes/AnimationClip.cs

@@ -637,6 +637,50 @@ namespace AssetStudio
                 m_Binding = new ValueArrayConstant(reader);
             }
         }
+
+        public AnimationClipBindingConstant ConvertValueArrayToGenericBinding()
+        {
+            var bindings = new AnimationClipBindingConstant();
+            var genericBindings = new List<GenericBinding>();
+            var values = m_Binding;
+            for (int i = 0; i < values.m_ValueArray.Length;)
+            {
+                var curveID = values.m_ValueArray[i].m_ID;
+                var curveTypeID = values.m_ValueArray[i].m_TypeID;
+                var binding = new GenericBinding();
+                genericBindings.Add(binding);
+                if (curveTypeID == 4174552735) //CRC(PositionX))
+                {
+                    binding.path = curveID;
+                    binding.attribute = 1; //kBindTransformPosition
+                    binding.typeID = ClassIDType.Transform;
+                    i += 3;
+                }
+                else if (curveTypeID == 2211994246) //CRC(QuaternionX))
+                {
+                    binding.path = curveID;
+                    binding.attribute = 2; //kBindTransformRotation
+                    binding.typeID = ClassIDType.Transform;
+                    i += 4;
+                }
+                else if (curveTypeID == 1512518241) //CRC(ScaleX))
+                {
+                    binding.path = curveID;
+                    binding.attribute = 3; //kBindTransformScale
+                    binding.typeID = ClassIDType.Transform;
+                    i += 3;
+                }
+                else
+                {
+                    binding.typeID = ClassIDType.Animator;
+                    binding.path = 0;
+                    binding.attribute = curveID;
+                    i++;
+                }
+            }
+            bindings.genericBindings = genericBindings.ToArray();
+            return bindings;
+        }
     }
 
     public class ValueDelta
@@ -753,6 +797,9 @@ namespace AssetStudio
         public ClassIDType typeID;
         public byte customType;
         public byte isPPtrCurve;
+        public byte isIntCurve;
+
+        public GenericBinding() { }
 
         public GenericBinding(ObjectReader reader)
         {
@@ -770,6 +817,10 @@ namespace AssetStudio
             }
             customType = reader.ReadByte();
             isPPtrCurve = reader.ReadByte();
+            if (version[0] > 2022 || (version[0] == 2022 && version[1] >= 1)) //2022.1 and up
+            {
+                isIntCurve = reader.ReadByte();
+            }
             reader.AlignStream();
         }
     }
@@ -779,6 +830,8 @@ namespace AssetStudio
         public GenericBinding[] genericBindings;
         public PPtr<Object>[] pptrCurveMapping;
 
+        public AnimationClipBindingConstant() { }
+
         public AnimationClipBindingConstant(ObjectReader reader)
         {
             int numBindings = reader.ReadInt32();
@@ -861,9 +914,9 @@ namespace AssetStudio
 
     public enum AnimationType
     {
-        kLegacy = 1,
+        Legacy = 1,
-        kGeneric = 2,
+        Generic = 2,
-        kHumanoid = 3
+        Humanoid = 3
     };
 
     public sealed class AnimationClip : NamedObject
@@ -897,7 +950,7 @@ namespace AssetStudio
             else if (version[0] >= 4)//4.0 and up
             {
                 m_AnimationType = (AnimationType)reader.ReadInt32();
-                if (m_AnimationType == AnimationType.kLegacy)
+                if (m_AnimationType == AnimationType.Legacy)
                     m_Legacy = true;
             }
             else

AssetStudio/Classes/Animator.cs

@@ -31,6 +31,10 @@ namespace AssetStudio
             if (version[0] >= 5) //5.0 and up
             {
                 var m_LinearVelocityBlending = reader.ReadBoolean();
+                if (version[0] > 2021 || (version[0] == 2021 && version[1] >= 2)) //2021.2 and up
+                {
+                    var m_StabilizeFeet = reader.ReadBoolean();
+                }
                 reader.AlignStream();
             }
 

AssetStudio/Classes/AudioClip.cs

@@ -9,7 +9,7 @@ namespace AssetStudio
     public sealed class AudioClip : NamedObject
     {
         public int m_Format;
-        public AudioType m_Type;
+        public FMODSoundType m_Type;
         public bool m_3D;
         public bool m_UseHardware;
 
@@ -27,8 +27,8 @@ namespace AssetStudio
         public AudioCompressionFormat m_CompressionFormat;
 
         public string m_Source;
-        public long m_Offset;
+        public long m_Offset; //ulong
-        public long m_Size;
+        public long m_Size; //ulong
         public ResourceReader m_AudioData;
 
         public AudioClip(ObjectReader reader) : base(reader)
@@ -36,7 +36,7 @@ namespace AssetStudio
             if (version[0] < 5)
             {
                 m_Format = reader.ReadInt32();
-                m_Type = (AudioType)reader.ReadInt32();
+                m_Type = (FMODSoundType)reader.ReadInt32();
                 m_3D = reader.ReadBoolean();
                 m_UseHardware = reader.ReadBoolean();
                 reader.AlignStream();
@@ -48,7 +48,7 @@ namespace AssetStudio
                     var tsize = m_Size % 4 != 0 ? m_Size + 4 - m_Size % 4 : m_Size;
                     if (reader.byteSize + reader.byteStart - reader.Position != tsize)
                     {
-                        m_Offset = reader.ReadInt32();
+                        m_Offset = reader.ReadUInt32();
                         m_Source = assetsFile.fullName + ".resS";
                     }
                 }
@@ -72,6 +72,7 @@ namespace AssetStudio
                 m_Legacy3D = reader.ReadBoolean();
                 reader.AlignStream();
 
+                //StreamedResource m_Resource
                 m_Source = reader.ReadAlignedString();
                 m_Offset = reader.ReadInt64();
                 m_Size = reader.ReadInt64();
@@ -81,44 +82,61 @@ namespace AssetStudio
             ResourceReader resourceReader;
             if (!string.IsNullOrEmpty(m_Source))
             {
-                resourceReader = new ResourceReader(m_Source, assetsFile, m_Offset, (int)m_Size);
+                resourceReader = new ResourceReader(m_Source, assetsFile, m_Offset, m_Size);
             }
             else
             {
-                resourceReader = new ResourceReader(reader, reader.BaseStream.Position, (int)m_Size);
+                resourceReader = new ResourceReader(reader, reader.BaseStream.Position, m_Size);
             }
             m_AudioData = resourceReader;
         }
     }
 
-    public enum AudioType
+    public enum FMODSoundType
     {
-        UNKNOWN,
+        UNKNOWN = 0,
-        ACC,
+        ACC = 1,
-        AIFF,
+        AIFF = 2,
+        ASF = 3,
+        AT3 = 4,
+        CDDA = 5,
+        DLS = 6,
+        FLAC = 7,
+        FSB = 8,
+        GCADPCM = 9,
         IT = 10,
+        MIDI = 11,
         MOD = 12,
-        MPEG,
+        MPEG = 13,
-        OGGVORBIS,
+        OGGVORBIS = 14,
+        PLAYLIST = 15,
+        RAW = 16,
         S3M = 17,
+        SF2 = 18,
+        USER = 19,
         WAV = 20,
-        XM,
+        XM = 21,
-        XMA,
+        XMA = 22,
-        VAG,
+        VAG = 23,
-        AUDIOQUEUE
+        AUDIOQUEUE = 24,
+        XWMA = 25,
+        BCWAV = 26,
+        AT9 = 27,
+        VORBIS = 28,
+        MEDIA_FOUNDATION = 29
     }
 
     public enum AudioCompressionFormat
     {
-        PCM,
+        PCM = 0,
-        Vorbis,
+        Vorbis = 1,
-        ADPCM,
+        ADPCM = 2,
-        MP3,
+        MP3 = 3,
-        VAG,
+        PSMVAG = 4,
-        HEVAG,
+        HEVAG = 5,
-        XMA,
+        XMA = 6,
-        AAC,
+        AAC = 7,
-        GCADPCM,
+        GCADPCM = 8,
-        ATRAC9
+        ATRAC9 = 9
     }
 }

AssetStudio/Classes/Material.cs

@@ -19,11 +19,14 @@ namespace AssetStudio
     public class UnityPropertySheet
     {
         public KeyValuePair<string, UnityTexEnv>[] m_TexEnvs;
+        public KeyValuePair<string, int>[] m_Ints;
         public KeyValuePair<string, float>[] m_Floats;
         public KeyValuePair<string, Color>[] m_Colors;
 
         public UnityPropertySheet(ObjectReader reader)
         {
+            var version = reader.version;
+
             int m_TexEnvsSize = reader.ReadInt32();
             m_TexEnvs = new KeyValuePair<string, UnityTexEnv>[m_TexEnvsSize];
             for (int i = 0; i < m_TexEnvsSize; i++)
@@ -31,6 +34,16 @@ namespace AssetStudio
                 m_TexEnvs[i] = new KeyValuePair<string, UnityTexEnv>(reader.ReadAlignedString(), new UnityTexEnv(reader));
             }
 
+            if (version[0] >= 2021) //2021.1 and up
+            {
+                int m_IntsSize = reader.ReadInt32();
+                m_Ints = new KeyValuePair<string, int>[m_IntsSize];
+                for (int i = 0; i < m_IntsSize; i++)
+                {
+                    m_Ints[i] = new KeyValuePair<string, int>(reader.ReadAlignedString(), reader.ReadInt32());
+                }
+            }
+
             int m_FloatsSize = reader.ReadInt32();
             m_Floats = new KeyValuePair<string, float>[m_FloatsSize];
             for (int i = 0; i < m_FloatsSize; i++)
@@ -61,9 +74,18 @@ namespace AssetStudio
                 var m_ShaderKeywords = reader.ReadStringArray();
             }
 
-            if (version[0] >= 5) //5.0 and up
+            if (version[0] > 2021 || (version[0] == 2021 && version[1] >= 3)) //2021.3 and up
+            {
+                var m_ValidKeywords = reader.ReadStringArray();
+                var m_InvalidKeywords = reader.ReadStringArray();
+            }
+            else if (version[0] >= 5) //5.0 ~ 2021.2
             {
                 var m_ShaderKeywords = reader.ReadAlignedString();
+            }
+
+            if (version[0] >= 5) //5.0 and up
+            {
                 var m_LightmapFlags = reader.ReadUInt32();
             }
 
@@ -95,6 +117,8 @@ namespace AssetStudio
             }
 
             m_SavedProperties = new UnityPropertySheet(reader);
+
+            //vector m_BuildTextureStacks 2020 and up
         }
     }
 }

AssetStudio/Classes/Mesh.cs

@@ -174,7 +174,7 @@ namespace AssetStudio
                 GetStreams(version);
             }
 
-            m_DataSize = reader.ReadBytes(reader.ReadInt32());
+            m_DataSize = reader.ReadUInt8Array();
             reader.AlignStream();
         }
 
@@ -195,7 +195,7 @@ namespace AssetStudio
                         if (m_Channel.dimension > 0)
                         {
                             chnMask |= 1u << chn;
-                            stride += m_Channel.dimension * MeshHelper.GetFormatSize(version, m_Channel.format);
+                            stride += m_Channel.dimension * MeshHelper.GetFormatSize(MeshHelper.ToVertexFormat(m_Channel.format, version));
                         }
                     }
                 }
@@ -253,7 +253,7 @@ namespace AssetStudio
                                 m_Channel.dimension = 4;
                                 break;
                         }
-                        offset += (byte)(m_Channel.dimension * MeshHelper.GetFormatSize(version, m_Channel.format));
+                        offset += (byte)(m_Channel.dimension * MeshHelper.GetFormatSize(MeshHelper.ToVertexFormat(m_Channel.format, version)));
                     }
                 }
             }
@@ -396,14 +396,14 @@ namespace AssetStudio
         }
     }
 
-    public enum GfxPrimitiveType : int
+    public enum GfxPrimitiveType
     {
-        kPrimitiveTriangles = 0,
+        Triangles = 0,
-        kPrimitiveTriangleStrip = 1,
+        TriangleStrip = 1,
-        kPrimitiveQuads = 2,
+        Quads = 2,
-        kPrimitiveLines = 3,
+        Lines = 3,
-        kPrimitiveLineStrip = 4,
+        LineStrip = 4,
-        kPrimitivePoints = 5,
+        Points = 5
     };
 
     public class SubMesh
@@ -446,7 +446,7 @@ namespace AssetStudio
 
     public sealed class Mesh : NamedObject
     {
-        private bool m_Use16BitIndices = true; //3.5.0 and newer always uses 16bit indices;
+        private bool m_Use16BitIndices = true;
         public SubMesh[] m_SubMeshes;
         private uint[] m_IndexBuffer;
         public BlendShapeData m_Shapes;
@@ -550,6 +550,7 @@ namespace AssetStudio
                     ((version[0] == 2017 && version[1] == 3) && m_MeshCompression == 0))//2017.3.xfx with no compression
                 {
                     var m_IndexFormat = reader.ReadInt32();
+                    m_Use16BitIndices = m_IndexFormat == 0;
                 }
 
                 int m_IndexBuffer_size = reader.ReadInt32();
@@ -650,11 +651,16 @@ namespace AssetStudio
 
             int m_MeshUsageFlags = reader.ReadInt32();
 
+            if (version[0] > 2022 || (version[0] == 2022 && version[1] >= 1)) //2022.1 and up
+            {
+                int m_CookingOptions = reader.ReadInt32();
+            }
+
             if (version[0] >= 5) //5.0 and up
             {
-                var m_BakedConvexCollisionMesh = reader.ReadBytes(reader.ReadInt32());
+                var m_BakedConvexCollisionMesh = reader.ReadUInt8Array();
                 reader.AlignStream();
-                var m_BakedTriangleCollisionMesh = reader.ReadBytes(reader.ReadInt32());
+                var m_BakedTriangleCollisionMesh = reader.ReadUInt8Array();
                 reader.AlignStream();
             }
 
@@ -680,7 +686,7 @@ namespace AssetStudio
             {
                 if (m_VertexData.m_VertexCount > 0)
                 {
-                    var resourceReader = new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, (int)m_StreamData.size);
+                    var resourceReader = new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size);
                     m_VertexData.m_DataSize = resourceReader.GetData();
                 }
             }
@@ -710,12 +716,13 @@ namespace AssetStudio
                     var channelMask = new BitArray(new[] { (int)m_Stream.channelMask });
                     if (channelMask.Get(chn))
                     {
-                        if (version[0] < 2018 && chn == 2 && m_Channel.format == 2)
+                        if (version[0] < 2018 && chn == 2 && m_Channel.format == 2) //kShaderChannelColor && kChannelFormatColor
                         {
                             m_Channel.dimension = 4;
                         }
 
-                        var componentByteSize = (int)MeshHelper.GetFormatSize(version, m_Channel.format);
+                        var vertexFormat = MeshHelper.ToVertexFormat(m_Channel.format, version);
+                        var componentByteSize = (int)MeshHelper.GetFormatSize(vertexFormat);
                         var componentBytes = new byte[m_VertexCount * m_Channel.dimension * componentByteSize];
                         for (int v = 0; v < m_VertexCount; v++)
                         {
@@ -727,7 +734,7 @@ namespace AssetStudio
                             }
                         }
 
-                        if (reader.endian == EndianType.BigEndian && componentByteSize > 1) //swap bytes
+                        if (reader.Endian == EndianType.BigEndian && componentByteSize > 1) //swap bytes
                         {
                             for (var i = 0; i < componentBytes.Length / componentByteSize; i++)
                             {
@@ -740,10 +747,10 @@ namespace AssetStudio
 
                         int[] componentsIntArray = null;
                         float[] componentsFloatArray = null;
-                        if (MeshHelper.IsIntFormat(version, m_Channel.format))
+                        if (MeshHelper.IsIntFormat(vertexFormat))
-                            componentsIntArray = MeshHelper.BytesToIntArray(componentBytes, componentByteSize);
+                            componentsIntArray = MeshHelper.BytesToIntArray(componentBytes, vertexFormat);
                         else
-                            componentsFloatArray = MeshHelper.BytesToFloatArray(componentBytes, componentByteSize);
+                            componentsFloatArray = MeshHelper.BytesToFloatArray(componentBytes, vertexFormat);
 
                         if (version[0] >= 2018)
                         {
@@ -1058,7 +1065,7 @@ namespace AssetStudio
                 }
                 var indexCount = m_SubMesh.indexCount;
                 var topology = m_SubMesh.topology;
-                if (topology == GfxPrimitiveType.kPrimitiveTriangles)
+                if (topology == GfxPrimitiveType.Triangles)
                 {
                     for (int i = 0; i < indexCount; i += 3)
                     {
@@ -1067,7 +1074,7 @@ namespace AssetStudio
                         m_Indices.Add(m_IndexBuffer[firstIndex + i + 2]);
                     }
                 }
-                else if (version[0] < 4 || topology == GfxPrimitiveType.kPrimitiveTriangleStrip)
+                else if (version[0] < 4 || topology == GfxPrimitiveType.TriangleStrip)
                 {
                     // de-stripify :
                     uint triIndex = 0;
@@ -1098,7 +1105,7 @@ namespace AssetStudio
                     //fix indexCount
                     m_SubMesh.indexCount = triIndex;
                 }
-                else if (topology == GfxPrimitiveType.kPrimitiveQuads)
+                else if (topology == GfxPrimitiveType.Quads)
                 {
                     for (int q = 0; q < indexCount; q += 4)
                     {
@@ -1189,189 +1196,188 @@ namespace AssetStudio
 
     public static class MeshHelper
     {
-        private enum VertexChannelFormat
+        public enum VertexChannelFormat
         {
-            kChannelFormatFloat,
+            Float,
-            kChannelFormatFloat16,
+            Float16,
-            kChannelFormatColor,
+            Color,
-            kChannelFormatByte,
+            Byte,
-            kChannelFormatUInt32
+            UInt32
         }
 
-        private enum VertexFormat
+        public enum VertexFormat2017
         {
-            kVertexFormatFloat,
+            Float,
-            kVertexFormatFloat16,
+            Float16,
-            kVertexFormatColor,
+            Color,
-            kVertexFormatUNorm8,
+            UNorm8,
-            kVertexFormatSNorm8,
+            SNorm8,
-            kVertexFormatUNorm16,
+            UNorm16,
-            kVertexFormatSNorm16,
+            SNorm16,
-            kVertexFormatUInt8,
+            UInt8,
-            kVertexFormatSInt8,
+            SInt8,
-            kVertexFormatUInt16,
+            UInt16,
-            kVertexFormatSInt16,
+            SInt16,
-            kVertexFormatUInt32,
+            UInt32,
-            kVertexFormatSInt32
+            SInt32
         }
 
-        private enum VertexFormatV2019
+        public enum VertexFormat
         {
-            kVertexFormatFloat,
+            Float,
-            kVertexFormatFloat16,
+            Float16,
-            kVertexFormatUNorm8,
+            UNorm8,
-            kVertexFormatSNorm8,
+            SNorm8,
-            kVertexFormatUNorm16,
+            UNorm16,
-            kVertexFormatSNorm16,
+            SNorm16,
-            kVertexFormatUInt8,
+            UInt8,
-            kVertexFormatSInt8,
+            SInt8,
-            kVertexFormatUInt16,
+            UInt16,
-            kVertexFormatSInt16,
+            SInt16,
-            kVertexFormatUInt32,
+            UInt32,
-            kVertexFormatSInt32
+            SInt32
         }
 
-        public static uint GetFormatSize(int[] version, int format)
+        public static VertexFormat ToVertexFormat(int format, int[] version)
         {
             if (version[0] < 2017)
             {
                 switch ((VertexChannelFormat)format)
                 {
-                    case VertexChannelFormat.kChannelFormatFloat:
+                    case VertexChannelFormat.Float:
-                        return 4u;
+                        return VertexFormat.Float;
-                    case VertexChannelFormat.kChannelFormatFloat16:
+                    case VertexChannelFormat.Float16:
-                        return 2u;
+                        return VertexFormat.Float16;
-                    case VertexChannelFormat.kChannelFormatColor: //in 4.x is size 4
+                    case VertexChannelFormat.Color: //in 4.x is size 4
-                        return 1u;
+                        return VertexFormat.UNorm8;
-                    case VertexChannelFormat.kChannelFormatByte:
+                    case VertexChannelFormat.Byte:
-                        return 1u;
+                        return VertexFormat.UInt8;
-                    case VertexChannelFormat.kChannelFormatUInt32: //in 5.x
+                    case VertexChannelFormat.UInt32: //in 5.x
-                        return 4u;
+                        return VertexFormat.UInt32;
                     default:
                         throw new ArgumentOutOfRangeException(nameof(format), format, null);
                 }
             }
             else if (version[0] < 2019)
             {
-                switch ((VertexFormat)format)
+                switch ((VertexFormat2017)format)
                 {
-                    case VertexFormat.kVertexFormatFloat:
+                    case VertexFormat2017.Float:
-                        return 4u;
+                        return VertexFormat.Float;
-                    case VertexFormat.kVertexFormatFloat16:
+                    case VertexFormat2017.Float16:
-                        return 2u;
+                        return VertexFormat.Float16;
-                    case VertexFormat.kVertexFormatColor:
+                    case VertexFormat2017.Color:
-                        return 1u;
+                    case VertexFormat2017.UNorm8:
-                    case VertexFormat.kVertexFormatUNorm8:
+                        return VertexFormat.UNorm8;
-                        return 1u;
+                    case VertexFormat2017.SNorm8:
-                    case VertexFormat.kVertexFormatSNorm8:
+                        return VertexFormat.SNorm8;
-                        return 1u;
+                    case VertexFormat2017.UNorm16:
-                    case VertexFormat.kVertexFormatUNorm16:
+                        return VertexFormat.UNorm16;
-                        return 2u;
+                    case VertexFormat2017.SNorm16:
-                    case VertexFormat.kVertexFormatSNorm16:
+                        return VertexFormat.SNorm16;
-                        return 2u;
+                    case VertexFormat2017.UInt8:
-                    case VertexFormat.kVertexFormatUInt8:
+                        return VertexFormat.UInt8;
-                        return 1u;
+                    case VertexFormat2017.SInt8:
-                    case VertexFormat.kVertexFormatSInt8:
+                        return VertexFormat.SInt8;
-                        return 1u;
+                    case VertexFormat2017.UInt16:
-                    case VertexFormat.kVertexFormatUInt16:
+                        return VertexFormat.UInt16;
-                        return 2u;
+                    case VertexFormat2017.SInt16:
-                    case VertexFormat.kVertexFormatSInt16:
+                        return VertexFormat.SInt16;
-                        return 2u;
+                    case VertexFormat2017.UInt32:
-                    case VertexFormat.kVertexFormatUInt32:
+                        return VertexFormat.UInt32;
-                        return 4u;
+                    case VertexFormat2017.SInt32:
-                    case VertexFormat.kVertexFormatSInt32:
+                        return VertexFormat.SInt32;
-                        return 4u;
                     default:
                         throw new ArgumentOutOfRangeException(nameof(format), format, null);
                 }
             }
             else
             {
-                switch ((VertexFormatV2019)format)
+                return (VertexFormat)format;
+            }
+        }
+
+
+        public static uint GetFormatSize(VertexFormat format)
         {
-                    case VertexFormatV2019.kVertexFormatFloat:
+            switch (format)
+            {
+                case VertexFormat.Float:
+                case VertexFormat.UInt32:
+                case VertexFormat.SInt32:
                     return 4u;
-                    case VertexFormatV2019.kVertexFormatFloat16:
+                case VertexFormat.Float16:
+                case VertexFormat.UNorm16:
+                case VertexFormat.SNorm16:
+                case VertexFormat.UInt16:
+                case VertexFormat.SInt16:
                     return 2u;
-                    case VertexFormatV2019.kVertexFormatUNorm8:
+                case VertexFormat.UNorm8:
+                case VertexFormat.SNorm8:
+                case VertexFormat.UInt8:
+                case VertexFormat.SInt8:
                     return 1u;
-                    case VertexFormatV2019.kVertexFormatSNorm8:
-                        return 1u;
-                    case VertexFormatV2019.kVertexFormatUNorm16:
-                        return 2u;
-                    case VertexFormatV2019.kVertexFormatSNorm16:
-                        return 2u;
-                    case VertexFormatV2019.kVertexFormatUInt8:
-                        return 1u;
-                    case VertexFormatV2019.kVertexFormatSInt8:
-                        return 1u;
-                    case VertexFormatV2019.kVertexFormatUInt16:
-                        return 2u;
-                    case VertexFormatV2019.kVertexFormatSInt16:
-                        return 2u;
-                    case VertexFormatV2019.kVertexFormatUInt32:
-                        return 4u;
-                    case VertexFormatV2019.kVertexFormatSInt32:
-                        return 4u;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(format), format, null);
             }
         }
+
+        public static bool IsIntFormat(VertexFormat format)
+        {
+            return format >= VertexFormat.UInt8;
         }
 
-        public static bool IsIntFormat(int[] version, int format)
+        public static float[] BytesToFloatArray(byte[] inputBytes, VertexFormat format)
         {
-            if (version[0] < 2017)
+            var size = GetFormatSize(format);
+            var len = inputBytes.Length / size;
+            var result = new float[len];
+            for (int i = 0; i < len; i++)
             {
-                return format == 4;
+                switch (format)
-            }
-            else if (version[0] < 2019)
                 {
-                return format >= 7;
+                    case VertexFormat.Float:
-            }
+                        result[i] = BitConverter.ToSingle(inputBytes, i * 4);
-            else
-            {
-                return format >= 6;
-            }
-        }
-
-        public static float[] BytesToFloatArray(byte[] inputBytes, int size)
-        {
-            var result = new float[inputBytes.Length / size];
-            for (int i = 0; i < inputBytes.Length / size; i++)
-            {
-                var value = 0f;
-                switch (size)
-                {
-                    case 1:
-                        value = inputBytes[i] / 255.0f;
                         break;
-                    case 2:
+                    case VertexFormat.Float16:
-                        value = Half.ToHalf(inputBytes, i * 2);
+                        result[i] = Half.ToHalf(inputBytes, i * 2);
                         break;
-                    case 4:
+                    case VertexFormat.UNorm8:
-                        value = BitConverter.ToSingle(inputBytes, i * 4);
+                        result[i] = inputBytes[i] / 255f;
+                        break;
+                    case VertexFormat.SNorm8:
+                        result[i] = Math.Max((sbyte)inputBytes[i] / 127f, -1f);
+                        break;
+                    case VertexFormat.UNorm16:
+                        result[i] = BitConverter.ToUInt16(inputBytes, i * 2) / 65535f;
+                        break;
+                    case VertexFormat.SNorm16:
+                        result[i] = Math.Max(BitConverter.ToInt16(inputBytes, i * 2) / 32767f, -1f);
                         break;
                 }
-                result[i] = value;
             }
             return result;
         }
 
-        public static int[] BytesToIntArray(byte[] inputBytes, int size)
+        public static int[] BytesToIntArray(byte[] inputBytes, VertexFormat format)
         {
-            var result = new int[inputBytes.Length / size];
+            var size = GetFormatSize(format);
-            for (int i = 0; i < inputBytes.Length / size; i++)
+            var len = inputBytes.Length / size;
+            var result = new int[len];
+            for (int i = 0; i < len; i++)
             {
-                switch (size)
+                switch (format)
                 {
-                    case 1:
+                    case VertexFormat.UInt8:
+                    case VertexFormat.SInt8:
                         result[i] = inputBytes[i];
                         break;
-                    case 2:
+                    case VertexFormat.UInt16:
+                    case VertexFormat.SInt16:
                         result[i] = BitConverter.ToInt16(inputBytes, i * 2);
                         break;
-                    case 4:
+                    case VertexFormat.UInt32:
+                    case VertexFormat.SInt32:
                         result[i] = BitConverter.ToInt32(inputBytes, i * 4);
                         break;
                 }

AssetStudio/Classes/MonoScript.cs

@@ -8,7 +8,7 @@ namespace AssetStudio
     public sealed class MonoScript : NamedObject
     {
         public string m_ClassName;
-        public string m_Namespace = string.Empty;
+        public string m_Namespace;
         public string m_AssemblyName;
 
         public MonoScript(ObjectReader reader) : base(reader)

AssetStudio/Classes/MovieTexture.cs

@@ -15,7 +15,7 @@ namespace AssetStudio
             var m_Loop = reader.ReadBoolean();
             reader.AlignStream();
             m_AudioClip = new PPtr<AudioClip>(reader);
-            m_MovieData = reader.ReadBytes(reader.ReadInt32());
+            m_MovieData = reader.ReadUInt8Array();
         }
     }
 }

AssetStudio/Classes/Object.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Collections.Specialized;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace AssetStudio
 {
@@ -36,19 +33,38 @@ namespace AssetStudio
             }
         }
 
-        protected bool HasStructMember(string name)
-        {
-            return serializedType?.m_Nodes != null && serializedType.m_Nodes.Any(x => x.m_Name == name);
-        }
-
         public string Dump()
         {
-            reader.Reset();
+            if (serializedType?.m_Type != null)
-            if (serializedType?.m_Nodes != null)
             {
-                var sb = new StringBuilder();
+                return TypeTreeHelper.ReadTypeString(serializedType.m_Type, reader);
-                TypeTreeHelper.ReadTypeString(sb, serializedType.m_Nodes, reader);
+            }
-                return sb.ToString();
+            return null;
+        }
+
+        public string Dump(TypeTree m_Type)
+        {
+            if (m_Type != null)
+            {
+                return TypeTreeHelper.ReadTypeString(m_Type, reader);
+            }
+            return null;
+        }
+
+        public OrderedDictionary ToType()
+        {
+            if (serializedType?.m_Type != null)
+            {
+                return TypeTreeHelper.ReadType(serializedType.m_Type, reader);
+            }
+            return null;
+        }
+
+        public OrderedDictionary ToType(TypeTree m_Type)
+        {
+            if (m_Type != null)
+            {
+                return TypeTreeHelper.ReadType(m_Type, reader);
             }
             return null;
         }

AssetStudio/Classes/PPtr.cs

@@ -13,7 +13,7 @@ namespace AssetStudio
         public PPtr(ObjectReader reader)
         {
             m_FileID = reader.ReadInt32();
-            m_PathID = reader.m_Version < 14 ? reader.ReadInt32() : reader.ReadInt64();
+            m_PathID = reader.m_Version < SerializedFileFormatVersion.Unknown_14 ? reader.ReadInt32() : reader.ReadInt64();
             assetsFile = reader.assetsFile;
         }
 

AssetStudio/Classes/Renderer.cs

@@ -43,6 +43,10 @@ namespace AssetStudio
                     {
                         var m_DynamicOccludee = reader.ReadByte();
                     }
+                    if (version[0] >= 2021) //2021.1 and up
+                    {
+                        var m_StaticShadowCaster = reader.ReadByte();
+                    }
                     var m_MotionVectors = reader.ReadByte();
                     var m_LightProbeUsage = reader.ReadByte();
                     var m_ReflectionProbeUsage = reader.ReadByte();
@@ -50,6 +54,10 @@ namespace AssetStudio
                     {
                         var m_RayTracingMode = reader.ReadByte();
                     }
+                    if (version[0] >= 2020) //2020.1 and up
+                    {
+                        var m_RayTraceProcedural = reader.ReadByte();
+                    }
                     reader.AlignStream();
                 }
                 else

AssetStudio/Classes/ResourceManager.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+namespace AssetStudio
+{
+    public class ResourceManager : Object
+    {
+        public KeyValuePair<string, PPtr<Object>>[] m_Container;
+
+        public ResourceManager(ObjectReader reader) : base(reader)
+        {
+            var m_ContainerSize = reader.ReadInt32();
+            m_Container = new KeyValuePair<string, PPtr<Object>>[m_ContainerSize];
+            for (int i = 0; i < m_ContainerSize; i++)
+            {
+                m_Container[i] = new KeyValuePair<string, PPtr<Object>>(reader.ReadAlignedString(), new PPtr<Object>(reader));
+            }
+        }
+    }
+}

AssetStudio/Classes/Shader.cs

@@ -5,6 +5,16 @@ using System.Linq;
 
 namespace AssetStudio
 {
+    public class Hash128
+    {
+        public byte[] bytes;
+
+        public Hash128(BinaryReader reader)
+        {
+            bytes = reader.ReadBytes(16);
+        }
+    }
+
     public class StructParameter
     {
         public MatrixParameter[] m_MatrixParams;
@@ -46,15 +56,14 @@ namespace AssetStudio
     }
     public enum TextureDimension
     {
-        kTexDimUnknown = -1,
+        Unknown = -1,
-        kTexDimNone = 0,
+        None = 0,
-        kTexDimAny = 1,
+        Any = 1,
-        kTexDim2D = 2,
+        Tex2D = 2,
-        kTexDim3D = 3,
+        Tex3D = 3,
-        kTexDimCUBE = 4,
+        Cube = 4,
-        kTexDim2DArray = 5,
+        Tex2DArray = 5,
-        kTexDimCubeArray = 6,
+        CubeArray = 6
-        kTexDimForce32Bit = 2147483647
     };
 
     public class SerializedTextureProperty
@@ -71,11 +80,12 @@ namespace AssetStudio
 
     public enum SerializedPropertyType
     {
-        kColor = 0,
+        Color = 0,
-        kVector = 1,
+        Vector = 1,
-        kFloat = 2,
+        Float = 2,
-        kRange = 3,
+        Range = 3,
-        kTexture = 4
+        Texture = 4,
+        Int = 5
     };
 
     public class SerializedProperty
@@ -185,11 +195,11 @@ namespace AssetStudio
 
     public enum FogMode
     {
-        kFogUnknown = -1,
+        Unknown = -1,
-        kFogDisabled = 0,
+        Disabled = 0,
-        kFogLinear = 1,
+        Linear = 1,
-        kFogExp = 2,
+        Exp = 2,
-        kFogExp2 = 3
+        Exp2 = 3
     };
 
     public class SerializedShaderState
@@ -201,6 +211,7 @@ namespace AssetStudio
         public SerializedShaderFloatValue zTest;
         public SerializedShaderFloatValue zWrite;
         public SerializedShaderFloatValue culling;
+        public SerializedShaderFloatValue conservative;
         public SerializedShaderFloatValue offsetFactor;
         public SerializedShaderFloatValue offsetUnits;
         public SerializedShaderFloatValue alphaToMask;
@@ -239,6 +250,10 @@ namespace AssetStudio
             zTest = new SerializedShaderFloatValue(reader);
             zWrite = new SerializedShaderFloatValue(reader);
             culling = new SerializedShaderFloatValue(reader);
+            if (version[0] >= 2020) //2020.1 and up
+            {
+                conservative = new SerializedShaderFloatValue(reader);
+            }
             offsetFactor = new SerializedShaderFloatValue(reader);
             offsetUnits = new SerializedShaderFloatValue(reader);
             alphaToMask = new SerializedShaderFloatValue(reader);
@@ -357,11 +372,18 @@ namespace AssetStudio
     {
         public int m_NameIndex;
         public int m_Index;
+        public int m_ArraySize;
 
-        public BufferBinding(BinaryReader reader)
+        public BufferBinding(ObjectReader reader)
         {
+            var version = reader.version;
+
             m_NameIndex = reader.ReadInt32();
             m_Index = reader.ReadInt32();
+            if (version[0] >= 2020) //2020.1 and up
+            {
+                m_ArraySize = reader.ReadInt32();
+            }
         }
     }
 
@@ -372,6 +394,7 @@ namespace AssetStudio
         public VectorParameter[] m_VectorParams;
         public StructParameter[] m_StructParams;
         public int m_Size;
+        public bool m_IsPartialCB;
 
         public ConstantBuffer(ObjectReader reader)
         {
@@ -402,6 +425,16 @@ namespace AssetStudio
                 }
             }
             m_Size = reader.ReadInt32();
+
+            if ((version[0] == 2020 && version[1] > 3) ||
+               (version[0] == 2020 && version[1] == 3 && version[2] >= 2) || //2020.3.2f1 and up
+               (version[0] > 2021) ||
+               (version[0] == 2021 && version[1] > 1) ||
+               (version[0] == 2021 && version[1] == 1 && version[2] >= 4)) //2021.1.4f1 and up
+            {
+                m_IsPartialCB = reader.ReadBoolean();
+                reader.AlignStream();
+            }
         }
     }
 
@@ -421,35 +454,112 @@ namespace AssetStudio
 
     public enum ShaderGpuProgramType
     {
-        kShaderGpuProgramUnknown = 0,
+        Unknown = 0,
-        kShaderGpuProgramGLLegacy = 1,
+        GLLegacy = 1,
-        kShaderGpuProgramGLES31AEP = 2,
+        GLES31AEP = 2,
-        kShaderGpuProgramGLES31 = 3,
+        GLES31 = 3,
-        kShaderGpuProgramGLES3 = 4,
+        GLES3 = 4,
-        kShaderGpuProgramGLES = 5,
+        GLES = 5,
-        kShaderGpuProgramGLCore32 = 6,
+        GLCore32 = 6,
-        kShaderGpuProgramGLCore41 = 7,
+        GLCore41 = 7,
-        kShaderGpuProgramGLCore43 = 8,
+        GLCore43 = 8,
-        kShaderGpuProgramDX9VertexSM20 = 9,
+        DX9VertexSM20 = 9,
-        kShaderGpuProgramDX9VertexSM30 = 10,
+        DX9VertexSM30 = 10,
-        kShaderGpuProgramDX9PixelSM20 = 11,
+        DX9PixelSM20 = 11,
-        kShaderGpuProgramDX9PixelSM30 = 12,
+        DX9PixelSM30 = 12,
-        kShaderGpuProgramDX10Level9Vertex = 13,
+        DX10Level9Vertex = 13,
-        kShaderGpuProgramDX10Level9Pixel = 14,
+        DX10Level9Pixel = 14,
-        kShaderGpuProgramDX11VertexSM40 = 15,
+        DX11VertexSM40 = 15,
-        kShaderGpuProgramDX11VertexSM50 = 16,
+        DX11VertexSM50 = 16,
-        kShaderGpuProgramDX11PixelSM40 = 17,
+        DX11PixelSM40 = 17,
-        kShaderGpuProgramDX11PixelSM50 = 18,
+        DX11PixelSM50 = 18,
-        kShaderGpuProgramDX11GeometrySM40 = 19,
+        DX11GeometrySM40 = 19,
-        kShaderGpuProgramDX11GeometrySM50 = 20,
+        DX11GeometrySM50 = 20,
-        kShaderGpuProgramDX11HullSM50 = 21,
+        DX11HullSM50 = 21,
-        kShaderGpuProgramDX11DomainSM50 = 22,
+        DX11DomainSM50 = 22,
-        kShaderGpuProgramMetalVS = 23,
+        MetalVS = 23,
-        kShaderGpuProgramMetalFS = 24,
+        MetalFS = 24,
-        kShaderGpuProgramSPIRV = 25,
+        SPIRV = 25,
-        kShaderGpuProgramConsole = 26
+        ConsoleVS = 26,
+        ConsoleFS = 27,
+        ConsoleHS = 28,
+        ConsoleDS = 29,
+        ConsoleGS = 30,
+        RayTracing = 31,
+        PS5NGGC = 32
     };
 
+    public class SerializedProgramParameters
+    {
+        public VectorParameter[] m_VectorParams;
+        public MatrixParameter[] m_MatrixParams;
+        public TextureParameter[] m_TextureParams;
+        public BufferBinding[] m_BufferParams;
+        public ConstantBuffer[] m_ConstantBuffers;
+        public BufferBinding[] m_ConstantBufferBindings;
+        public UAVParameter[] m_UAVParams;
+        public SamplerParameter[] m_Samplers;
+
+        public SerializedProgramParameters(ObjectReader reader)
+        {
+            int numVectorParams = reader.ReadInt32();
+            m_VectorParams = new VectorParameter[numVectorParams];
+            for (int i = 0; i < numVectorParams; i++)
+            {
+                m_VectorParams[i] = new VectorParameter(reader);
+            }
+
+            int numMatrixParams = reader.ReadInt32();
+            m_MatrixParams = new MatrixParameter[numMatrixParams];
+            for (int i = 0; i < numMatrixParams; i++)
+            {
+                m_MatrixParams[i] = new MatrixParameter(reader);
+            }
+
+            int numTextureParams = reader.ReadInt32();
+            m_TextureParams = new TextureParameter[numTextureParams];
+            for (int i = 0; i < numTextureParams; i++)
+            {
+                m_TextureParams[i] = new TextureParameter(reader);
+            }
+
+            int numBufferParams = reader.ReadInt32();
+            m_BufferParams = new BufferBinding[numBufferParams];
+            for (int i = 0; i < numBufferParams; i++)
+            {
+                m_BufferParams[i] = new BufferBinding(reader);
+            }
+
+            int numConstantBuffers = reader.ReadInt32();
+            m_ConstantBuffers = new ConstantBuffer[numConstantBuffers];
+            for (int i = 0; i < numConstantBuffers; i++)
+            {
+                m_ConstantBuffers[i] = new ConstantBuffer(reader);
+            }
+
+            int numConstantBufferBindings = reader.ReadInt32();
+            m_ConstantBufferBindings = new BufferBinding[numConstantBufferBindings];
+            for (int i = 0; i < numConstantBufferBindings; i++)
+            {
+                m_ConstantBufferBindings[i] = new BufferBinding(reader);
+            }
+
+            int numUAVParams = reader.ReadInt32();
+            m_UAVParams = new UAVParameter[numUAVParams];
+            for (int i = 0; i < numUAVParams; i++)
+            {
+                m_UAVParams[i] = new UAVParameter(reader);
+            }
+
+            int numSamplers = reader.ReadInt32();
+            m_Samplers = new SamplerParameter[numSamplers];
+            for (int i = 0; i < numSamplers; i++)
+            {
+                m_Samplers[i] = new SamplerParameter(reader);
+            }
+        }
+    }
+
     public class SerializedSubProgram
     {
         public uint m_BlobIndex;
@@ -457,6 +567,7 @@ namespace AssetStudio
         public ushort[] m_KeywordIndices;
         public sbyte m_ShaderHardwareTier;
         public ShaderGpuProgramType m_GpuProgramType;
+        public SerializedProgramParameters m_Parameters;
         public VectorParameter[] m_VectorParams;
         public MatrixParameter[] m_MatrixParams;
         public TextureParameter[] m_TextureParams;
@@ -473,7 +584,7 @@ namespace AssetStudio
             m_BlobIndex = reader.ReadUInt32();
             m_Channels = new ParserBindChannels(reader);
 
-            if (version[0] >= 2019) //2019 and up
+            if ((version[0] >= 2019 && version[0] < 2021) || (version[0] == 2021 && version[1] < 2)) //2019 ~2021.1
             {
                 var m_GlobalKeywordIndices = reader.ReadUInt16Array();
                 reader.AlignStream();
@@ -493,6 +604,16 @@ namespace AssetStudio
             m_GpuProgramType = (ShaderGpuProgramType)reader.ReadSByte();
             reader.AlignStream();
 
+            if ((version[0] == 2020 && version[1] > 3) ||
+               (version[0] == 2020 && version[1] == 3 && version[2] >= 2) || //2020.3.2f1 and up
+               (version[0] > 2021) ||
+               (version[0] == 2021 && version[1] > 1) ||
+               (version[0] == 2021 && version[1] == 1 && version[2] >= 1)) //2021.1.1f1 and up
+            {
+                m_Parameters = new SerializedProgramParameters(reader);
+            }
+            else
+            {
                 int numVectorParams = reader.ReadInt32();
                 m_VectorParams = new VectorParameter[numVectorParams];
                 for (int i = 0; i < numVectorParams; i++)
@@ -551,37 +672,69 @@ namespace AssetStudio
                         m_Samplers[i] = new SamplerParameter(reader);
                     }
                 }
+            }
+
             if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 2)) //2017.2 and up
+            {
+                if (version[0] >= 2021) //2021.1 and up
+                {
+                    var m_ShaderRequirements = reader.ReadInt64();
+                }
+                else
                 {
                     var m_ShaderRequirements = reader.ReadInt32();
                 }
             }
         }
+    }
 
     public class SerializedProgram
     {
         public SerializedSubProgram[] m_SubPrograms;
+        public SerializedProgramParameters m_CommonParameters;
+        public ushort[] m_SerializedKeywordStateMask;
 
         public SerializedProgram(ObjectReader reader)
         {
+            var version = reader.version;
+
             int numSubPrograms = reader.ReadInt32();
             m_SubPrograms = new SerializedSubProgram[numSubPrograms];
             for (int i = 0; i < numSubPrograms; i++)
             {
                 m_SubPrograms[i] = new SerializedSubProgram(reader);
             }
+
+            if ((version[0] == 2020 && version[1] > 3) ||
+               (version[0] == 2020 && version[1] == 3 && version[2] >= 2) || //2020.3.2f1 and up
+               (version[0] > 2021) ||
+               (version[0] == 2021 && version[1] > 1) ||
+               (version[0] == 2021 && version[1] == 1 && version[2] >= 1)) //2021.1.1f1 and up
+            {
+                m_CommonParameters = new SerializedProgramParameters(reader);
+            }
+
+            if (version[0] > 2022 || (version[0] == 2022 && version[1] >= 1)) //2022.1 and up
+            {
+                m_SerializedKeywordStateMask = reader.ReadUInt16Array();
+                reader.AlignStream();
+            }
         }
     }
 
     public enum PassType
     {
-        kPassTypeNormal = 0,
+        Normal = 0,
-        kPassTypeUse = 1,
+        Use = 1,
-        kPassTypeGrab = 2
+        Grab = 2
     };
 
     public class SerializedPass
     {
+        public Hash128[] m_EditorDataHash;
+        public byte[] m_Platforms;
+        public ushort[] m_LocalKeywordMask;
+        public ushort[] m_GlobalKeywordMask;
         public KeyValuePair<string, int>[] m_NameIndices;
         public PassType m_Type;
         public SerializedShaderState m_State;
@@ -597,11 +750,32 @@ namespace AssetStudio
         public string m_Name;
         public string m_TextureName;
         public SerializedTagMap m_Tags;
+        public ushort[] m_SerializedKeywordStateMask;
 
         public SerializedPass(ObjectReader reader)
         {
             var version = reader.version;
 
+            if (version[0] > 2020 || (version[0] == 2020 && version[1] >= 2)) //2020.2 and up
+            {
+                int numEditorDataHash = reader.ReadInt32();
+                m_EditorDataHash = new Hash128[numEditorDataHash];
+                for (int i = 0; i < numEditorDataHash; i++)
+                {
+                    m_EditorDataHash[i] = new Hash128(reader);
+                }
+                reader.AlignStream();
+                m_Platforms = reader.ReadUInt8Array();
+                reader.AlignStream();
+                if (version[0] < 2021 || (version[0] == 2021 && version[1] < 2)) //2021.1 and down
+                {
+                    m_LocalKeywordMask = reader.ReadUInt16Array();
+                    reader.AlignStream();
+                    m_GlobalKeywordMask = reader.ReadUInt16Array();
+                    reader.AlignStream();
+                }
+            }
+
             int numIndices = reader.ReadInt32();
             m_NameIndices = new KeyValuePair<string, int>[numIndices];
             for (int i = 0; i < numIndices; i++)
@@ -631,6 +805,11 @@ namespace AssetStudio
             m_Name = reader.ReadAlignedString();
             m_TextureName = reader.ReadAlignedString();
             m_Tags = new SerializedTagMap(reader);
+            if (version[0] == 2021 && version[1] >= 2) //2021.2 ~2021.x
+            {
+                m_SerializedKeywordStateMask = reader.ReadUInt16Array();
+                reader.AlignStream();
+            }
         }
     }
 
@@ -681,18 +860,35 @@ namespace AssetStudio
         }
     }
 
+    public class SerializedCustomEditorForRenderPipeline
+    {
+        public string customEditorName;
+        public string renderPipelineType;
+
+        public SerializedCustomEditorForRenderPipeline(BinaryReader reader)
+        {
+            customEditorName = reader.ReadAlignedString();
+            renderPipelineType = reader.ReadAlignedString();
+        }
+    }
+
     public class SerializedShader
     {
         public SerializedProperties m_PropInfo;
         public SerializedSubShader[] m_SubShaders;
+        public string[] m_KeywordNames;
+        public byte[] m_KeywordFlags;
         public string m_Name;
         public string m_CustomEditorName;
         public string m_FallbackName;
         public SerializedShaderDependency[] m_Dependencies;
+        public SerializedCustomEditorForRenderPipeline[] m_CustomEditorForRenderPipelines;
         public bool m_DisableNoSubshadersMessage;
 
         public SerializedShader(ObjectReader reader)
         {
+            var version = reader.version;
+
             m_PropInfo = new SerializedProperties(reader);
 
             int numSubShaders = reader.ReadInt32();
@@ -702,6 +898,13 @@ namespace AssetStudio
                 m_SubShaders[i] = new SerializedSubShader(reader);
             }
 
+            if (version[0] > 2021 || (version[0] == 2021 && version[1] >= 2)) //2021.2 and up
+            {
+                m_KeywordNames = reader.ReadStringArray();
+                m_KeywordFlags = reader.ReadUInt8Array();
+                reader.AlignStream();
+            }
+
             m_Name = reader.ReadAlignedString();
             m_CustomEditorName = reader.ReadAlignedString();
             m_FallbackName = reader.ReadAlignedString();
@@ -713,6 +916,16 @@ namespace AssetStudio
                 m_Dependencies[i] = new SerializedShaderDependency(reader);
             }
 
+            if (version[0] >= 2021) //2021.1 and up
+            {
+                int m_CustomEditorForRenderPipelinesSize = reader.ReadInt32();
+                m_CustomEditorForRenderPipelines = new SerializedCustomEditorForRenderPipeline[m_CustomEditorForRenderPipelinesSize];
+                for (int i = 0; i < m_CustomEditorForRenderPipelinesSize; i++)
+                {
+                    m_CustomEditorForRenderPipelines[i] = new SerializedCustomEditorForRenderPipeline(reader);
+                }
+            }
+
             m_DisableNoSubshadersMessage = reader.ReadBoolean();
             reader.AlignStream();
         }
@@ -720,28 +933,32 @@ namespace AssetStudio
 
     public enum ShaderCompilerPlatform
     {
-        kShaderCompPlatformNone = -1,
+        None = -1,
-        kShaderCompPlatformGL = 0,
+        GL = 0,
-        kShaderCompPlatformD3D9 = 1,
+        D3D9 = 1,
-        kShaderCompPlatformXbox360 = 2,
+        Xbox360 = 2,
-        kShaderCompPlatformPS3 = 3,
+        PS3 = 3,
-        kShaderCompPlatformD3D11 = 4,
+        D3D11 = 4,
-        kShaderCompPlatformGLES20 = 5,
+        GLES20 = 5,
-        kShaderCompPlatformNaCl = 6,
+        NaCl = 6,
-        kShaderCompPlatformFlash = 7,
+        Flash = 7,
-        kShaderCompPlatformD3D11_9x = 8,
+        D3D11_9x = 8,
-        kShaderCompPlatformGLES3Plus = 9,
+        GLES3Plus = 9,
-        kShaderCompPlatformPSP2 = 10,
+        PSP2 = 10,
-        kShaderCompPlatformPS4 = 11,
+        PS4 = 11,
-        kShaderCompPlatformXboxOne = 12,
+        XboxOne = 12,
-        kShaderCompPlatformPSM = 13,
+        PSM = 13,
-        kShaderCompPlatformMetal = 14,
+        Metal = 14,
-        kShaderCompPlatformOpenGLCore = 15,
+        OpenGLCore = 15,
-        kShaderCompPlatformN3DS = 16,
+        N3DS = 16,
-        kShaderCompPlatformWiiU = 17,
+        WiiU = 17,
-        kShaderCompPlatformVulkan = 18,
+        Vulkan = 18,
-        kShaderCompPlatformSwitch = 19,
+        Switch = 19,
-        kShaderCompPlatformXboxOneD3D12 = 20
+        XboxOneD3D12 = 20,
+        GameCoreXboxOne = 21,
+        GameCoreScarlett = 22,
+        PS5 = 23,
+        PS5NGGC = 24
     };
 
     public class Shader : NamedObject
@@ -753,9 +970,9 @@ namespace AssetStudio
         //5.5 and up
         public SerializedShader m_ParsedForm;
         public ShaderCompilerPlatform[] platforms;
-        public uint[] offsets;
+        public uint[][] offsets;
-        public uint[] compressedLengths;
+        public uint[][] compressedLengths;
-        public uint[] decompressedLengths;
+        public uint[][] decompressedLengths;
         public byte[] compressedBlob;
 
         public Shader(ObjectReader reader) : base(reader)
@@ -766,27 +983,47 @@ namespace AssetStudio
                 platforms = reader.ReadUInt32Array().Select(x => (ShaderCompilerPlatform)x).ToArray();
                 if (version[0] > 2019 || (version[0] == 2019 && version[1] >= 3)) //2019.3 and up
                 {
-                    offsets = reader.ReadUInt32ArrayArray().Select(x => x[0]).ToArray();
+                    offsets = reader.ReadUInt32ArrayArray();
-                    compressedLengths = reader.ReadUInt32ArrayArray().Select(x => x[0]).ToArray();
+                    compressedLengths = reader.ReadUInt32ArrayArray();
-                    decompressedLengths = reader.ReadUInt32ArrayArray().Select(x => x[0]).ToArray();
+                    decompressedLengths = reader.ReadUInt32ArrayArray();
                 }
                 else
                 {
-                    offsets = reader.ReadUInt32Array();
+                    offsets = reader.ReadUInt32Array().Select(x => new[] { x }).ToArray();
-                    compressedLengths = reader.ReadUInt32Array();
+                    compressedLengths = reader.ReadUInt32Array().Select(x => new[] { x }).ToArray();
-                    decompressedLengths = reader.ReadUInt32Array();
+                    decompressedLengths = reader.ReadUInt32Array().Select(x => new[] { x }).ToArray();
                 }
-                compressedBlob = reader.ReadBytes(reader.ReadInt32());
+                compressedBlob = reader.ReadUInt8Array();
+                reader.AlignStream();
+
+                var m_DependenciesCount = reader.ReadInt32();
+                for (int i = 0; i < m_DependenciesCount; i++)
+                {
+                    new PPtr<Shader>(reader);
+                }
+
+                if (version[0] >= 2018)
+                {
+                    var m_NonModifiableTexturesCount = reader.ReadInt32();
+                    for (int i = 0; i < m_NonModifiableTexturesCount; i++)
+                    {
+                        var first = reader.ReadAlignedString();
+                        new PPtr<Texture>(reader);
+                    }
+                }
+
+                var m_ShaderIsBaked = reader.ReadBoolean();
+                reader.AlignStream();
             }
             else
             {
-                m_Script = reader.ReadBytes(reader.ReadInt32());
+                m_Script = reader.ReadUInt8Array();
                 reader.AlignStream();
                 var m_PathName = reader.ReadAlignedString();
                 if (version[0] == 5 && version[1] >= 3) //5.3 - 5.4
                 {
                     decompressedSize = reader.ReadUInt32();
-                    m_SubProgramBlob = reader.ReadBytes(reader.ReadInt32());
+                    m_SubProgramBlob = reader.ReadUInt8Array();
                 }
             }
         }

AssetStudio/Classes/Sprite.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 
 namespace AssetStudio
@@ -19,23 +18,23 @@ namespace AssetStudio
 
     public enum SpritePackingRotation
     {
-        kSPRNone = 0,
+        None = 0,
-        kSPRFlipHorizontal = 1,
+        FlipHorizontal = 1,
-        kSPRFlipVertical = 2,
+        FlipVertical = 2,
-        kSPRRotate180 = 3,
+        Rotate180 = 3,
-        kSPRRotate90 = 4
+        Rotate90 = 4
     };
 
     public enum SpritePackingMode
     {
-        kSPMTight = 0,
+        Tight = 0,
-        kSPMRectangle
+        Rectangle
     };
 
     public enum SpriteMeshType
     {
-        kSpriteMeshTypeFullRect,
+        FullRect,
-        kSpriteMeshTypeTight
+        Tight
     };
 
     public class SpriteSettings
@@ -88,7 +87,7 @@ namespace AssetStudio
         public ushort[] indices;
         public Matrix4x4[] m_Bindpose;
         public BoneWeights4[] m_SourceSkin;
-        public RectangleF textureRect;
+        public Rectf textureRect;
         public Vector2 textureRectOffset;
         public Vector2 atlasRectOffset;
         public SpriteSettings settingsRaw;
@@ -124,7 +123,7 @@ namespace AssetStudio
                     m_SubMeshes[i] = new SubMesh(reader);
                 }
 
-                m_IndexBuffer = reader.ReadBytes(reader.ReadInt32());
+                m_IndexBuffer = reader.ReadUInt8Array();
                 reader.AlignStream();
 
                 m_VertexData = new VertexData(reader);
@@ -156,7 +155,7 @@ namespace AssetStudio
                 }
             }
 
-            textureRect = reader.ReadRectangleF();
+            textureRect = new Rectf(reader);
             textureRectOffset = reader.ReadVector2();
             if (version[0] > 5 || (version[0] == 5 && version[1] >= 6)) //5.6 and up
             {
@@ -176,13 +175,29 @@ namespace AssetStudio
         }
     }
 
+    public class Rectf
+    {
+        public float x;
+        public float y;
+        public float width;
+        public float height;
+
+        public Rectf(BinaryReader reader)
+        {
+            x = reader.ReadSingle();
+            y = reader.ReadSingle();
+            width = reader.ReadSingle();
+            height = reader.ReadSingle();
+        }
+    }
+
     public sealed class Sprite : NamedObject
     {
-        public RectangleF m_Rect;
+        public Rectf m_Rect;
         public Vector2 m_Offset;
         public Vector4 m_Border;
         public float m_PixelsToUnits;
-        public Vector2 m_Pivot;
+        public Vector2 m_Pivot = new Vector2(0.5f, 0.5f);
         public uint m_Extrude;
         public bool m_IsPolygon;
         public KeyValuePair<Guid, long> m_RenderDataKey;
@@ -193,7 +208,7 @@ namespace AssetStudio
 
         public Sprite(ObjectReader reader) : base(reader)
         {
-            m_Rect = reader.ReadRectangleF();
+            m_Rect = new Rectf(reader);
             m_Offset = reader.ReadVector2();
             if (version[0] > 4 || (version[0] == 4 && version[1] >= 5)) //4.5 and up
             {

AssetStudio/Classes/SpriteAtlas.cs

@@ -7,19 +7,20 @@ namespace AssetStudio
     {
         public PPtr<Texture2D> texture;
         public PPtr<Texture2D> alphaTexture;
-        public System.Drawing.RectangleF textureRect;
+        public Rectf textureRect;
         public Vector2 textureRectOffset;
         public Vector2 atlasRectOffset;
         public Vector4 uvTransform;
         public float downscaleMultiplier;
         public SpriteSettings settingsRaw;
+        public SecondarySpriteTexture[] secondaryTextures;
 
         public SpriteAtlasData(ObjectReader reader)
         {
             var version = reader.version;
             texture = new PPtr<Texture2D>(reader);
             alphaTexture = new PPtr<Texture2D>(reader);
-            textureRect = reader.ReadRectangleF();
+            textureRect = new Rectf(reader);
             textureRectOffset = reader.ReadVector2();
             if (version[0] > 2017 || (version[0] == 2017 && version[1] >= 2)) //2017.2 and up
             {
@@ -28,6 +29,16 @@ namespace AssetStudio
             uvTransform = reader.ReadVector4();
             downscaleMultiplier = reader.ReadSingle();
             settingsRaw = new SpriteSettings(reader);
+            if (version[0] > 2020 || (version[0] == 2020 && version[1] >= 2)) //2020.2 and up
+            {
+                var secondaryTexturesSize = reader.ReadInt32();
+                secondaryTextures = new SecondarySpriteTexture[secondaryTexturesSize];
+                for (int i = 0; i < secondaryTexturesSize; i++)
+                {
+                    secondaryTextures[i] = new SecondarySpriteTexture(reader);
+                }
+                reader.AlignStream();
+            }
         }
     }
 
@@ -35,6 +46,7 @@ namespace AssetStudio
     {
         public PPtr<Sprite>[] m_PackedSprites;
         public Dictionary<KeyValuePair<Guid, long>, SpriteAtlasData> m_RenderDataMap;
+        public bool m_IsVariant;
 
         public SpriteAtlas(ObjectReader reader) : base(reader)
         {
@@ -56,8 +68,9 @@ namespace AssetStudio
                 var value = new SpriteAtlasData(reader);
                 m_RenderDataMap.Add(new KeyValuePair<Guid, long>(first, second), value);
             }
-            //string m_Tag
+            var m_Tag = reader.ReadAlignedString();
-            //bool m_IsVariant
+            m_IsVariant = reader.ReadBoolean();
+            reader.AlignStream();
         }
     }
 }

AssetStudio/Classes/TextAsset.cs

@@ -12,7 +12,7 @@ namespace AssetStudio
 
         public TextAsset(ObjectReader reader) : base(reader)
         {
-            m_Script = reader.ReadBytes(reader.ReadInt32());
+            m_Script = reader.ReadUInt8Array();
         }
     }
 }

AssetStudio/Classes/Texture.cs

@@ -13,6 +13,10 @@ namespace AssetStudio
             {
                 var m_ForcedFallbackFormat = reader.ReadInt32();
                 var m_DownscaleFallback = reader.ReadBoolean();
+                if (version[0] > 2020 || (version[0] == 2020 && version[1] >= 2)) //2020.2 and up
+                {
+                    var m_IsAlphaChannelOptional = reader.ReadBoolean();
+                }
                 reader.AlignStream();
             }
         }

AssetStudio/Classes/Texture2D.cs

@@ -4,13 +4,22 @@ namespace AssetStudio
 {
     public class StreamingInfo
     {
-        public uint offset;
+        public long offset; //ulong
         public uint size;
         public string path;
 
         public StreamingInfo(ObjectReader reader)
+        {
+            var version = reader.version;
+
+            if (version[0] >= 2020) //2020.1 and up
+            {
+                offset = reader.ReadInt64();
+            }
+            else
             {
                 offset = reader.ReadUInt32();
+            }
             size = reader.ReadUInt32();
             path = reader.ReadAlignedString();
         }
@@ -59,6 +68,10 @@ namespace AssetStudio
             m_Width = reader.ReadInt32();
             m_Height = reader.ReadInt32();
             var m_CompleteImageSize = reader.ReadInt32();
+            if (version[0] >= 2020) //2020.1 and up
+            {
+                var m_MipsStripped = reader.ReadInt32();
+            }
             m_TextureFormat = (TextureFormat)reader.ReadInt32();
             if (version[0] < 5 || (version[0] == 5 && version[1] < 2)) //5.2 down
             {
@@ -68,9 +81,29 @@ namespace AssetStudio
             {
                 m_MipCount = reader.ReadInt32();
             }
-            var m_IsReadable = reader.ReadBoolean(); //2.6.0 and up
+            if (version[0] > 2 || (version[0] == 2 && version[1] >= 6)) //2.6.0 and up
-            var m_ReadAllowed = reader.ReadBoolean(); //3.0.0 - 5.4
+            {
-            //bool m_StreamingMipmaps 2018.2 and up
+                var m_IsReadable = reader.ReadBoolean();
+            }
+            if (version[0] >= 2020) //2020.1 and up
+            {
+                var m_IsPreProcessed = reader.ReadBoolean();
+            }
+            if (version[0] > 2019 || (version[0] == 2019 && version[1] >= 3)) //2019.3 and up
+            {
+                var m_IgnoreMasterTextureLimit = reader.ReadBoolean();
+            }
+            if (version[0] >= 3) //3.0.0 - 5.4
+            {
+                if (version[0] < 5 || (version[0] == 5 && version[1] <= 4))
+                {
+                    var m_ReadAllowed = reader.ReadBoolean();
+                }
+            }
+            if (version[0] > 2018 || (version[0] == 2018 && version[1] >= 2)) //2018.2 and up
+            {
+                var m_StreamingMipmaps = reader.ReadBoolean();
+            }
             reader.AlignStream();
             if (version[0] > 2018 || (version[0] == 2018 && version[1] >= 2)) //2018.2 and up
             {
@@ -87,6 +120,11 @@ namespace AssetStudio
             {
                 var m_ColorSpace = reader.ReadInt32();
             }
+            if (version[0] > 2020 || (version[0] == 2020 && version[1] >= 2)) //2020.2 and up
+            {
+                var m_PlatformBlob = reader.ReadUInt8Array();
+                reader.AlignStream();
+            }
             var image_data_size = reader.ReadInt32();
             if (image_data_size == 0 && ((version[0] == 5 && version[1] >= 3) || version[0] > 5))//5.3.0 and up
             {
@@ -96,7 +134,7 @@ namespace AssetStudio
             ResourceReader resourceReader;
             if (!string.IsNullOrEmpty(m_StreamData?.path))
             {
-                resourceReader = new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, (int)m_StreamData.size);
+                resourceReader = new ResourceReader(m_StreamData.path, assetsFile, m_StreamData.offset, m_StreamData.size);
             }
             else
             {
@@ -113,10 +151,13 @@ namespace AssetStudio
         RGB24,
         RGBA32,
         ARGB32,
-        RGB565 = 7,
+        ARGBFloat,
-        R16 = 9,
+        RGB565,
+        BGR24,
+        R16,
         DXT1,
-        DXT5 = 12,
+        DXT3,
+        DXT5,
         RGBA4444,
         BGRA32,
         RHalf,
@@ -127,11 +168,12 @@ namespace AssetStudio
         RGBAFloat,
         YUY2,
         RGB9e5Float,
-        BC4 = 26,
+        RGBFloat,
-        BC5,
+        BC6H,
-        BC6H = 24,
         BC7,
-        DXT1Crunched = 28,
+        BC4,
+        BC5,
+        DXT1Crunched,
         DXT5Crunched,
         PVRTC_RGB2,
         PVRTC_RGBA2,
@@ -171,5 +213,8 @@ namespace AssetStudio
         ASTC_HDR_8x8,
         ASTC_HDR_10x10,
         ASTC_HDR_12x12,
+        RG32,
+        RGB48,
+        RGBA64
     }
 }

AssetStudio/Classes/VideoClip.cs

@@ -1,17 +1,26 @@
-using System;
+using System.IO;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace AssetStudio
 {
+    public class StreamedResource
+    {
+        public string m_Source;
+        public long m_Offset; //ulong
+        public long m_Size; //ulong
+
+        public StreamedResource(BinaryReader reader)
+        {
+            m_Source = reader.ReadAlignedString();
+            m_Offset = reader.ReadInt64();
+            m_Size = reader.ReadInt64();
+        }
+    }
+
     public sealed class VideoClip : NamedObject
     {
         public ResourceReader m_VideoData;
         public string m_OriginalPath;
-        public string m_Source;
+        public StreamedResource m_ExternalResources;
-        public ulong m_Size;
 
         public VideoClip(ObjectReader reader) : base(reader)
         {
@@ -32,20 +41,30 @@ namespace AssetStudio
             reader.AlignStream();
             var m_AudioSampleRate = reader.ReadUInt32Array();
             var m_AudioLanguage = reader.ReadStringArray();
-            //StreamedResource m_ExternalResources
+            if (version[0] >= 2020) //2020.1 and up
-            m_Source = reader.ReadAlignedString();
+            {
-            var m_Offset = reader.ReadUInt64();
+                var m_VideoShadersSize = reader.ReadInt32();
-            m_Size = reader.ReadUInt64();
+                var m_VideoShaders = new PPtr<Shader>[m_VideoShadersSize];
+                for (int i = 0; i < m_VideoShadersSize; i++)
+                {
+                    m_VideoShaders[i] = new PPtr<Shader>(reader);
+                }
+            }
+            m_ExternalResources = new StreamedResource(reader);
             var m_HasSplitAlpha = reader.ReadBoolean();
+            if (version[0] >= 2020) //2020.1 and up
+            {
+                var m_sRGB = reader.ReadBoolean();
+            }
 
             ResourceReader resourceReader;
-            if (!string.IsNullOrEmpty(m_Source))
+            if (!string.IsNullOrEmpty(m_ExternalResources.m_Source))
             {
-                resourceReader = new ResourceReader(m_Source, assetsFile, (long)m_Offset, (int)m_Size);
+                resourceReader = new ResourceReader(m_ExternalResources.m_Source, assetsFile, m_ExternalResources.m_Offset, m_ExternalResources.m_Size);
             }
             else
             {
-                resourceReader = new ResourceReader(reader, reader.BaseStream.Position, (int)m_Size);
+                resourceReader = new ResourceReader(reader, reader.BaseStream.Position, m_ExternalResources.m_Size);
             }
             m_VideoData = resourceReader;
         }

AssetStudio/CommonString.cs

@@ -113,7 +113,8 @@ namespace AssetStudio
             {1093, "m_CorrespondingSourceObject"},
             {1121, "m_PrefabInstance"},
             {1138, "m_PrefabAsset"},
-            {1152, "FileSize"}
+            {1152, "FileSize"},
+            {1161, "Hash128"}
         };
     }
 }

AssetStudio/EndianBinaryReader.cs

@@ -1,23 +1,19 @@
 using System;
-using System.Collections.Generic;
+using System.Buffers.Binary;
-using System.Text;
 using System.IO;
 
 namespace AssetStudio
 {
-    public enum EndianType
-    {
-        LittleEndian,
-        BigEndian
-    }
-
     public class EndianBinaryReader : BinaryReader
     {
-        public EndianType endian;
+        private readonly byte[] buffer;
+
+        public EndianType Endian;
 
         public EndianBinaryReader(Stream stream, EndianType endian = EndianType.BigEndian) : base(stream)
         {
-            this.endian = endian;
+            Endian = endian;
+            buffer = new byte[8];
         }
 
         public long Position
@@ -28,88 +24,82 @@ namespace AssetStudio
 
         public override short ReadInt16()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(2);
+                Read(buffer, 0, 2);
-                Array.Reverse(buff);
+                return BinaryPrimitives.ReadInt16BigEndian(buffer);
-                return BitConverter.ToInt16(buff, 0);
             }
             return base.ReadInt16();
         }
 
         public override int ReadInt32()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(4);
+                Read(buffer, 0, 4);
-                Array.Reverse(buff);
+                return BinaryPrimitives.ReadInt32BigEndian(buffer);
-                return BitConverter.ToInt32(buff, 0);
             }
             return base.ReadInt32();
         }
 
         public override long ReadInt64()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(8);
+                Read(buffer, 0, 8);
-                Array.Reverse(buff);
+                return BinaryPrimitives.ReadInt64BigEndian(buffer);
-                return BitConverter.ToInt64(buff, 0);
             }
             return base.ReadInt64();
         }
 
         public override ushort ReadUInt16()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(2);
+                Read(buffer, 0, 2);
-                Array.Reverse(buff);
+                return BinaryPrimitives.ReadUInt16BigEndian(buffer);
-                return BitConverter.ToUInt16(buff, 0);
             }
             return base.ReadUInt16();
         }
 
         public override uint ReadUInt32()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(4);
+                Read(buffer, 0, 4);
-                Array.Reverse(buff);
+                return BinaryPrimitives.ReadUInt32BigEndian(buffer);
-                return BitConverter.ToUInt32(buff, 0);
             }
             return base.ReadUInt32();
         }
 
         public override ulong ReadUInt64()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(8);
+                Read(buffer, 0, 8);
-                Array.Reverse(buff);
+                return BinaryPrimitives.ReadUInt64BigEndian(buffer);
-                return BitConverter.ToUInt64(buff, 0);
             }
             return base.ReadUInt64();
         }
 
         public override float ReadSingle()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(4);
+                Read(buffer, 0, 4);
-                Array.Reverse(buff);
+                Array.Reverse(buffer, 0, 4);
-                return BitConverter.ToSingle(buff, 0);
+                return BitConverter.ToSingle(buffer, 0);
             }
             return base.ReadSingle();
         }
 
         public override double ReadDouble()
         {
-            if (endian == EndianType.BigEndian)
+            if (Endian == EndianType.BigEndian)
             {
-                var buff = ReadBytes(8);
+                Read(buffer, 0, 8);
-                Array.Reverse(buff);
+                Array.Reverse(buffer);
-                return BitConverter.ToUInt64(buff, 0);
+                return BitConverter.ToDouble(buffer, 0);
             }
             return base.ReadDouble();
         }

AssetStudio/EndianType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AssetStudio
+{
+    public enum EndianType
+    {
+        LittleEndian,
+        BigEndian
+    }
+}

AssetStudio/Extensions/BinaryReaderExtensions.cs

@@ -72,11 +72,6 @@ namespace AssetStudio
             return new Vector4(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
         }
 
-        public static System.Drawing.RectangleF ReadRectangleF(this BinaryReader reader)
-        {
-            return new System.Drawing.RectangleF(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
-        }
-
         public static Color ReadColor4(this BinaryReader reader)
         {
             return new Color(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
@@ -102,6 +97,11 @@ namespace AssetStudio
             return ReadArray(reader.ReadBoolean, reader.ReadInt32());
         }
 
+        public static byte[] ReadUInt8Array(this BinaryReader reader)
+        {
+            return reader.ReadBytes(reader.ReadInt32());
+        }
+
         public static ushort[] ReadUInt16Array(this BinaryReader reader)
         {
             return ReadArray(reader.ReadUInt16, reader.ReadInt32());

AssetStudio/FileReader.cs

@@ -0,0 +1,103 @@
+using System.IO;
+using System.Linq;
+
+namespace AssetStudio
+{
+    public class FileReader : EndianBinaryReader
+    {
+        public string FullPath;
+        public string FileName;
+        public FileType FileType;
+
+        private static readonly byte[] gzipMagic = { 0x1f, 0x8b };
+        private static readonly byte[] brotliMagic = { 0x62, 0x72, 0x6F, 0x74, 0x6C, 0x69 };
+        private static readonly byte[] zipMagic = { 0x50, 0x4B, 0x03, 0x04 };
+        private static readonly byte[] zipSpannedMagic = { 0x50, 0x4B, 0x07, 0x08 };
+
+        public FileReader(string path) : this(path, File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { }
+
+        public FileReader(string path, Stream stream) : base(stream, EndianType.BigEndian)
+        {
+            FullPath = Path.GetFullPath(path);
+            FileName = Path.GetFileName(path);
+            FileType = CheckFileType();
+        }
+
+        private FileType CheckFileType()
+        {
+            var signature = this.ReadStringToNull(20);
+            Position = 0;
+            switch (signature)
+            {
+                case "UnityWeb":
+                case "UnityRaw":
+                case "UnityArchive":
+                case "UnityFS":
+                    return FileType.BundleFile;
+                case "UnityWebData1.0":
+                    return FileType.WebFile;
+                default:
+                    {
+                        byte[] magic = ReadBytes(2);
+                        Position = 0;
+                        if (gzipMagic.SequenceEqual(magic))
+                        {
+                            return FileType.GZipFile;
+                        }
+                        Position = 0x20;
+                        magic = ReadBytes(6);
+                        Position = 0;
+                        if (brotliMagic.SequenceEqual(magic))
+                        {
+                            return FileType.BrotliFile;
+                        }
+                        if (IsSerializedFile())
+                        {
+                            return FileType.AssetsFile;
+                        }
+                        magic = ReadBytes(4);
+                        Position = 0;
+                        if (zipMagic.SequenceEqual(magic) || zipSpannedMagic.SequenceEqual(magic))
+                            return FileType.ZipFile;
+                        return FileType.ResourceFile;
+                    }
+            }
+        }
+
+        private bool IsSerializedFile()
+        {
+            var fileSize = BaseStream.Length;
+            if (fileSize < 20)
+            {
+                return false;
+            }
+            var m_MetadataSize = ReadUInt32();
+            long m_FileSize = ReadUInt32();
+            var m_Version = ReadUInt32();
+            long m_DataOffset = ReadUInt32();
+            var m_Endianess = ReadByte();
+            var m_Reserved = ReadBytes(3);
+            if (m_Version >= 22)
+            {
+                if (fileSize < 48)
+                {
+                    Position = 0;
+                    return false;
+                }
+                m_MetadataSize = ReadUInt32();
+                m_FileSize = ReadInt64();
+                m_DataOffset = ReadInt64();
+            }
+            Position = 0;
+            if (m_FileSize != fileSize)
+            {
+                return false;
+            }
+            if (m_DataOffset > fileSize)
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+}

AssetStudio/FileType.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AssetStudio
+{
+    public enum FileType
+    {
+        AssetsFile,
+        BundleFile,
+        WebFile,
+        ResourceFile,
+        GZipFile,
+        BrotliFile,
+        ZipFile
+    }
+}

AssetStudio/IImported.cs

@@ -73,6 +73,28 @@ namespace AssetStudio
             return null;
         }
 
+        public ImportedFrame FindRelativeFrameWithPath(string path)
+        {
+            var subs = path.Split(new[] { '/' }, 2);
+            foreach (var child in children)
+            {
+                if (child.Name == subs[0])
+                {
+                    if (subs.Length == 1)
+                    {
+                        return child;
+                    }
+                    else
+                    {
+                        var result = child.FindRelativeFrameWithPath(subs[1]);
+                        if (result != null)
+                            return result;
+                    }
+                }
+            }
+            return null;
+        }
+
         public ImportedFrame FindFrame(string name)
         {
             if (Name == name)
@@ -132,6 +154,7 @@ namespace AssetStudio
     public class ImportedMesh
     {
         public string Path { get; set; }
+        public List<ImportedVertex> VertexList { get; set; }
         public List<ImportedSubmesh> SubmeshList { get; set; }
         public List<ImportedBone> BoneList { get; set; }
         public bool hasNormal { get; set; }
@@ -142,9 +165,9 @@ namespace AssetStudio
 
     public class ImportedSubmesh
     {
-        public List<ImportedVertex> VertexList { get; set; }
         public List<ImportedFace> FaceList { get; set; }
         public string Material { get; set; }
+        public int BaseVertex { get; set; }
     }
 
     public class ImportedVertex

AssetStudio/IProgress.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AssetStudio
-{
-    public interface IProgress
-    {
-        void Report(int value);
-    }
-
-    public sealed class DummyProgress : IProgress
-    {
-        public void Report(int value) { }
-    }
-}

AssetStudio/ImportHelper.cs

@@ -1,17 +1,11 @@
-using System.Collections.Generic;
+using Org.Brotli.Dec;
+using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 
 namespace AssetStudio
 {
-    public enum FileType
-    {
-        AssetsFile,
-        BundleFile,
-        WebFile,
-        ResourceFile
-    }
-
     public static class ImportHelper
     {
         public static void MergeSplitAssets(string path, bool allDirectories = false)
@@ -20,8 +14,8 @@ namespace AssetStudio
             foreach (var splitFile in splitFiles)
             {
                 var destFile = Path.GetFileNameWithoutExtension(splitFile);
-                var destPath = Path.GetDirectoryName(splitFile) + "\\";
+                var destPath = Path.GetDirectoryName(splitFile);
-                var destFull = destPath + destFile;
+                var destFull = Path.Combine(destPath, destFile);
                 if (!File.Exists(destFull))
                 {
                     var splitParts = Directory.GetFiles(destPath, destFile + ".split*");
@@ -43,7 +37,7 @@ namespace AssetStudio
         public static string[] ProcessingSplitFiles(List<string> selectFile)
         {
             var splitFiles = selectFile.Where(x => x.Contains(".split"))
-                .Select(x => Path.GetDirectoryName(x) + "\\" + Path.GetFileNameWithoutExtension(x))
+                .Select(x => Path.Combine(Path.GetDirectoryName(x), Path.GetFileNameWithoutExtension(x)))
                 .Distinct()
                 .ToList();
             selectFile.RemoveAll(x => x.Contains(".split"));
@@ -57,55 +51,31 @@ namespace AssetStudio
             return selectFile.Distinct().ToArray();
         }
 
-        public static FileType CheckFileType(Stream stream, out EndianBinaryReader reader)
+        public static FileReader DecompressGZip(FileReader reader)
         {
-            reader = new EndianBinaryReader(stream);
+            using (reader)
-            return CheckFileType(reader);
+            {
+                var stream = new MemoryStream();
+                using (var gs = new GZipStream(reader.BaseStream, CompressionMode.Decompress))
+                {
+                    gs.CopyTo(stream);
+                }
+                stream.Position = 0;
+                return new FileReader(reader.FullPath, stream);
+            }
         }
 
-        public static FileType CheckFileType(string fileName, out EndianBinaryReader reader)
+        public static FileReader DecompressBrotli(FileReader reader)
         {
-            reader = new EndianBinaryReader(File.OpenRead(fileName));
+            using (reader)
-            return CheckFileType(reader);
-        }
-
-        private static FileType CheckFileType(EndianBinaryReader reader)
             {
-            var signature = reader.ReadStringToNull(20);
+                var stream = new MemoryStream();
-            reader.Position = 0;
+                using (var brotliStream = new BrotliInputStream(reader.BaseStream))
-            switch (signature)
                 {
-                case "UnityWeb":
+                    brotliStream.CopyTo(stream);
-                case "UnityRaw":
-                case "UnityArchive":
-                case "UnityFS":
-                    return FileType.BundleFile;
-                case "UnityWebData1.0":
-                    return FileType.WebFile;
-                default:
-                    {
-                        var magic = reader.ReadBytes(2);
-                        reader.Position = 0;
-                        if (WebFile.gzipMagic.SequenceEqual(magic))
-                        {
-                            return FileType.WebFile;
-                        }
-                        reader.Position = 0x20;
-                        magic = reader.ReadBytes(6);
-                        reader.Position = 0;
-                        if (WebFile.brotliMagic.SequenceEqual(magic))
-                        {
-                            return FileType.WebFile;
-                        }
-                        if (SerializedFile.IsSerializedFile(reader))
-                        {
-                            return FileType.AssetsFile;
-                        }
-                        else
-                        {
-                            return FileType.ResourceFile;
-                        }
                 }
+                stream.Position = 0;
+                return new FileReader(reader.FullPath, stream);
             }
         }
     }

AssetStudio/Logger.cs

@@ -14,5 +14,13 @@ namespace AssetStudio
         public static void Info(string message) => Default.Log(LoggerEvent.Info, message);
         public static void Warning(string message) => Default.Log(LoggerEvent.Warning, message);
         public static void Error(string message) => Default.Log(LoggerEvent.Error, message);
+
+        public static void Error(string message, Exception e)
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine(message);
+            sb.AppendLine(e.ToString());
+            Default.Log(LoggerEvent.Error, sb.ToString());
+        }
     }
 }

AssetStudio/Lz4DecoderStream.cs

@@ -1,540 +0,0 @@
-#define CHECK_ARGS
-#define CHECK_EOF
-//#define LOCAL_SHADOW
-
-using System;
-using System.IO;
-
-namespace Lz4
-{
-    public class Lz4DecoderStream : Stream
-    {
-        public Lz4DecoderStream(Stream input, long inputLength = long.MaxValue)
-        {
-            Reset(input, inputLength);
-        }
-
-        private void Reset(Stream input, long inputLength = long.MaxValue)
-        {
-            this.inputLength = inputLength;
-            this.input = input;
-
-            phase = DecodePhase.ReadToken;
-
-            decodeBufferPos = 0;
-
-            litLen = 0;
-            matLen = 0;
-            matDst = 0;
-
-            inBufPos = DecBufLen;
-            inBufEnd = DecBufLen;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            try
-            {
-                if (disposing && input != null)
-                {
-                    input.Close();
-                }
-                input = null;
-                decodeBuffer = null;
-            }
-            finally
-            {
-                base.Dispose(disposing);
-            }
-        }
-
-        private long inputLength;
-        private Stream input;
-
-        //because we might not be able to match back across invocations,
-        //we have to keep the last window's worth of bytes around for reuse
-        //we use a circular buffer for this - every time we write into this
-        //buffer, we also write the same into our output buffer
-
-        private const int DecBufLen = 0x10000;
-        private const int DecBufMask = 0xFFFF;
-
-        private const int InBufLen = 128;
-
-        private byte[] decodeBuffer = new byte[DecBufLen + InBufLen];
-        private int decodeBufferPos, inBufPos, inBufEnd;
-
-        //we keep track of which phase we're in so that we can jump right back
-        //into the correct part of decoding
-
-        private DecodePhase phase;
-
-        private enum DecodePhase
-        {
-            ReadToken,
-            ReadExLiteralLength,
-            CopyLiteral,
-            ReadOffset,
-            ReadExMatchLength,
-            CopyMatch,
-        }
-
-        //state within interruptable phases and across phase boundaries is
-        //kept here - again, so that we can punt out and restart freely
-
-        private int litLen, matLen, matDst;
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-#if CHECK_ARGS
-            if (buffer == null)
-                throw new ArgumentNullException("buffer");
-            if (offset < 0 || count < 0 || buffer.Length - count < offset)
-                throw new ArgumentOutOfRangeException();
-
-            if (input == null)
-                throw new InvalidOperationException();
-#endif
-            int nRead, nToRead = count;
-
-            var decBuf = decodeBuffer;
-
-            //the stringy gotos are obnoxious, but their purpose is to
-            //make it *blindingly* obvious how the state machine transitions
-            //back and forth as it reads - remember, we can yield out of
-            //this routine in several places, and we must be able to re-enter
-            //and pick up where we left off!
-
-#if LOCAL_SHADOW
-			var phase = this.phase;
-			var inBufPos = this.inBufPos;
-			var inBufEnd = this.inBufEnd;
-#endif
-            switch (phase)
-            {
-                case DecodePhase.ReadToken:
-                    goto readToken;
-
-                case DecodePhase.ReadExLiteralLength:
-                    goto readExLiteralLength;
-
-                case DecodePhase.CopyLiteral:
-                    goto copyLiteral;
-
-                case DecodePhase.ReadOffset:
-                    goto readOffset;
-
-                case DecodePhase.ReadExMatchLength:
-                    goto readExMatchLength;
-
-                case DecodePhase.CopyMatch:
-                    goto copyMatch;
-            }
-
-            readToken:
-            int tok;
-            if (inBufPos < inBufEnd)
-            {
-                tok = decBuf[inBufPos++];
-            }
-            else
-            {
-#if LOCAL_SHADOW
-				this.inBufPos = inBufPos;
-#endif
-
-                tok = ReadByteCore();
-#if LOCAL_SHADOW
-				inBufPos = this.inBufPos;
-				inBufEnd = this.inBufEnd;
-#endif
-#if CHECK_EOF
-                if (tok == -1)
-                    goto finish;
-#endif
-            }
-
-            litLen = tok >> 4;
-            matLen = (tok & 0xF) + 4;
-
-            switch (litLen)
-            {
-                case 0:
-                    phase = DecodePhase.ReadOffset;
-                    goto readOffset;
-
-                case 0xF:
-                    phase = DecodePhase.ReadExLiteralLength;
-                    goto readExLiteralLength;
-
-                default:
-                    phase = DecodePhase.CopyLiteral;
-                    goto copyLiteral;
-            }
-
-            readExLiteralLength:
-            int exLitLen;
-            if (inBufPos < inBufEnd)
-            {
-                exLitLen = decBuf[inBufPos++];
-            }
-            else
-            {
-#if LOCAL_SHADOW
-				this.inBufPos = inBufPos;
-#endif
-                exLitLen = ReadByteCore();
-#if LOCAL_SHADOW
-				inBufPos = this.inBufPos;
-				inBufEnd = this.inBufEnd;
-#endif
-
-#if CHECK_EOF
-                if (exLitLen == -1)
-                    goto finish;
-#endif
-            }
-
-            litLen += exLitLen;
-            if (exLitLen == 255)
-                goto readExLiteralLength;
-
-            phase = DecodePhase.CopyLiteral;
-            goto copyLiteral;
-
-            copyLiteral:
-            int nReadLit = litLen < nToRead ? litLen : nToRead;
-            if (nReadLit != 0)
-            {
-                if (inBufPos + nReadLit <= inBufEnd)
-                {
-                    int ofs = offset;
-
-                    for (int c = nReadLit; c-- != 0;)
-                        buffer[ofs++] = decBuf[inBufPos++];
-
-                    nRead = nReadLit;
-                }
-                else
-                {
-#if LOCAL_SHADOW
-					this.inBufPos = inBufPos;
-#endif
-                    nRead = ReadCore(buffer, offset, nReadLit);
-#if LOCAL_SHADOW
-					inBufPos = this.inBufPos;
-					inBufEnd = this.inBufEnd;
-#endif
-#if CHECK_EOF
-                    if (nRead == 0)
-                        goto finish;
-#endif
-                }
-
-                offset += nRead;
-                nToRead -= nRead;
-
-                litLen -= nRead;
-
-                if (litLen != 0)
-                    goto copyLiteral;
-            }
-
-            if (nToRead == 0)
-                goto finish;
-
-            phase = DecodePhase.ReadOffset;
-            goto readOffset;
-
-            readOffset:
-            if (inBufPos + 1 < inBufEnd)
-            {
-                matDst = (decBuf[inBufPos + 1] << 8) | decBuf[inBufPos];
-                inBufPos += 2;
-            }
-            else
-            {
-#if LOCAL_SHADOW
-				this.inBufPos = inBufPos;
-#endif
-                matDst = ReadOffsetCore();
-#if LOCAL_SHADOW
-				inBufPos = this.inBufPos;
-				inBufEnd = this.inBufEnd;
-#endif
-#if CHECK_EOF
-                if (matDst == -1)
-                    goto finish;
-#endif
-            }
-
-            if (matLen == 15 + 4)
-            {
-                phase = DecodePhase.ReadExMatchLength;
-                goto readExMatchLength;
-            }
-            else
-            {
-                phase = DecodePhase.CopyMatch;
-                goto copyMatch;
-            }
-
-            readExMatchLength:
-            int exMatLen;
-            if (inBufPos < inBufEnd)
-            {
-                exMatLen = decBuf[inBufPos++];
-            }
-            else
-            {
-#if LOCAL_SHADOW
-				this.inBufPos = inBufPos;
-#endif
-                exMatLen = ReadByteCore();
-#if LOCAL_SHADOW
-				inBufPos = this.inBufPos;
-				inBufEnd = this.inBufEnd;
-#endif
-#if CHECK_EOF
-                if (exMatLen == -1)
-                    goto finish;
-#endif
-            }
-
-            matLen += exMatLen;
-            if (exMatLen == 255)
-                goto readExMatchLength;
-
-            phase = DecodePhase.CopyMatch;
-            goto copyMatch;
-
-            copyMatch:
-            int nCpyMat = matLen < nToRead ? matLen : nToRead;
-            if (nCpyMat != 0)
-            {
-                nRead = count - nToRead;
-
-                int bufDst = matDst - nRead;
-                if (bufDst > 0)
-                {
-                    //offset is fairly far back, we need to pull from the buffer
-
-                    int bufSrc = decodeBufferPos - bufDst;
-                    if (bufSrc < 0)
-                        bufSrc += DecBufLen;
-                    int bufCnt = bufDst < nCpyMat ? bufDst : nCpyMat;
-
-                    for (int c = bufCnt; c-- != 0;)
-                        buffer[offset++] = decBuf[bufSrc++ & DecBufMask];
-                }
-                else
-                {
-                    bufDst = 0;
-                }
-
-                int sOfs = offset - matDst;
-                for (int i = bufDst; i < nCpyMat; i++)
-                    buffer[offset++] = buffer[sOfs++];
-
-                nToRead -= nCpyMat;
-                matLen -= nCpyMat;
-            }
-
-            if (nToRead == 0)
-                goto finish;
-
-            phase = DecodePhase.ReadToken;
-            goto readToken;
-
-            finish:
-            nRead = count - nToRead;
-
-            int nToBuf = nRead < DecBufLen ? nRead : DecBufLen;
-            int repPos = offset - nToBuf;
-
-            if (nToBuf == DecBufLen)
-            {
-                Buffer.BlockCopy(buffer, repPos, decBuf, 0, DecBufLen);
-                decodeBufferPos = 0;
-            }
-            else
-            {
-                int decPos = decodeBufferPos;
-
-                while (nToBuf-- != 0)
-                    decBuf[decPos++ & DecBufMask] = buffer[repPos++];
-
-                decodeBufferPos = decPos & DecBufMask;
-            }
-
-#if LOCAL_SHADOW
-			this.phase = phase;
-			this.inBufPos = inBufPos;
-#endif
-            return nRead;
-        }
-
-        private int ReadByteCore()
-        {
-            var buf = decodeBuffer;
-
-            if (inBufPos == inBufEnd)
-            {
-                int nRead = input.Read(buf, DecBufLen,
-                    InBufLen < inputLength ? InBufLen : (int)inputLength);
-
-#if CHECK_EOF
-                if (nRead == 0)
-                    return -1;
-#endif
-
-                inputLength -= nRead;
-
-                inBufPos = DecBufLen;
-                inBufEnd = DecBufLen + nRead;
-            }
-
-            return buf[inBufPos++];
-        }
-
-        private int ReadOffsetCore()
-        {
-            var buf = decodeBuffer;
-
-            if (inBufPos == inBufEnd)
-            {
-                int nRead = input.Read(buf, DecBufLen,
-                    InBufLen < inputLength ? InBufLen : (int)inputLength);
-
-#if CHECK_EOF
-                if (nRead == 0)
-                    return -1;
-#endif
-
-                inputLength -= nRead;
-
-                inBufPos = DecBufLen;
-                inBufEnd = DecBufLen + nRead;
-            }
-
-            if (inBufEnd - inBufPos == 1)
-            {
-                buf[DecBufLen] = buf[inBufPos];
-
-                int nRead = input.Read(buf, DecBufLen + 1,
-                    InBufLen - 1 < inputLength ? InBufLen - 1 : (int)inputLength);
-
-#if CHECK_EOF
-                if (nRead == 0)
-                {
-                    inBufPos = DecBufLen;
-                    inBufEnd = DecBufLen + 1;
-
-                    return -1;
-                }
-#endif
-
-                inputLength -= nRead;
-
-                inBufPos = DecBufLen;
-                inBufEnd = DecBufLen + nRead + 1;
-            }
-
-            int ret = (buf[inBufPos + 1] << 8) | buf[inBufPos];
-            inBufPos += 2;
-
-            return ret;
-        }
-
-        private int ReadCore(byte[] buffer, int offset, int count)
-        {
-            int nToRead = count;
-
-            var buf = decodeBuffer;
-            int inBufLen = inBufEnd - inBufPos;
-
-            int fromBuf = nToRead < inBufLen ? nToRead : inBufLen;
-            if (fromBuf != 0)
-            {
-                var bufPos = inBufPos;
-
-                for (int c = fromBuf; c-- != 0;)
-                    buffer[offset++] = buf[bufPos++];
-
-                inBufPos = bufPos;
-                nToRead -= fromBuf;
-            }
-
-            if (nToRead != 0)
-            {
-                int nRead;
-
-                if (nToRead >= InBufLen)
-                {
-                    nRead = input.Read(buffer, offset,
-                        nToRead < inputLength ? nToRead : (int)inputLength);
-                    nToRead -= nRead;
-                }
-                else
-                {
-                    nRead = input.Read(buf, DecBufLen,
-                        InBufLen < inputLength ? InBufLen : (int)inputLength);
-
-                    inBufPos = DecBufLen;
-                    inBufEnd = DecBufLen + nRead;
-
-                    fromBuf = nToRead < nRead ? nToRead : nRead;
-
-                    var bufPos = inBufPos;
-
-                    for (int c = fromBuf; c-- != 0;)
-                        buffer[offset++] = buf[bufPos++];
-
-                    inBufPos = bufPos;
-                    nToRead -= fromBuf;
-                }
-
-                inputLength -= nRead;
-            }
-
-            return count - nToRead;
-        }
-
-        #region Stream internals
-
-        public override bool CanRead => true;
-
-        public override bool CanSeek => false;
-
-        public override bool CanWrite => false;
-
-        public override void Flush()
-        {
-        }
-
-        public override long Length => throw new NotSupportedException();
-
-        public override long Position
-        {
-            get => throw new NotSupportedException();
-            set => throw new NotSupportedException();
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-
-        #endregion
-    }
-}

AssetStudio/Math/Half.cs

@@ -1,8 +1,8 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.Globalization;
-using System.Runtime.InteropServices;
 
-namespace System
+namespace AssetStudio
 {
     /// <summary>
     /// Represents a half-precision floating point number. 

AssetStudio/Math/HalfHelper.cs

@@ -1,6 +1,7 @@
-using System.Runtime.InteropServices;
+using System;
+using System.Runtime.InteropServices;
 
-namespace System
+namespace AssetStudio
 {
     /// <summary>
     /// Helper class for Half conversions and some low level operations.

AssetStudio/ObjectInfo.cs

@@ -11,6 +11,8 @@ namespace AssetStudio
         public uint byteSize;
         public int typeID;
         public int classID;
+        public ushort isDestroyed;
+        public byte stripped;
 
         public long m_PathID;
         public SerializedType serializedType;

AssetStudio/ObjectReader.cs

@@ -15,12 +15,12 @@ namespace AssetStudio
         public ClassIDType type;
         public SerializedType serializedType;
         public BuildTarget platform;
-        public uint m_Version;
+        public SerializedFileFormatVersion m_Version;
 
         public int[] version => assetsFile.version;
         public BuildType buildType => assetsFile.buildType;
 
-        public ObjectReader(EndianBinaryReader reader, SerializedFile assetsFile, ObjectInfo objectInfo) : base(reader.BaseStream, reader.endian)
+        public ObjectReader(EndianBinaryReader reader, SerializedFile assetsFile, ObjectInfo objectInfo) : base(reader.BaseStream, reader.Endian)
         {
             this.assetsFile = assetsFile;
             m_PathID = objectInfo.m_PathID;

AssetStudio/Progress.cs

@@ -1,8 +1,10 @@
-namespace AssetStudio
+using System;
+
+namespace AssetStudio
 {
     public static class Progress
     {
-        public static IProgress Default = new DummyProgress();
+        public static IProgress<int> Default = new Progress<int>();
         private static int preValue;
 
         public static void Reset()

AssetStudio/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("AssetStudio")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("AssetStudio")]
-[assembly: AssemblyCopyright("Copyright © Perfare 2018-2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("7662f8c2-7bfd-442e-a948-a43b4f7eb06e")]
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
-//通过使用 "*"，如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14.38.5")]
-[assembly: AssemblyFileVersion("0.14.38.5")]

AssetStudio/ResourceReader.cs

@@ -8,11 +8,12 @@ namespace AssetStudio
         private string path;
         private SerializedFile assetsFile;
         private long offset;
-        private int size;
+        private long size;
         private BinaryReader reader;
 
+        public int Size { get => (int)size; }
 
-        public ResourceReader(string path, SerializedFile assetsFile, long offset, int size)
+        public ResourceReader(string path, SerializedFile assetsFile, long offset, long size)
         {
             needSearch = true;
             this.path = path;
@@ -21,28 +22,25 @@ namespace AssetStudio
             this.size = size;
         }
 
-        public ResourceReader(BinaryReader reader, long offset, int size)
+        public ResourceReader(BinaryReader reader, long offset, long size)
         {
             this.reader = reader;
             this.offset = offset;
             this.size = size;
         }
 
-        public byte[] GetData()
+        private BinaryReader GetReader()
         {
             if (needSearch)
             {
                 var resourceFileName = Path.GetFileName(path);
-
                 if (assetsFile.assetsManager.resourceFileReaders.TryGetValue(resourceFileName, out reader))
                 {
                     needSearch = false;
-                    reader.BaseStream.Position = offset;
+                    return reader;
-                    return reader.ReadBytes(size);
                 }
-
                 var assetsFileDirectory = Path.GetDirectoryName(assetsFile.fullName);
-                var resourceFilePath = assetsFileDirectory + Path.DirectorySeparatorChar + resourceFileName;
+                var resourceFilePath = Path.Combine(assetsFileDirectory, resourceFileName);
                 if (!File.Exists(resourceFilePath))
                 {
                     var findFiles = Directory.GetFiles(assetsFileDirectory, resourceFileName, SearchOption.AllDirectories);
@@ -53,18 +51,41 @@ namespace AssetStudio
                 }
                 if (File.Exists(resourceFilePath))
                 {
-                    reader = new BinaryReader(File.OpenRead(resourceFilePath));
                     needSearch = false;
+                    reader = new BinaryReader(File.OpenRead(resourceFilePath));
                     assetsFile.assetsManager.resourceFileReaders.Add(resourceFileName, reader);
-                    reader.BaseStream.Position = offset;
+                    return reader;
-                    return reader.ReadBytes(size);
                 }
-
                 throw new FileNotFoundException($"Can't find the resource file {resourceFileName}");
             }
+            else
+            {
+                return reader;
+            }
+        }
 
-            reader.BaseStream.Position = offset;
+        public byte[] GetData()
-            return reader.ReadBytes(size);
+        {
+            var binaryReader = GetReader();
+            binaryReader.BaseStream.Position = offset;
+            return binaryReader.ReadBytes((int)size);
+        }
+
+        public void GetData(byte[] buff)
+        {
+            var binaryReader = GetReader();
+            binaryReader.BaseStream.Position = offset;
+            binaryReader.Read(buff, 0, (int)size);
+        }
+
+        public void WriteData(string path)
+        {
+            var binaryReader = GetReader();
+            binaryReader.BaseStream.Position = offset;
+            using (var writer = File.OpenWrite(path))
+            {
+                binaryReader.BaseStream.CopyTo(writer, size);
+            }
         }
     }
 }

AssetStudio/SerializedFile.cs

@@ -9,7 +9,7 @@ namespace AssetStudio
     public class SerializedFile
     {
         public AssetsManager assetsManager;
-        public EndianBinaryReader reader;
+        public FileReader reader;
         public string fullName;
         public string originalPath;
         public string fileName;
@@ -19,43 +19,45 @@ namespace AssetStudio
         public Dictionary<long, Object> ObjectsDic;
 
         public SerializedFileHeader header;
-        private EndianType m_FileEndianess;
+        private byte m_FileEndianess;
         public string unityVersion = "2.5.0f5";
         public BuildTarget m_TargetPlatform = BuildTarget.UnknownPlatform;
         private bool m_EnableTypeTree = true;
         public List<SerializedType> m_Types;
-        public List<SerializedType> m_RefTypes;
+        public int bigIDEnabled = 0;
         public List<ObjectInfo> m_Objects;
         private List<LocalSerializedObjectIdentifier> m_ScriptTypes;
         public List<FileIdentifier> m_Externals;
+        public List<SerializedType> m_RefTypes;
+        public string userInformation;
 
-        public SerializedFile(AssetsManager assetsManager, string fullName, EndianBinaryReader reader)
+        public SerializedFile(FileReader reader, AssetsManager assetsManager)
         {
             this.assetsManager = assetsManager;
             this.reader = reader;
-            this.fullName = fullName;
+            fullName = reader.FullPath;
-            fileName = Path.GetFileName(fullName);
+            fileName = reader.FileName;
 
             // ReadHeader
             header = new SerializedFileHeader();
             header.m_MetadataSize = reader.ReadUInt32();
             header.m_FileSize = reader.ReadUInt32();
-            header.m_Version = reader.ReadUInt32();
+            header.m_Version = (SerializedFileFormatVersion)reader.ReadUInt32();
             header.m_DataOffset = reader.ReadUInt32();
 
-            if (header.m_Version >= 9)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_9)
             {
                 header.m_Endianess = reader.ReadByte();
                 header.m_Reserved = reader.ReadBytes(3);
-                m_FileEndianess = (EndianType)header.m_Endianess;
+                m_FileEndianess = header.m_Endianess;
             }
             else
             {
                 reader.Position = header.m_FileSize - header.m_MetadataSize;
-                m_FileEndianess = (EndianType)reader.ReadByte();
+                m_FileEndianess = reader.ReadByte();
             }
 
-            if (header.m_Version >= 22)
+            if (header.m_Version >= SerializedFileFormatVersion.LargeFilesSupport)
             {
                 header.m_MetadataSize = reader.ReadUInt32();
                 header.m_FileSize = reader.ReadInt64();
@@ -64,16 +66,16 @@ namespace AssetStudio
             }
 
             // ReadMetadata
-            if (m_FileEndianess == EndianType.LittleEndian)
+            if (m_FileEndianess == 0)
             {
-                reader.endian = EndianType.LittleEndian;
+                reader.Endian = EndianType.LittleEndian;
             }
-            if (header.m_Version >= 7)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_7)
             {
                 unityVersion = reader.ReadStringToNull();
                 SetVersion(unityVersion);
             }
-            if (header.m_Version >= 8)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_8)
             {
                 m_TargetPlatform = (BuildTarget)reader.ReadInt32();
                 if (!Enum.IsDefined(typeof(BuildTarget), m_TargetPlatform))
@@ -81,7 +83,7 @@ namespace AssetStudio
                     m_TargetPlatform = BuildTarget.UnknownPlatform;
                 }
             }
-            if (header.m_Version >= 13)
+            if (header.m_Version >= SerializedFileFormatVersion.HasTypeTreeHashes)
             {
                 m_EnableTypeTree = reader.ReadBoolean();
             }
@@ -91,11 +93,10 @@ namespace AssetStudio
             m_Types = new List<SerializedType>(typeCount);
             for (int i = 0; i < typeCount; i++)
             {
-                m_Types.Add(ReadSerializedType());
+                m_Types.Add(ReadSerializedType(false));
             }
 
-            var bigIDEnabled = 0;
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_7 && header.m_Version < SerializedFileFormatVersion.Unknown_14)
-            if (header.m_Version >= 7 && header.m_Version < 14)
             {
                 bigIDEnabled = reader.ReadInt32();
             }
@@ -112,7 +113,7 @@ namespace AssetStudio
                 {
                     objectInfo.m_PathID = reader.ReadInt64();
                 }
-                else if (header.m_Version < 14)
+                else if (header.m_Version < SerializedFileFormatVersion.Unknown_14)
                 {
                     objectInfo.m_PathID = reader.ReadInt32();
                 }
@@ -122,7 +123,7 @@ namespace AssetStudio
                     objectInfo.m_PathID = reader.ReadInt64();
                 }
 
-                if (header.m_Version >= 22)
+                if (header.m_Version >= SerializedFileFormatVersion.LargeFilesSupport)
                     objectInfo.byteStart = reader.ReadInt64();
                 else
                     objectInfo.byteStart = reader.ReadUInt32();
@@ -130,7 +131,7 @@ namespace AssetStudio
                 objectInfo.byteStart += header.m_DataOffset;
                 objectInfo.byteSize = reader.ReadUInt32();
                 objectInfo.typeID = reader.ReadInt32();
-                if (header.m_Version < 16)
+                if (header.m_Version < SerializedFileFormatVersion.RefactoredClassId)
                 {
                     objectInfo.classID = reader.ReadUInt16();
                     objectInfo.serializedType = m_Types.Find(x => x.classID == objectInfo.typeID);
@@ -141,24 +142,24 @@ namespace AssetStudio
                     objectInfo.serializedType = type;
                     objectInfo.classID = type.classID;
                 }
-                if (header.m_Version < 11)
+                if (header.m_Version < SerializedFileFormatVersion.HasScriptTypeIndex)
                 {
-                    var isDestroyed = reader.ReadUInt16();
+                    objectInfo.isDestroyed = reader.ReadUInt16();
                 }
-                if (header.m_Version >= 11 && header.m_Version < 17)
+                if (header.m_Version >= SerializedFileFormatVersion.HasScriptTypeIndex && header.m_Version < SerializedFileFormatVersion.RefactorTypeData)
                 {
                     var m_ScriptTypeIndex = reader.ReadInt16();
                     if (objectInfo.serializedType != null)
                         objectInfo.serializedType.m_ScriptTypeIndex = m_ScriptTypeIndex;
                 }
-                if (header.m_Version == 15 || header.m_Version == 16)
+                if (header.m_Version == SerializedFileFormatVersion.SupportsStrippedObject || header.m_Version == SerializedFileFormatVersion.RefactoredClassId)
                 {
-                    var stripped = reader.ReadByte();
+                    objectInfo.stripped = reader.ReadByte();
                 }
                 m_Objects.Add(objectInfo);
             }
 
-            if (header.m_Version >= 11)
+            if (header.m_Version >= SerializedFileFormatVersion.HasScriptTypeIndex)
             {
                 int scriptCount = reader.ReadInt32();
                 m_ScriptTypes = new List<LocalSerializedObjectIdentifier>(scriptCount);
@@ -166,7 +167,7 @@ namespace AssetStudio
                 {
                     var m_ScriptType = new LocalSerializedObjectIdentifier();
                     m_ScriptType.localSerializedFileIndex = reader.ReadInt32();
-                    if (header.m_Version < 14)
+                    if (header.m_Version < SerializedFileFormatVersion.Unknown_14)
                     {
                         m_ScriptType.localIdentifierInFile = reader.ReadInt32();
                     }
@@ -184,11 +185,11 @@ namespace AssetStudio
             for (int i = 0; i < externalsCount; i++)
             {
                 var m_External = new FileIdentifier();
-                if (header.m_Version >= 6)
+                if (header.m_Version >= SerializedFileFormatVersion.Unknown_6)
                 {
                     var tempEmpty = reader.ReadStringToNull();
                 }
-                if (header.m_Version >= 5)
+                if (header.m_Version >= SerializedFileFormatVersion.Unknown_5)
                 {
                     m_External.guid = new Guid(reader.ReadBytes(16));
                     m_External.type = reader.ReadInt32();
@@ -198,25 +199,27 @@ namespace AssetStudio
                 m_Externals.Add(m_External);
             }
 
-            if (header.m_Version >= 20)
+            if (header.m_Version >= SerializedFileFormatVersion.SupportsRefObject)
             {
                 int refTypesCount = reader.ReadInt32();
                 m_RefTypes = new List<SerializedType>(refTypesCount);
                 for (int i = 0; i < refTypesCount; i++)
                 {
-                    m_RefTypes.Add(ReadSerializedType());
+                    m_RefTypes.Add(ReadSerializedType(true));
                 }
             }
 
-            if (header.m_Version >= 5)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_5)
             {
-                var userInformation = reader.ReadStringToNull();
+                userInformation = reader.ReadStringToNull();
             }
 
             //reader.AlignStream(16);
         }
 
         public void SetVersion(string stringVersion)
+        {
+            if (stringVersion != strippedVersion)
             {
                 unityVersion = stringVersion;
                 var buildSplit = Regex.Replace(stringVersion, @"\d", "").Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries);
@@ -224,74 +227,86 @@ namespace AssetStudio
                 var versionSplit = Regex.Replace(stringVersion, @"\D", ".").Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries);
                 version = versionSplit.Select(int.Parse).ToArray();
             }
+        }
 
-        private SerializedType ReadSerializedType()
+        private SerializedType ReadSerializedType(bool isRefType)
         {
             var type = new SerializedType();
 
             type.classID = reader.ReadInt32();
 
-            if (header.m_Version >= 16)
+            if (header.m_Version >= SerializedFileFormatVersion.RefactoredClassId)
             {
                 type.m_IsStrippedType = reader.ReadBoolean();
             }
 
-            if (header.m_Version >= 17)
+            if (header.m_Version >= SerializedFileFormatVersion.RefactorTypeData)
             {
                 type.m_ScriptTypeIndex = reader.ReadInt16();
             }
 
-            if (header.m_Version >= 13)
+            if (header.m_Version >= SerializedFileFormatVersion.HasTypeTreeHashes)
             {
-                if ((header.m_Version < 16 && type.classID < 0) || (header.m_Version >= 16 && type.classID == 114))
+                if (isRefType && type.m_ScriptTypeIndex >= 0)
                 {
-                    type.m_ScriptID = reader.ReadBytes(16); //Hash128
+                    type.m_ScriptID = reader.ReadBytes(16);
                 }
-                type.m_OldTypeHash = reader.ReadBytes(16); //Hash128
+                else if ((header.m_Version < SerializedFileFormatVersion.RefactoredClassId && type.classID < 0) || (header.m_Version >= SerializedFileFormatVersion.RefactoredClassId && type.classID == 114))
+                {
+                    type.m_ScriptID = reader.ReadBytes(16);
+                }
+                type.m_OldTypeHash = reader.ReadBytes(16);
             }
 
             if (m_EnableTypeTree)
             {
-                var typeTree = new List<TypeTreeNode>();
+                type.m_Type = new TypeTree();
-                if (header.m_Version >= 12 || header.m_Version == 10)
+                type.m_Type.m_Nodes = new List<TypeTreeNode>();
+                if (header.m_Version >= SerializedFileFormatVersion.Unknown_12 || header.m_Version == SerializedFileFormatVersion.Unknown_10)
                 {
-                    TypeTreeBlobRead(typeTree);
+                    TypeTreeBlobRead(type.m_Type);
                 }
                 else
                 {
-                    ReadTypeTree(typeTree);
+                    ReadTypeTree(type.m_Type);
                 }
-
+                if (header.m_Version >= SerializedFileFormatVersion.StoresTypeDependencies)
-                if (header.m_Version >= 21)
+                {
+                    if (isRefType)
+                    {
+                        type.m_KlassName = reader.ReadStringToNull();
+                        type.m_NameSpace = reader.ReadStringToNull();
+                        type.m_AsmName = reader.ReadStringToNull();
+                    }
+                    else
                     {
                         type.m_TypeDependencies = reader.ReadInt32Array();
                     }
-
+                }
-                type.m_Nodes = typeTree;
             }
 
             return type;
         }
 
-        private void ReadTypeTree(List<TypeTreeNode> typeTree, int level = 0)
+        private void ReadTypeTree(TypeTree m_Type, int level = 0)
         {
             var typeTreeNode = new TypeTreeNode();
-            typeTree.Add(typeTreeNode);
+            m_Type.m_Nodes.Add(typeTreeNode);
             typeTreeNode.m_Level = level;
             typeTreeNode.m_Type = reader.ReadStringToNull();
             typeTreeNode.m_Name = reader.ReadStringToNull();
             typeTreeNode.m_ByteSize = reader.ReadInt32();
-            if (header.m_Version == 2)
+            if (header.m_Version == SerializedFileFormatVersion.Unknown_2)
             {
                 var variableCount = reader.ReadInt32();
             }
-            if (header.m_Version != 3)
+            if (header.m_Version != SerializedFileFormatVersion.Unknown_3)
             {
                 typeTreeNode.m_Index = reader.ReadInt32();
             }
-            typeTreeNode.m_IsArray = reader.ReadInt32();
+            typeTreeNode.m_TypeFlags = reader.ReadInt32();
             typeTreeNode.m_Version = reader.ReadInt32();
-            if (header.m_Version != 3)
+            if (header.m_Version != SerializedFileFormatVersion.Unknown_3)
             {
                 typeTreeNode.m_MetaFlag = reader.ReadInt32();
             }
@@ -299,40 +314,40 @@ namespace AssetStudio
             int childrenCount = reader.ReadInt32();
             for (int i = 0; i < childrenCount; i++)
             {
-                ReadTypeTree(typeTree, level + 1);
+                ReadTypeTree(m_Type, level + 1);
             }
         }
 
-        private void TypeTreeBlobRead(List<TypeTreeNode> typeTree)
+        private void TypeTreeBlobRead(TypeTree m_Type)
         {
             int numberOfNodes = reader.ReadInt32();
             int stringBufferSize = reader.ReadInt32();
             for (int i = 0; i < numberOfNodes; i++)
             {
                 var typeTreeNode = new TypeTreeNode();
-                typeTree.Add(typeTreeNode);
+                m_Type.m_Nodes.Add(typeTreeNode);
                 typeTreeNode.m_Version = reader.ReadUInt16();
                 typeTreeNode.m_Level = reader.ReadByte();
-                typeTreeNode.m_IsArray = reader.ReadBoolean() ? 1 : 0;
+                typeTreeNode.m_TypeFlags = reader.ReadByte();
                 typeTreeNode.m_TypeStrOffset = reader.ReadUInt32();
                 typeTreeNode.m_NameStrOffset = reader.ReadUInt32();
                 typeTreeNode.m_ByteSize = reader.ReadInt32();
                 typeTreeNode.m_Index = reader.ReadInt32();
                 typeTreeNode.m_MetaFlag = reader.ReadInt32();
-                if (header.m_Version >= 19)
+                if (header.m_Version >= SerializedFileFormatVersion.TypeTreeNodeWithTypeFlags)
                 {
                     typeTreeNode.m_RefTypeHash = reader.ReadUInt64();
                 }
             }
-            var m_StringBuffer = reader.ReadBytes(stringBufferSize);
+            m_Type.m_StringBuffer = reader.ReadBytes(stringBufferSize);
 
-            using (var stringBufferReader = new BinaryReader(new MemoryStream(m_StringBuffer)))
+            using (var stringBufferReader = new BinaryReader(new MemoryStream(m_Type.m_StringBuffer)))
             {
                 for (int i = 0; i < numberOfNodes; i++)
                 {
-                    var typeTreeNode = typeTree[i];
+                    var m_Node = m_Type.m_Nodes[i];
-                    typeTreeNode.m_Type = ReadString(stringBufferReader, typeTreeNode.m_TypeStrOffset);
+                    m_Node.m_Type = ReadString(stringBufferReader, m_Node.m_TypeStrOffset);
-                    typeTreeNode.m_Name = ReadString(stringBufferReader, typeTreeNode.m_NameStrOffset);
+                    m_Node.m_Name = ReadString(stringBufferReader, m_Node.m_NameStrOffset);
                 }
             }
 
@@ -359,41 +374,8 @@ namespace AssetStudio
             ObjectsDic.Add(obj.m_PathID, obj);
         }
 
-        public static bool IsSerializedFile(EndianBinaryReader reader)
+        public bool IsVersionStripped => unityVersion == strippedVersion;
-        {
+
-            var fileSize = reader.BaseStream.Length;
+        private const string strippedVersion = "0.0.0";
-            if (fileSize < 20)
-            {
-                return false;
-            }
-            var m_MetadataSize = reader.ReadUInt32();
-            long m_FileSize = reader.ReadUInt32();
-            var m_Version = reader.ReadUInt32();
-            long m_DataOffset = reader.ReadUInt32();
-            var m_Endianess = reader.ReadByte();
-            var m_Reserved = reader.ReadBytes(3);
-            if (m_Version >= 22)
-            {
-                if (fileSize < 48)
-                {
-                    return false;
-                }
-                m_MetadataSize = reader.ReadUInt32();
-                m_FileSize = reader.ReadInt64();
-                m_DataOffset = reader.ReadInt64();
-            }
-            if (m_FileSize != fileSize)
-            {
-                reader.Position = 0;
-                return false;
-            }
-            if (m_DataOffset > fileSize)
-            {
-                reader.Position = 0;
-                return false;
-            }
-            reader.Position = 0;
-            return true;
-        }
     }
 }

AssetStudio/SerializedFileFormatVersion.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AssetStudio
+{
+    public enum SerializedFileFormatVersion
+    {
+        Unsupported = 1,
+        Unknown_2 = 2,
+        Unknown_3 = 3,
+        /// <summary>
+        /// 1.2.0 to 2.0.0
+        /// </summary>
+        Unknown_5 = 5,
+        /// <summary>
+        /// 2.1.0 to 2.6.1
+        /// </summary>
+        Unknown_6 = 6,
+        /// <summary>
+        /// 3.0.0b
+        /// </summary>
+        Unknown_7 = 7,
+        /// <summary>
+        /// 3.0.0 to 3.4.2
+        /// </summary>
+        Unknown_8 = 8,
+        /// <summary>
+        /// 3.5.0 to 4.7.2
+        /// </summary>
+        Unknown_9 = 9,
+        /// <summary>
+        /// 5.0.0aunk1
+        /// </summary>
+        Unknown_10 = 10,
+        /// <summary>
+        /// 5.0.0aunk2
+        /// </summary>
+        HasScriptTypeIndex = 11,
+        /// <summary>
+        /// 5.0.0aunk3
+        /// </summary>
+        Unknown_12 = 12,
+        /// <summary>
+        /// 5.0.0aunk4
+        /// </summary>
+        HasTypeTreeHashes = 13,
+        /// <summary>
+        /// 5.0.0unk
+        /// </summary>
+        Unknown_14 = 14,
+        /// <summary>
+        /// 5.0.1 to 5.4.0
+        /// </summary>
+        SupportsStrippedObject = 15,
+        /// <summary>
+        /// 5.5.0a
+        /// </summary>
+        RefactoredClassId = 16,
+        /// <summary>
+        /// 5.5.0unk to 2018.4
+        /// </summary>
+        RefactorTypeData = 17,
+        /// <summary>
+        /// 2019.1a
+        /// </summary>
+        RefactorShareableTypeTreeData = 18,
+        /// <summary>
+        /// 2019.1unk
+        /// </summary>
+        TypeTreeNodeWithTypeFlags = 19,
+        /// <summary>
+        /// 2019.2
+        /// </summary>
+        SupportsRefObject = 20,
+        /// <summary>
+        /// 2019.3 to 2019.4
+        /// </summary>
+        StoresTypeDependencies = 21,
+        /// <summary>
+        /// 2020.1 to x
+        /// </summary>
+        LargeFilesSupport = 22
+    }
+}

AssetStudio/SerializedFileHeader.cs

@@ -9,7 +9,7 @@ namespace AssetStudio
     {
         public uint m_MetadataSize;
         public long m_FileSize;
-        public uint m_Version;
+        public SerializedFileFormatVersion m_Version;
         public long m_DataOffset;
         public byte m_Endianess;
         public byte[] m_Reserved;

AssetStudio/SerializedType.cs

@@ -10,9 +10,12 @@ namespace AssetStudio
         public int classID;
         public bool m_IsStrippedType;
         public short m_ScriptTypeIndex = -1;
-        public List<TypeTreeNode> m_Nodes;
+        public TypeTree m_Type;
         public byte[] m_ScriptID; //Hash128
         public byte[] m_OldTypeHash; //Hash128
         public int[] m_TypeDependencies;
+        public string m_KlassName;
+        public string m_NameSpace;
+        public string m_AsmName;
     }
 }

AssetStudio/SevenZipHelper.cs

@@ -34,15 +34,16 @@ namespace AssetStudio
             return newOutStream;
         }
 
-        public static void StreamDecompress(Stream inStream, Stream outStream, long inSize, long outSize)
+        public static void StreamDecompress(Stream compressedStream, Stream decompressedStream, long compressedSize, long decompressedSize)
         {
+            var basePosition = compressedStream.Position;
             var decoder = new Decoder();
             var properties = new byte[5];
-            if (inStream.Read(properties, 0, 5) != 5)
+            if (compressedStream.Read(properties, 0, 5) != 5)
                 throw new Exception("input .lzma is too short");
             decoder.SetDecoderProperties(properties);
-            inSize -= 5L;
+            decoder.Code(compressedStream, decompressedStream, compressedSize - 5, decompressedSize, null);
-            decoder.Code(inStream, outStream, inSize, outSize, null);
+            compressedStream.Position = basePosition + compressedSize;
         }
     }
 }

AssetStudio/StreamFile.cs

@@ -4,6 +4,7 @@ namespace AssetStudio
 {
     public class StreamFile
     {
+        public string path;
         public string fileName;
         public Stream stream;
     }

AssetStudio/TypeTree.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AssetStudio
+{
+    public class TypeTree
+    {
+        public List<TypeTreeNode> m_Nodes;
+        public byte[] m_StringBuffer;
+    }
+}

AssetStudio/TypeTreeHelper.cs

@@ -1,39 +1,50 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace AssetStudio
 {
     public static class TypeTreeHelper
     {
-        public static void ReadTypeString(StringBuilder sb, List<TypeTreeNode> members, BinaryReader reader)
+        public static string ReadTypeString(TypeTree m_Type, ObjectReader reader)
         {
-            for (int i = 0; i < members.Count; i++)
+            reader.Reset();
+            var sb = new StringBuilder();
+            var m_Nodes = m_Type.m_Nodes;
+            for (int i = 0; i < m_Nodes.Count; i++)
             {
-                ReadStringValue(sb, members, reader, ref i);
+                ReadStringValue(sb, m_Nodes, reader, ref i);
             }
+            var readed = reader.Position - reader.byteStart;
+            if (readed != reader.byteSize)
+            {
+                Logger.Info($"Error while read type, read {readed} bytes but expected {reader.byteSize} bytes");
+            }
+            return sb.ToString();
         }
 
-        private static void ReadStringValue(StringBuilder sb, List<TypeTreeNode> members, BinaryReader reader, ref int i)
+        private static void ReadStringValue(StringBuilder sb, List<TypeTreeNode> m_Nodes, BinaryReader reader, ref int i)
         {
-            var member = members[i];
+            var m_Node = m_Nodes[i];
-            var level = member.m_Level;
+            var level = m_Node.m_Level;
-            var varTypeStr = member.m_Type;
+            var varTypeStr = m_Node.m_Type;
-            var varNameStr = member.m_Name;
+            var varNameStr = m_Node.m_Name;
             object value = null;
             var append = true;
-            var align = (member.m_MetaFlag & 0x4000) != 0;
+            var align = (m_Node.m_MetaFlag & 0x4000) != 0;
             switch (varTypeStr)
             {
                 case "SInt8":
                     value = reader.ReadSByte();
                     break;
                 case "UInt8":
-                case "char":
                     value = reader.ReadByte();
                     break;
+                case "char":
+                    value = BitConverter.ToChar(reader.ReadBytes(2), 0);
+                    break;
                 case "short":
                 case "SInt16":
                     value = reader.ReadInt16();
@@ -73,22 +84,23 @@ namespace AssetStudio
                     append = false;
                     var str = reader.ReadAlignedString();
                     sb.AppendFormat("{0}{1} {2} = \"{3}\"\r\n", (new string('\t', level)), varTypeStr, varNameStr, str);
-                    i += 3;
+                    var toSkip = GetNodes(m_Nodes, i);
+                    i += toSkip.Count - 1;
                     break;
                 case "map":
                     {
-                        if ((members[i + 1].m_MetaFlag & 0x4000) != 0)
+                        if ((m_Nodes[i + 1].m_MetaFlag & 0x4000) != 0)
                             align = true;
                         append = false;
                         sb.AppendFormat("{0}{1} {2}\r\n", (new string('\t', level)), varTypeStr, varNameStr);
                         sb.AppendFormat("{0}{1} {2}\r\n", (new string('\t', level + 1)), "Array", "Array");
                         var size = reader.ReadInt32();
                         sb.AppendFormat("{0}{1} {2} = {3}\r\n", (new string('\t', level + 1)), "int", "size", size);
-                        var map = GetMembers(members, i);
+                        var map = GetNodes(m_Nodes, i);
                         i += map.Count - 1;
-                        var first = GetMembers(map, 4);
+                        var first = GetNodes(map, 4);
                         var next = 4 + first.Count;
-                        var second = GetMembers(map, next);
+                        var second = GetNodes(map, next);
                         for (int j = 0; j < size; j++)
                         {
                             sb.AppendFormat("{0}[{1}]\r\n", (new string('\t', level + 2)), j);
@@ -112,16 +124,16 @@ namespace AssetStudio
                     }
                 default:
                     {
-                        if (i < members.Count - 1 && members[i + 1].m_Type == "Array") //Array
+                        if (i < m_Nodes.Count - 1 && m_Nodes[i + 1].m_Type == "Array") //Array
                         {
-                            if ((members[i + 1].m_MetaFlag & 0x4000) != 0)
+                            if ((m_Nodes[i + 1].m_MetaFlag & 0x4000) != 0)
                                 align = true;
                             append = false;
                             sb.AppendFormat("{0}{1} {2}\r\n", (new string('\t', level)), varTypeStr, varNameStr);
                             sb.AppendFormat("{0}{1} {2}\r\n", (new string('\t', level + 1)), "Array", "Array");
                             var size = reader.ReadInt32();
                             sb.AppendFormat("{0}{1} {2} = {3}\r\n", (new string('\t', level + 1)), "int", "size", size);
-                            var vector = GetMembers(members, i);
+                            var vector = GetNodes(m_Nodes, i);
                             i += vector.Count - 1;
                             for (int j = 0; j < size; j++)
                             {
@@ -135,7 +147,7 @@ namespace AssetStudio
                         {
                             append = false;
                             sb.AppendFormat("{0}{1} {2}\r\n", (new string('\t', level)), varTypeStr, varNameStr);
-                            var @class = GetMembers(members, i);
+                            var @class = GetNodes(m_Nodes, i);
                             i += @class.Count - 1;
                             for (int j = 1; j < @class.Count; j++)
                             {
@@ -151,33 +163,42 @@ namespace AssetStudio
                 reader.AlignStream();
         }
 
-        public static UType ReadUType(List<TypeTreeNode> members, BinaryReader reader)
+        public static OrderedDictionary ReadType(TypeTree m_Types, ObjectReader reader)
         {
-            var obj = new UType();
+            reader.Reset();
-            for (int i = 1; i < members.Count; i++)
+            var obj = new OrderedDictionary();
+            var m_Nodes = m_Types.m_Nodes;
+            for (int i = 1; i < m_Nodes.Count; i++)
             {
-                var member = members[i];
+                var m_Node = m_Nodes[i];
-                var varNameStr = member.m_Name;
+                var varNameStr = m_Node.m_Name;
-                obj[varNameStr] = ReadValue(members, reader, ref i);
+                obj[varNameStr] = ReadValue(m_Nodes, reader, ref i);
+            }
+            var readed = reader.Position - reader.byteStart;
+            if (readed != reader.byteSize)
+            {
+                Logger.Info($"Error while read type, read {readed} bytes but expected {reader.byteSize} bytes");
             }
             return obj;
         }
 
-        private static object ReadValue(List<TypeTreeNode> members, BinaryReader reader, ref int i)
+        private static object ReadValue(List<TypeTreeNode> m_Nodes, BinaryReader reader, ref int i)
         {
-            var member = members[i];
+            var m_Node = m_Nodes[i];
-            var varTypeStr = member.m_Type;
+            var varTypeStr = m_Node.m_Type;
             object value;
-            var align = (member.m_MetaFlag & 0x4000) != 0;
+            var align = (m_Node.m_MetaFlag & 0x4000) != 0;
             switch (varTypeStr)
             {
                 case "SInt8":
                     value = reader.ReadSByte();
                     break;
                 case "UInt8":
-                case "char":
                     value = reader.ReadByte();
                     break;
+                case "char":
+                    value = BitConverter.ToChar(reader.ReadBytes(2), 0);
+                    break;
                 case "short":
                 case "SInt16":
                     value = reader.ReadInt16();
@@ -215,17 +236,18 @@ namespace AssetStudio
                     break;
                 case "string":
                     value = reader.ReadAlignedString();
-                    i += 3;
+                    var toSkip = GetNodes(m_Nodes, i);
+                    i += toSkip.Count - 1;
                     break;
                 case "map":
                     {
-                        if ((members[i + 1].m_MetaFlag & 0x4000) != 0)
+                        if ((m_Nodes[i + 1].m_MetaFlag & 0x4000) != 0)
                             align = true;
-                        var map = GetMembers(members, i);
+                        var map = GetNodes(m_Nodes, i);
                         i += map.Count - 1;
-                        var first = GetMembers(map, 4);
+                        var first = GetNodes(map, 4);
                         var next = 4 + first.Count;
-                        var second = GetMembers(map, next);
+                        var second = GetNodes(map, next);
                         var size = reader.ReadInt32();
                         var dic = new List<KeyValuePair<object, object>>(size);
                         for (int j = 0; j < size; j++)
@@ -246,11 +268,11 @@ namespace AssetStudio
                     }
                 default:
                     {
-                        if (i < members.Count - 1 && members[i + 1].m_Type == "Array") //Array
+                        if (i < m_Nodes.Count - 1 && m_Nodes[i + 1].m_Type == "Array") //Array
                         {
-                            if ((members[i + 1].m_MetaFlag & 0x4000) != 0)
+                            if ((m_Nodes[i + 1].m_MetaFlag & 0x4000) != 0)
                                 align = true;
-                            var vector = GetMembers(members, i);
+                            var vector = GetNodes(m_Nodes, i);
                             i += vector.Count - 1;
                             var size = reader.ReadInt32();
                             var list = new List<object>(size);
@@ -264,9 +286,9 @@ namespace AssetStudio
                         }
                         else //Class
                         {
-                            var @class = GetMembers(members, i);
+                            var @class = GetNodes(m_Nodes, i);
                             i += @class.Count - 1;
-                            var obj = new UType();
+                            var obj = new OrderedDictionary();
                             for (int j = 1; j < @class.Count; j++)
                             {
                                 var classmember = @class[j];
@@ -283,22 +305,22 @@ namespace AssetStudio
             return value;
         }
 
-        private static List<TypeTreeNode> GetMembers(List<TypeTreeNode> members, int index)
+        private static List<TypeTreeNode> GetNodes(List<TypeTreeNode> m_Nodes, int index)
         {
-            var member2 = new List<TypeTreeNode>();
+            var nodes = new List<TypeTreeNode>();
-            member2.Add(members[index]);
+            nodes.Add(m_Nodes[index]);
-            var level = members[index].m_Level;
+            var level = m_Nodes[index].m_Level;
-            for (int i = index + 1; i < members.Count; i++)
+            for (int i = index + 1; i < m_Nodes.Count; i++)
             {
-                var member = members[i];
+                var member = m_Nodes[i];
                 var level2 = member.m_Level;
                 if (level2 <= level)
                 {
-                    return member2;
+                    return nodes;
                 }
-                member2.Add(member);
+                nodes.Add(member);
             }
-            return member2;
+            return nodes;
         }
     }
 }

AssetStudio/TypeTreeNode.cs

@@ -11,12 +11,22 @@ namespace AssetStudio
         public string m_Name;
         public int m_ByteSize;
         public int m_Index;
-        public int m_IsArray; //m_TypeFlags
+        public int m_TypeFlags; //m_IsArray
         public int m_Version;
         public int m_MetaFlag;
         public int m_Level;
         public uint m_TypeStrOffset;
         public uint m_NameStrOffset;
         public ulong m_RefTypeHash;
+
+        public TypeTreeNode() { }
+
+        public TypeTreeNode(string type, string name, int level, bool align)
+        {
+            m_Type = type;
+            m_Name = name;
+            m_Level = level;
+            m_MetaFlag = align ? 0x4000 : 0;
+        }
     }
 }

AssetStudio/UType.cs

@@ -1,108 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace AssetStudio
-{
-    public class UType : IDictionary<string, object>
-    {
-        private List<string> keys;
-        private IDictionary<string, object> values;
-
-        public UType()
-        {
-            keys = new List<string>();
-            values = new Dictionary<string, object>();
-        }
-
-        public object this[string key]
-        {
-            get
-            {
-                if (!values.ContainsKey(key))
-                {
-                    return null;
-                }
-                return values[key];
-            }
-            set
-            {
-                if (!values.ContainsKey(key))
-                {
-                    keys.Add(key);
-                }
-                values[key] = value;
-            }
-        }
-
-        public ICollection<string> Keys => keys;
-
-        public ICollection<object> Values => values.Values;
-
-        public int Count => keys.Count;
-
-        public bool IsReadOnly => false;
-
-        public void Add(string key, object value)
-        {
-            keys.Add(key);
-            values.Add(key, value);
-        }
-
-        public void Add(KeyValuePair<string, object> item)
-        {
-            keys.Add(item.Key);
-            values.Add(item);
-        }
-
-        public void Clear()
-        {
-            keys.Clear();
-            values.Clear();
-        }
-
-        public bool Contains(KeyValuePair<string, object> item)
-        {
-            return values.Contains(item);
-        }
-
-        public bool ContainsKey(string key)
-        {
-            return values.ContainsKey(key);
-        }
-
-        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
-        {
-            values.CopyTo(array, arrayIndex);
-        }
-
-        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
-        {
-            return values.GetEnumerator();
-        }
-
-        public bool Remove(string key)
-        {
-            keys.Remove(key);
-            return values.Remove(key);
-        }
-
-        public bool Remove(KeyValuePair<string, object> item)
-        {
-            keys.Remove(item.Key);
-            return values.Remove(item);
-        }
-
-        public bool TryGetValue(string key, out object value)
-        {
-            return values.TryGetValue(key, out value);
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return values.GetEnumerator();
-        }
-    }
-}

AssetStudio/WebFile.cs

@@ -1,17 +1,11 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
-using System.Linq;
 using System.Text;
-using Org.Brotli.Dec;
 
 namespace AssetStudio
 {
     public class WebFile
     {
-        public static byte[] gzipMagic = { 0x1f, 0x8b };
-        public static byte[] brotliMagic = { 0x62, 0x72, 0x6F, 0x74, 0x6C, 0x69 };
         public StreamFile[] fileList;
 
         private class WebData
@@ -23,50 +17,8 @@ namespace AssetStudio
 
         public WebFile(EndianBinaryReader reader)
         {
-            var magic = reader.ReadBytes(2);
+            reader.Endian = EndianType.LittleEndian;
-            reader.Position = 0;
-            if (gzipMagic.SequenceEqual(magic))
-            {
-                var stream = new MemoryStream();
-                using (var gs = new GZipStream(reader.BaseStream, CompressionMode.Decompress))
-                {
-                    gs.CopyTo(stream);
-                }
-                stream.Position = 0;
-                using (var binaryReader = new BinaryReader(stream))
-                {
-                    ReadWebData(binaryReader);
-                }
-            }
-            else
-            {
-                reader.Position = 0x20;
-                magic = reader.ReadBytes(6);
-                reader.Position = 0;
-                if (brotliMagic.SequenceEqual(magic))
-                {
-                    var brotliStream = new BrotliInputStream(reader.BaseStream);
-                    var stream = new MemoryStream();
-                    brotliStream.CopyTo(stream);
-                    stream.Position = 0;
-                    using (var binaryReader = new BinaryReader(stream))
-                    {
-                        ReadWebData(binaryReader);
-                    }
-                }
-                else
-                {
-                    reader.endian = EndianType.LittleEndian;
-                    ReadWebData(reader);
-                }
-            }
-        }
-
-        private void ReadWebData(BinaryReader reader)
-        {
             var signature = reader.ReadStringToNull();
-            if (signature != "UnityWebData1.0")
-                return;
             var headLength = reader.ReadInt32();
             var dataList = new List<WebData>();
             while (reader.BaseStream.Position < headLength)
@@ -83,6 +35,7 @@ namespace AssetStudio
             {
                 var data = dataList[i];
                 var file = new StreamFile();
+                file.path = data.path;
                 file.fileName = Path.GetFileName(data.path);
                 reader.BaseStream.Position = data.dataOffset;
                 file.stream = new MemoryStream(reader.ReadBytes(data.dataLength));

AssetStudioFBX/AssemblyInfo.cpp

@@ -1,20 +0,0 @@
-using namespace System;
-using namespace System::Reflection;
-using namespace System::Runtime::CompilerServices;
-using namespace System::Runtime::InteropServices;
-using namespace System::Security::Permissions;
-
-[assembly:AssemblyTitleAttribute(L"AssetStudioFBX")];
-[assembly:AssemblyDescriptionAttribute(L"")];
-[assembly:AssemblyConfigurationAttribute(L"")];
-[assembly:AssemblyCompanyAttribute(L"")];
-[assembly:AssemblyProductAttribute(L"AssetStudioFBX")];
-[assembly:AssemblyCopyrightAttribute(L"Copyright © Perfare 2018-2020")];
-[assembly:AssemblyTrademarkAttribute(L"")];
-[assembly:AssemblyCultureAttribute(L"")];
-
-[assembly:AssemblyVersionAttribute("1.0.*")];
-
-[assembly:ComVisible(false)];
-
-[assembly:CLSCompliantAttribute(true)];

AssetStudioFBX/AssetStudioFBX.cpp

@@ -1,43 +0,0 @@
-#include "AssetStudioFBX.h"
-
-namespace AssetStudio
-{
-	char* Fbx::StringToUTF8(String^ s)
-	{
-		auto bytes = Text::Encoding::UTF8->GetBytes(s);
-		auto chars = new char[bytes->Length + 1];
-		pin_ptr<unsigned char> ptr = &bytes[0];
-		memcpy(chars, ptr, bytes->Length);
-		chars[bytes->Length] = '\0';
-		return chars;
-	}
-
-	void Fbx::Init(FbxManager** pSdkManager, FbxScene** pScene)
-	{
-		*pSdkManager = FbxManager::Create();
-		if (!pSdkManager)
-		{
-			throw gcnew Exception(gcnew String("Unable to create the FBX SDK manager"));
-		}
-
-		FbxIOSettings* ios = FbxIOSettings::Create(*pSdkManager, IOSROOT);
-		(*pSdkManager)->SetIOSettings(ios);
-		*pScene = FbxScene::Create(*pSdkManager, "");
-	}
-
-	Vector3 Fbx::QuaternionToEuler(Quaternion q)
-	{
-		FbxAMatrix lMatrixRot;
-		lMatrixRot.SetQ(FbxQuaternion(q.X, q.Y, q.Z, q.W));
-		FbxVector4 lEuler = lMatrixRot.GetR();
-		return Vector3((float)lEuler[0], (float)lEuler[1], (float)lEuler[2]);
-	}
-
-	Quaternion Fbx::EulerToQuaternion(Vector3 v)
-	{
-		FbxAMatrix lMatrixRot;
-		lMatrixRot.SetR(FbxVector4(v.X, v.Y, v.Z));
-		FbxQuaternion lQuaternion = lMatrixRot.GetQ();
-		return Quaternion((float)lQuaternion[0], (float)lQuaternion[1], (float)lQuaternion[2], (float)lQuaternion[3]);
-	}
-}

AssetStudioFBX/AssetStudioFBX.h

@@ -1,86 +0,0 @@
-#pragma once
-
-#include <fbxsdk.h>
-
-#ifdef IOS_REF
-#undef  IOS_REF
-#define IOS_REF (*(pSdkManager->GetIOSettings()))
-#endif
-
-using namespace System;
-using namespace System::Collections::Generic;
-using namespace System::IO;
-
-#define WITH_MARSHALLED_STRING(name,str,block)\
-	{ \
-		char* name; \
-		try \
-		{ \
-			name = StringToUTF8(str); \
-			block \
-		} \
-		finally \
-		{ \
-			delete name; \
-		} \
-	}
-
-static char* FBXVersion[] =
-{
-	FBX_2010_00_COMPATIBLE,
-	FBX_2011_00_COMPATIBLE,
-	FBX_2012_00_COMPATIBLE,
-	FBX_2013_00_COMPATIBLE,
-	FBX_2014_00_COMPATIBLE,
-	FBX_2016_00_COMPATIBLE
-};
-
-namespace AssetStudio {
-
-	public ref class Fbx
-	{
-	public:
-		static Vector3 QuaternionToEuler(Quaternion q);
-		static Quaternion EulerToQuaternion(Vector3 v);
-		static char* StringToUTF8(String^ s);
-		static void Init(FbxManager** pSdkManager, FbxScene** pScene);
-
-		ref class Exporter
-		{
-		public:
-			static void Export(String^ path, IImported^ imported, bool eulerFilter, float filterPrecision,
-				bool allNodes, bool skins, bool animation, bool blendShape, bool castToBone, float boneSize, float scaleFactor, int versionIndex, bool isAscii);
-
-		private:
-			bool exportSkins;
-			float boneSize;
-			IImported^ imported;
-			HashSet<String^>^ framePaths;
-			Dictionary<ImportedFrame^, size_t>^ frameToNode;
-			List<ImportedFrame^>^ meshFrames;
-
-			char* cDest;
-			FbxManager* pSdkManager;
-			FbxScene* pScene;
-			FbxExporter* pExporter;
-			FbxArray<FbxSurfacePhong*>* pMaterials;
-			FbxArray<FbxFileTexture*>* pTextures;
-			FbxPose* pBindPose;
-
-			Exporter(String^ name, IImported^ imported, bool allNodes, bool skins, bool castToBone, float boneSize, float scaleFactor, int versionIndex, bool isAscii);
-			~Exporter();
-
-			void Exporter::LinkTexture(ImportedMaterialTexture^ texture, FbxFileTexture* pTexture, FbxProperty& prop);
-			void SetJointsNode(ImportedFrame^ frame, HashSet<String^>^ bonePaths, bool allBones);
-			HashSet<String^>^ SearchHierarchy();
-			void SearchHierarchy(ImportedFrame^ frame, HashSet<String^>^ exportFrames);
-			void SetJointsFromImportedMeshes(bool allBones);
-			void ExportFrame(FbxNode* pParentNode, ImportedFrame^ frame);
-			void ExportMesh(FbxNode* pFrameNode, ImportedMesh^ iMesh);
-			FbxFileTexture* ExportTexture(ImportedTexture^ matTex);
-			void ExportAnimations(bool eulerFilter, float filterValue);
-			void ExportKeyframedAnimation(ImportedKeyframedAnimation^ parser, FbxString& kTakeName, FbxAnimCurveFilterUnroll* eulerFilter, float filterPrecision);
-			void ExportMorphs();
-		};
-	};
-}

AssetStudioFBX/AssetStudioFBX.vcxproj

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{B82DD1BA-4EEC-4F29-A686-03D7F0DF39B8}</ProjectGuid>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <Keyword>ManagedCProj</Keyword>
-    <RootNamespace>AssetStudioFBX</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CLRSupport>true</CLRSupport>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>FBXSDK_SHARED;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libfbxsdk.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x86\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>FBXSDK_SHARED;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libfbxsdk.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x64\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>FBXSDK_SHARED;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libfbxsdk.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x86\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>FBXSDK_SHARED;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libfbxsdk.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.0.1\lib\vs2017\x64\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="AssetStudioFBX.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AssemblyInfo.cpp" />
-    <ClCompile Include="AssetStudioFBX.cpp" />
-    <ClCompile Include="AssetStudioFBXExporter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\AssetStudio\AssetStudio.csproj">
-      <Project>{7662f8c2-7bfd-442e-a948-a43b4f7eb06e}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

AssetStudioFBX/AssetStudioFBX.vcxproj.filters

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="AssetStudioFBX.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AssemblyInfo.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="AssetStudioFBX.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="AssetStudioFBXExporter.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

AssetStudioFBX/AssetStudioFBXExporter.cpp

@@ -1,915 +0,0 @@
-#include "AssetStudioFBX.h"
-
-namespace AssetStudio
-{
-	void Fbx::Exporter::Export(String^ path, IImported^ imported, bool eulerFilter, float filterPrecision,
-		bool allNodes, bool skins, bool animation, bool blendShape, bool castToBone, float boneSize, float scaleFactor, int versionIndex, bool isAscii)
-	{
-		FileInfo^ file = gcnew FileInfo(path);
-		DirectoryInfo^ dir = file->Directory;
-		if (!dir->Exists)
-		{
-			dir->Create();
-		}
-		String^ currentDir = Directory::GetCurrentDirectory();
-		Directory::SetCurrentDirectory(dir->FullName);
-		auto name = Path::GetFileName(path);
-		Exporter^ exporter = gcnew Exporter(name, imported, allNodes, skins, castToBone, boneSize, scaleFactor, versionIndex, isAscii);
-		if (blendShape)
-		{
-			exporter->ExportMorphs();
-		}
-		if (animation)
-		{
-			exporter->ExportAnimations(eulerFilter, filterPrecision);
-		}
-		exporter->pExporter->Export(exporter->pScene);
-		delete exporter;
-
-		Directory::SetCurrentDirectory(currentDir);
-	}
-
-	Fbx::Exporter::Exporter(String^ name, IImported^ imported, bool allNodes, bool skins, bool castToBone, float boneSize, float scaleFactor, int versionIndex, bool isAscii)
-	{
-		this->imported = imported;
-		exportSkins = skins;
-		this->boneSize = boneSize;
-
-		cDest = NULL;
-		pSdkManager = NULL;
-		pScene = NULL;
-		pExporter = NULL;
-		pMaterials = NULL;
-		pTextures = NULL;
-
-		pin_ptr<FbxManager*> pSdkManagerPin = &pSdkManager;
-		pin_ptr<FbxScene*> pScenePin = &pScene;
-		Init(pSdkManagerPin, pScenePin);
-
-		IOS_REF.SetBoolProp(EXP_FBX_MATERIAL, true);
-		IOS_REF.SetBoolProp(EXP_FBX_TEXTURE, true);
-		IOS_REF.SetBoolProp(EXP_FBX_EMBEDDED, false);
-		IOS_REF.SetBoolProp(EXP_FBX_SHAPE, true);
-		IOS_REF.SetBoolProp(EXP_FBX_GOBO, true);
-		IOS_REF.SetBoolProp(EXP_FBX_ANIMATION, true);
-		IOS_REF.SetBoolProp(EXP_FBX_GLOBAL_SETTINGS, true);
-
-		FbxGlobalSettings& globalSettings = pScene->GetGlobalSettings();
-		globalSettings.SetSystemUnit(FbxSystemUnit(scaleFactor));
-
-		if (imported->AnimationList->Count > 0)
-		{
-			auto ani = imported->AnimationList[0];
-			if (ani->SampleRate == 60.0f)
-			{
-				globalSettings.SetTimeMode(FbxTime::eFrames60);
-			}
-		}
-
-		cDest = StringToUTF8(name);
-		pExporter = FbxExporter::Create(pScene, "");
-
-		int pFileFormat = 0;
-		if (versionIndex == 0)
-		{
-			pFileFormat = 3;
-			if (isAscii)
-			{
-				pFileFormat = 4;
-			}
-		}
-		else
-		{
-			pExporter->SetFileExportVersion(FBXVersion[versionIndex]);
-			if (isAscii)
-			{
-				pFileFormat = 1;
-			}
-		}
-
-		if (!pExporter->Initialize(cDest, pFileFormat, pSdkManager->GetIOSettings()))
-		{
-			throw gcnew Exception(gcnew String("Failed to initialize FbxExporter: ") + gcnew String(pExporter->GetStatus().GetErrorString()));
-		}
-
-		framePaths = nullptr;
-		if (!allNodes)
-		{
-			framePaths = SearchHierarchy();
-			if (!framePaths)
-			{
-				return;
-			}
-		}
-
-		pBindPose = FbxPose::Create(pScene, "BindPose");
-		pScene->AddPose(pBindPose);
-
-		frameToNode = gcnew Dictionary<ImportedFrame^, size_t>();
-		meshFrames = imported->MeshList != nullptr ? gcnew List<ImportedFrame^>() : nullptr;
-		ExportFrame(pScene->GetRootNode(), imported->RootFrame);
-
-		if (imported->MeshList != nullptr)
-		{
-			SetJointsFromImportedMeshes(castToBone);
-
-			pMaterials = new FbxArray<FbxSurfacePhong*>();
-			pTextures = new FbxArray<FbxFileTexture*>();
-			pMaterials->Reserve(imported->MaterialList->Count);
-			pTextures->Reserve(imported->TextureList->Count);
-
-			for (int i = 0; i < meshFrames->Count; i++)
-			{
-				auto meshFram = meshFrames[i];
-				FbxNode* meshNode = (FbxNode*)frameToNode[meshFram];
-				ImportedMesh^ mesh = ImportedHelpers::FindMesh(meshFram->Path, imported->MeshList);
-				ExportMesh(meshNode, mesh);
-			}
-		}
-		else
-		{
-			SetJointsNode(imported->RootFrame, nullptr, true);
-		}
-	}
-
-	Fbx::Exporter::~Exporter()
-	{
-		imported = nullptr;
-		if (framePaths != nullptr)
-		{
-			framePaths->Clear();
-		}
-		if (frameToNode != nullptr)
-		{
-			frameToNode->Clear();
-		}
-		if (meshFrames != nullptr)
-		{
-			meshFrames->Clear();
-		}
-
-		if (pMaterials != NULL)
-		{
-			delete pMaterials;
-		}
-		if (pTextures != NULL)
-		{
-			delete pTextures;
-		}
-		if (pExporter != NULL)
-		{
-			pExporter->Destroy();
-		}
-		if (pScene != NULL)
-		{
-			pScene->Destroy();
-		}
-		if (pSdkManager != NULL)
-		{
-			pSdkManager->Destroy();
-		}
-		if (cDest != NULL)
-		{
-			delete cDest;
-		}
-	}
-
-	void Fbx::Exporter::SetJointsNode(ImportedFrame^ frame, HashSet<String^>^ bonePaths, bool castToBone)
-	{
-		size_t pointer;
-		if (frameToNode->TryGetValue(frame, pointer))
-		{
-			auto pNode = (FbxNode*)pointer;
-			if (castToBone)
-			{
-				FbxSkeleton* pJoint = FbxSkeleton::Create(pScene, "");
-				pJoint->Size.Set(FbxDouble(boneSize));
-				pJoint->SetSkeletonType(FbxSkeleton::eLimbNode);
-				pNode->SetNodeAttribute(pJoint);
-			}
-			else if (bonePaths->Contains(frame->Path))
-			{
-				FbxSkeleton* pJoint = FbxSkeleton::Create(pScene, "");
-				pJoint->Size.Set(FbxDouble(boneSize));
-				pJoint->SetSkeletonType(FbxSkeleton::eLimbNode);
-				pNode->SetNodeAttribute(pJoint);
-
-				pJoint = FbxSkeleton::Create(pScene, "");
-				pJoint->Size.Set(FbxDouble(boneSize));
-				pJoint->SetSkeletonType(FbxSkeleton::eLimbNode);
-				pNode->GetParent()->SetNodeAttribute(pJoint);
-			}
-			else
-			{
-				FbxNull* pNull = FbxNull::Create(pScene, "");
-				if (pNode->GetChildCount() > 0)
-				{
-					pNull->Look.Set(FbxNull::eNone);
-				}
-
-				pNode->SetNodeAttribute(pNull);
-			}
-		}
-		for (int i = 0; i < frame->Count; i++)
-		{
-			SetJointsNode(frame[i], bonePaths, castToBone);
-		}
-	}
-
-	HashSet<String^>^ Fbx::Exporter::SearchHierarchy()
-	{
-		if (imported->MeshList == nullptr || imported->MeshList->Count == 0)
-		{
-			return nullptr;
-		}
-		HashSet<String^>^ exportFrames = gcnew HashSet<String^>();
-		SearchHierarchy(imported->RootFrame, exportFrames);
-		return exportFrames;
-	}
-
-	void Fbx::Exporter::SearchHierarchy(ImportedFrame^ frame, HashSet<String^>^ exportFrames)
-	{
-		ImportedMesh^ meshListSome = ImportedHelpers::FindMesh(frame->Path, imported->MeshList);
-		if (meshListSome != nullptr)
-		{
-			ImportedFrame^ parent = frame;
-			while (parent != nullptr)
-			{
-				exportFrames->Add(parent->Path);
-				parent = parent->Parent;
-			}
-
-			List<ImportedBone^>^ boneList = meshListSome->BoneList;
-			if (boneList != nullptr)
-			{
-				for (int i = 0; i < boneList->Count; i++)
-				{
-					if (!exportFrames->Contains(boneList[i]->Path))
-					{
-						ImportedFrame^ boneParent = imported->RootFrame->FindFrameByPath(boneList[i]->Path);
-						while (boneParent != nullptr)
-						{
-							exportFrames->Add(boneParent->Path);
-							boneParent = boneParent->Parent;
-						}
-					}
-				}
-			}
-		}
-
-		for (int i = 0; i < frame->Count; i++)
-		{
-			SearchHierarchy(frame[i], exportFrames);
-		}
-	}
-
-	void Fbx::Exporter::SetJointsFromImportedMeshes(bool castToBone)
-	{
-		if (!exportSkins)
-		{
-			return;
-		}
-		HashSet<String^>^ bonePaths = gcnew HashSet<String^>();
-		for (int i = 0; i < imported->MeshList->Count; i++)
-		{
-			ImportedMesh^ meshList = imported->MeshList[i];
-			List<ImportedBone^>^ boneList = meshList->BoneList;
-			if (boneList != nullptr)
-			{
-				for (int j = 0; j < boneList->Count; j++)
-				{
-					ImportedBone^ bone = boneList[j];
-					bonePaths->Add(bone->Path);
-				}
-			}
-		}
-
-		SetJointsNode(imported->RootFrame, bonePaths, castToBone);
-	}
-
-	void Fbx::Exporter::ExportFrame(FbxNode* pParentNode, ImportedFrame^ frame)
-	{
-		if (framePaths == nullptr || framePaths->Contains(frame->Path))
-		{
-			FbxNode* pFrameNode;
-			WITH_MARSHALLED_STRING
-			(
-				pName,
-				frame->Name,
-				pFrameNode = FbxNode::Create(pScene, pName);
-			);
-
-			pFrameNode->LclScaling.Set(FbxDouble3(frame->LocalScale.X, frame->LocalScale.Y, frame->LocalScale.Z));
-			pFrameNode->LclRotation.Set(FbxDouble3(frame->LocalRotation.X, frame->LocalRotation.Y, frame->LocalRotation.Z));
-			pFrameNode->LclTranslation.Set(FbxDouble3(frame->LocalPosition.X, frame->LocalPosition.Y, frame->LocalPosition.Z));
-			pFrameNode->SetPreferedAngle(pFrameNode->LclRotation.Get());
-			pParentNode->AddChild(pFrameNode);
-			pBindPose->Add(pFrameNode, pFrameNode->EvaluateGlobalTransform());
-
-			if (imported->MeshList != nullptr && ImportedHelpers::FindMesh(frame->Path, imported->MeshList) != nullptr)
-			{
-				meshFrames->Add(frame);
-			}
-
-			frameToNode->Add(frame, (size_t)pFrameNode);
-
-			for (int i = 0; i < frame->Count; i++)
-			{
-				ExportFrame(pFrameNode, frame[i]);
-			}
-		}
-	}
-
-	void Fbx::Exporter::ExportMesh(FbxNode* pFrameNode, ImportedMesh^ iMesh)
-	{
-		List<ImportedBone^>^ boneList = iMesh->BoneList;
-		bool hasBones;
-		if (exportSkins && boneList != nullptr)
-		{
-			hasBones = boneList->Count > 0;
-		}
-		else
-		{
-			hasBones = false;
-		}
-
-		FbxArray<FbxCluster*>* pClusterArray = nullptr;
-
-		try
-		{
-			if (hasBones)
-			{
-				pClusterArray = new FbxArray<FbxCluster*>(boneList->Count);
-
-				for (int i = 0; i < boneList->Count; i++)
-				{
-					auto bone = boneList[i];
-					if (bone->Path != nullptr)
-					{
-						auto frame = imported->RootFrame->FindFrameByPath(bone->Path);
-						auto boneNode = (FbxNode*)frameToNode[frame];
-						FbxString lClusterName = boneNode->GetNameOnly() + FbxString("Cluster");
-						FbxCluster* pCluster = FbxCluster::Create(pScene, lClusterName.Buffer());
-						pCluster->SetLink(boneNode);
-						pCluster->SetLinkMode(FbxCluster::eTotalOne);
-						pClusterArray->Add(pCluster);
-					}
-					else
-					{
-						pClusterArray->Add(NULL);
-					}
-				}
-			}
-
-			FbxMesh* pMesh = FbxMesh::Create(pScene, pFrameNode->GetName());
-			pFrameNode->SetNodeAttribute(pMesh);
-
-			int vertexCount = 0;
-			for (int i = 0; i < iMesh->SubmeshList->Count; i++)
-			{
-				vertexCount += iMesh->SubmeshList[i]->VertexList->Count;
-			}
-
-			pMesh->InitControlPoints(vertexCount);
-			FbxVector4* pControlPoints = pMesh->GetControlPoints();
-
-			FbxGeometryElementNormal* lGeometryElementNormal = NULL;
-			if (iMesh->hasNormal)
-			{
-				lGeometryElementNormal = pMesh->CreateElementNormal();
-				lGeometryElementNormal->SetMappingMode(FbxGeometryElement::eByControlPoint);
-				lGeometryElementNormal->SetReferenceMode(FbxGeometryElement::eDirect);
-			}
-
-			if (iMesh->hasUV[0]) 
-			{
-				auto lGeometryElementUV = pMesh->CreateElementUV("UV0", FbxLayerElement::eTextureDiffuse);
-				lGeometryElementUV->SetMappingMode(FbxGeometryElement::eByControlPoint);
-				lGeometryElementUV->SetReferenceMode(FbxGeometryElement::eDirect);
-			}
-
-			if (iMesh->hasUV[1])
-			{
-				auto lGeometryElementUV = pMesh->CreateElementUV("UV1", FbxLayerElement::eTextureNormalMap);
-				lGeometryElementUV->SetMappingMode(FbxGeometryElement::eByControlPoint);
-				lGeometryElementUV->SetReferenceMode(FbxGeometryElement::eDirect);
-			}
-
-			/*for (int uv = 0; uv < 8; uv++)
-			{
-				if (iMesh->hasUV[uv])
-				{
-					auto lGeometryElementUV = pMesh->CreateElementUV(FbxString("UV") + FbxString(uv));
-					lGeometryElementUV->SetMappingMode(FbxGeometryElement::eByControlPoint);
-					lGeometryElementUV->SetReferenceMode(FbxGeometryElement::eDirect);
-				}
-			}*/
-
-			FbxGeometryElementTangent* lGeometryElementTangent = NULL;
-			if (iMesh->hasTangent)
-			{
-				lGeometryElementTangent = pMesh->CreateElementTangent();
-				lGeometryElementTangent->SetMappingMode(FbxGeometryElement::eByControlPoint);
-				lGeometryElementTangent->SetReferenceMode(FbxGeometryElement::eDirect);
-			}
-
-			FbxGeometryElementVertexColor* lGeometryElementVertexColor = NULL;
-			if (iMesh->hasColor)
-			{
-				lGeometryElementVertexColor = pMesh->CreateElementVertexColor();
-				lGeometryElementVertexColor->SetMappingMode(FbxGeometryElement::eByControlPoint);
-				lGeometryElementVertexColor->SetReferenceMode(FbxGeometryElement::eDirect);
-			}
-
-			FbxGeometryElementMaterial* lGeometryElementMaterial = pMesh->CreateElementMaterial();
-			lGeometryElementMaterial->SetMappingMode(FbxGeometryElement::eByPolygon);
-			lGeometryElementMaterial->SetReferenceMode(FbxGeometryElement::eIndexToDirect);
-
-			int firstVertex = 0;
-			for (int i = 0; i < iMesh->SubmeshList->Count; i++)
-			{
-				ImportedSubmesh^ meshObj = iMesh->SubmeshList[i];
-				List<ImportedVertex^>^ vertexList = meshObj->VertexList;
-				List<ImportedFace^>^ faceList = meshObj->FaceList;
-
-				int materialIndex = 0;
-				ImportedMaterial^ mat = ImportedHelpers::FindMaterial(meshObj->Material, imported->MaterialList);
-				if (mat != nullptr)
-				{
-					char* pMatName = NULL;
-					try
-					{
-						pMatName = StringToUTF8(mat->Name);
-						int foundMat = -1;
-						for (int j = 0; j < pMaterials->GetCount(); j++)
-						{
-							FbxSurfacePhong* pMatTemp = pMaterials->GetAt(j);
-							if (strcmp(pMatTemp->GetName(), pMatName) == 0)
-							{
-								foundMat = j;
-								break;
-							}
-						}
-
-						FbxSurfacePhong* pMat;
-						if (foundMat >= 0)
-						{
-							pMat = pMaterials->GetAt(foundMat);
-						}
-						else
-						{
-							FbxString lShadingName = "Phong";
-							Color diffuse = mat->Diffuse;
-							Color ambient = mat->Ambient;
-							Color emissive = mat->Emissive;
-							Color specular = mat->Specular;
-							Color reflection = mat->Reflection;
-							pMat = FbxSurfacePhong::Create(pScene, pMatName);
-							pMat->Diffuse.Set(FbxDouble3(diffuse.R, diffuse.G, diffuse.B));
-							//pMat->DiffuseFactor.Set(FbxDouble(diffuse.A));
-							pMat->Ambient.Set(FbxDouble3(ambient.R, ambient.G, ambient.B));
-							//pMat->AmbientFactor.Set(FbxDouble(ambient.A));
-							pMat->Emissive.Set(FbxDouble3(emissive.R, emissive.G, emissive.B));
-							//pMat->EmissiveFactor.Set(FbxDouble(emissive.A));
-							pMat->Specular.Set(FbxDouble3(specular.R, specular.G, specular.B));
-							//pMat->SpecularFactor.Set(FbxDouble(specular.A));
-							pMat->Reflection.Set(FbxDouble3(reflection.R, reflection.G, reflection.B));
-							//pMat->ReflectionFactor.Set(FbxDouble(reflection.A));
-							pMat->Shininess.Set(FbxDouble(mat->Shininess));
-							pMat->TransparencyFactor.Set(FbxDouble(mat->Transparency));
-							pMat->ShadingModel.Set(lShadingName);
-							pMaterials->Add(pMat);
-						}
-						materialIndex = pFrameNode->AddMaterial(pMat);
-
-						bool hasTexture = false;
-
-						for each (ImportedMaterialTexture ^ texture in mat->Textures)
-						{
-							auto pTexture = ExportTexture(ImportedHelpers::FindTexture(texture->Name, imported->TextureList));
-							if (pTexture != NULL)
-							{
-								if (texture->Dest == 0)
-								{
-									LinkTexture(texture, pTexture, pMat->Diffuse);
-									hasTexture = true;
-								}
-								else if (texture->Dest == 1)
-								{
-									LinkTexture(texture, pTexture, pMat->NormalMap);
-									hasTexture = true;
-								}
-								else if (texture->Dest == 2)
-								{
-									LinkTexture(texture, pTexture, pMat->Specular);
-									hasTexture = true;
-								}
-								else if (texture->Dest == 3)
-								{
-									LinkTexture(texture, pTexture, pMat->Bump);
-									hasTexture = true;
-								}
-							}
-						}
-
-						if (hasTexture)
-						{
-							pFrameNode->SetShadingMode(FbxNode::eTextureShading);
-						}
-					}
-					finally
-					{
-						delete pMatName;
-					}
-				}
-
-				for (int j = 0; j < vertexList->Count; j++)
-				{
-					ImportedVertex^ iVertex = vertexList[j];
-
-					Vector3 vertex = iVertex->Vertex;
-					pControlPoints[j + firstVertex] = FbxVector4(vertex.X, vertex.Y, vertex.Z, 0);
-
-					if (iMesh->hasNormal)
-					{
-						Vector3 normal = iVertex->Normal;
-						lGeometryElementNormal->GetDirectArray().Add(FbxVector4(normal.X, normal.Y, normal.Z, 0));
-					}
-
-					//for (int uv = 0; uv < 8; uv++)
-					for (int uv = 0; uv < 2; uv++)
-					{
-						if (iMesh->hasUV[uv])
-						{
-							auto m_UV = iVertex->UV[uv];
-							auto lGeometryElementUV = pMesh->GetElementUV(uv);
-							lGeometryElementUV->GetDirectArray().Add(FbxVector2(m_UV[0], m_UV[1]));
-						}
-					}
-
-					if (iMesh->hasTangent)
-					{
-						Vector4 tangent = iVertex->Tangent;
-						lGeometryElementTangent->GetDirectArray().Add(FbxVector4(tangent.X, tangent.Y, tangent.Z, tangent.W));
-					}
-
-					if (iMesh->hasColor)
-					{
-						auto color = iVertex->Color;
-						lGeometryElementVertexColor->GetDirectArray().Add(FbxColor(color.R, color.G, color.B, color.A));
-					}
-
-					if (hasBones && iVertex->BoneIndices != nullptr)
-					{
-						auto boneIndices = iVertex->BoneIndices;
-						auto weights4 = iVertex->Weights;
-						for (int k = 0; k < 4; k++)
-						{
-							if (boneIndices[k] < boneList->Count && weights4[k] > 0)
-							{
-								FbxCluster* pCluster = pClusterArray->GetAt(boneIndices[k]);
-								if (pCluster)
-								{
-									pCluster->AddControlPointIndex(j + firstVertex, weights4[k]);
-								}
-							}
-						}
-					}
-				}
-
-				for (int j = 0; j < faceList->Count; j++)
-				{
-					ImportedFace^ face = faceList[j];
-					pMesh->BeginPolygon(materialIndex);
-					pMesh->AddPolygon(face->VertexIndices[0] + firstVertex);
-					pMesh->AddPolygon(face->VertexIndices[1] + firstVertex);
-					pMesh->AddPolygon(face->VertexIndices[2] + firstVertex);
-					pMesh->EndPolygon();
-				}
-
-				firstVertex += vertexList->Count;
-			}
-
-			if (hasBones)
-			{
-				FbxSkin* pSkin = FbxSkin::Create(pScene, "");
-				FbxAMatrix lMeshMatrix = pFrameNode->EvaluateGlobalTransform();
-				for (int j = 0; j < boneList->Count; j++)
-				{
-					FbxCluster* pCluster = pClusterArray->GetAt(j);
-					if (pCluster)
-					{
-						auto boneMatrix = boneList[j]->Matrix;
-						FbxAMatrix lBoneMatrix;
-						for (int m = 0; m < 4; m++)
-						{
-							for (int n = 0; n < 4; n++)
-							{
-								lBoneMatrix.mData[m][n] = boneMatrix[m, n];
-							}
-						}
-
-						pCluster->SetTransformMatrix(lMeshMatrix);
-						pCluster->SetTransformLinkMatrix(lMeshMatrix * lBoneMatrix.Inverse());
-
-						pSkin->AddCluster(pCluster);
-					}
-				}
-
-				if (pSkin->GetClusterCount() > 0)
-				{
-					pMesh->AddDeformer(pSkin);
-				}
-			}
-		}
-		finally
-		{
-			if (pClusterArray != NULL)
-			{
-				delete pClusterArray;
-			}
-		}
-	}
-
-	FbxFileTexture* Fbx::Exporter::ExportTexture(ImportedTexture^ matTex)
-	{
-		FbxFileTexture* pTex = NULL;
-
-		if (matTex != nullptr)
-		{
-			String^ matTexName = matTex->Name;
-			char* pTexName = NULL;
-			try
-			{
-				pTexName = StringToUTF8(matTexName);
-				int foundTex = -1;
-				for (int i = 0; i < pTextures->GetCount(); i++)
-				{
-					FbxFileTexture* pTexTemp = pTextures->GetAt(i);
-					if (strcmp(pTexTemp->GetName(), pTexName) == 0)
-					{
-						foundTex = i;
-						break;
-					}
-				}
-
-				if (foundTex >= 0)
-				{
-					pTex = pTextures->GetAt(foundTex);
-				}
-				else
-				{
-					pTex = FbxFileTexture::Create(pScene, pTexName);
-					pTex->SetFileName(pTexName);
-					pTex->SetTextureUse(FbxTexture::eStandard);
-					pTex->SetMappingType(FbxTexture::eUV);
-					pTex->SetMaterialUse(FbxFileTexture::eModelMaterial);
-					pTex->SetSwapUV(false);
-					pTex->SetTranslation(0.0, 0.0);
-					pTex->SetScale(1.0, 1.0);
-					pTex->SetRotation(0.0, 0.0);
-					pTextures->Add(pTex);
-
-					FileInfo^ file = gcnew FileInfo(matTex->Name);
-					BinaryWriter^ writer = gcnew BinaryWriter(file->Create());
-					writer->Write(matTex->Data);
-					writer->Close();
-				}
-			}
-			finally
-			{
-				delete pTexName;
-			}
-		}
-
-		return pTex;
-	}
-
-	void Fbx::Exporter::LinkTexture(ImportedMaterialTexture^ texture, FbxFileTexture* pTexture, FbxProperty& prop)
-	{
-		pTexture->SetTranslation(texture->Offset.X, texture->Offset.Y);
-		pTexture->SetScale(texture->Scale.X, texture->Scale.Y);
-		prop.ConnectSrcObject(pTexture);
-	}
-
-	void Fbx::Exporter::ExportAnimations(bool eulerFilter, float filterPrecision)
-	{
-		auto importedAnimationList = imported->AnimationList;
-		if (importedAnimationList == nullptr)
-		{
-			return;
-		}
-
-		FbxAnimCurveFilterUnroll* lFilter = eulerFilter ? new FbxAnimCurveFilterUnroll() : NULL;
-
-		for (int i = 0; i < importedAnimationList->Count; i++)
-		{
-			auto importedAnimation = importedAnimationList[i];
-			FbxString kTakeName;
-			if (importedAnimation->Name)
-			{
-				WITH_MARSHALLED_STRING
-				(
-					pClipName,
-					importedAnimation->Name,
-					kTakeName = FbxString(pClipName);
-				);
-			}
-			else
-			{
-				kTakeName = FbxString("Take") + FbxString(i);
-			}
-			ExportKeyframedAnimation(importedAnimation, kTakeName, lFilter, filterPrecision);
-		}
-	}
-
-	void Fbx::Exporter::ExportKeyframedAnimation(ImportedKeyframedAnimation^ parser, FbxString& kTakeName, FbxAnimCurveFilterUnroll* eulerFilter, float filterPrecision)
-	{
-		List<ImportedAnimationKeyframedTrack^>^ pAnimationList = parser->TrackList;
-
-		char* lTakeName = kTakeName.Buffer();
-
-		FbxAnimStack* lAnimStack = FbxAnimStack::Create(pScene, lTakeName);
-		FbxAnimLayer* lAnimLayer = FbxAnimLayer::Create(pScene, "Base Layer");
-		lAnimStack->AddMember(lAnimLayer);
-
-		for (int j = 0; j < pAnimationList->Count; j++)
-		{
-			ImportedAnimationKeyframedTrack^ keyframeList = pAnimationList[j];
-			if (keyframeList->Path == nullptr)
-			{
-				continue;
-			}
-			auto frame = imported->RootFrame->FindFrameByPath(keyframeList->Path);
-			if (frame != nullptr)
-			{
-				FbxNode* pNode = (FbxNode*)frameToNode[frame];
-
-				FbxAnimCurve* lCurveSX = pNode->LclScaling.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_X, true);
-				FbxAnimCurve* lCurveSY = pNode->LclScaling.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_Y, true);
-				FbxAnimCurve* lCurveSZ = pNode->LclScaling.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_Z, true);
-				FbxAnimCurve* lCurveRX = pNode->LclRotation.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_X, true);
-				FbxAnimCurve* lCurveRY = pNode->LclRotation.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_Y, true);
-				FbxAnimCurve* lCurveRZ = pNode->LclRotation.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_Z, true);
-				FbxAnimCurve* lCurveTX = pNode->LclTranslation.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_X, true);
-				FbxAnimCurve* lCurveTY = pNode->LclTranslation.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_Y, true);
-				FbxAnimCurve* lCurveTZ = pNode->LclTranslation.GetCurve(lAnimLayer, FBXSDK_CURVENODE_COMPONENT_Z, true);
-
-				lCurveSX->KeyModifyBegin();
-				lCurveSY->KeyModifyBegin();
-				lCurveSZ->KeyModifyBegin();
-				lCurveRX->KeyModifyBegin();
-				lCurveRY->KeyModifyBegin();
-				lCurveRZ->KeyModifyBegin();
-				lCurveTX->KeyModifyBegin();
-				lCurveTY->KeyModifyBegin();
-				lCurveTZ->KeyModifyBegin();
-
-				FbxTime lTime;
-
-				for each (auto Scaling in keyframeList->Scalings)
-				{
-					lTime.SetSecondDouble(Scaling->time);
-
-					lCurveSX->KeySet(lCurveSX->KeyAdd(lTime), lTime, Scaling->value.X);
-					lCurveSY->KeySet(lCurveSY->KeyAdd(lTime), lTime, Scaling->value.Y);
-					lCurveSZ->KeySet(lCurveSZ->KeyAdd(lTime), lTime, Scaling->value.Z);
-				}
-				for each (auto Rotation in keyframeList->Rotations)
-				{
-					lTime.SetSecondDouble(Rotation->time);
-
-					lCurveRX->KeySet(lCurveRX->KeyAdd(lTime), lTime, Rotation->value.X);
-					lCurveRY->KeySet(lCurveRY->KeyAdd(lTime), lTime, Rotation->value.Y);
-					lCurveRZ->KeySet(lCurveRZ->KeyAdd(lTime), lTime, Rotation->value.Z);
-				}
-				for each (auto Translation in keyframeList->Translations)
-				{
-					lTime.SetSecondDouble(Translation->time);
-
-					lCurveTX->KeySet(lCurveTX->KeyAdd(lTime), lTime, Translation->value.X);
-					lCurveTY->KeySet(lCurveTY->KeyAdd(lTime), lTime, Translation->value.Y);
-					lCurveTZ->KeySet(lCurveTZ->KeyAdd(lTime), lTime, Translation->value.Z);
-				}
-
-				lCurveSX->KeyModifyEnd();
-				lCurveSY->KeyModifyEnd();
-				lCurveSZ->KeyModifyEnd();
-				lCurveRX->KeyModifyEnd();
-				lCurveRY->KeyModifyEnd();
-				lCurveRZ->KeyModifyEnd();
-				lCurveTX->KeyModifyEnd();
-				lCurveTY->KeyModifyEnd();
-				lCurveTZ->KeyModifyEnd();
-
-				if (eulerFilter)
-				{
-					FbxAnimCurve* lCurve[3];
-					lCurve[0] = lCurveRX;
-					lCurve[1] = lCurveRY;
-					lCurve[2] = lCurveRZ;
-					eulerFilter->Reset();
-					eulerFilter->SetQualityTolerance(filterPrecision);
-					eulerFilter->Apply(lCurve, 3);
-				}
-
-				//BlendShape
-				if (keyframeList->BlendShape != nullptr)
-				{
-					FbxString channelName;
-					WITH_MARSHALLED_STRING
-					(
-						pClipName,
-						keyframeList->BlendShape->ChannelName,
-						channelName = FbxString(pClipName);
-					);
-
-					auto lGeometry = (FbxGeometry*)pNode->GetNodeAttribute();
-					int lBlendShapeDeformerCount = lGeometry->GetDeformerCount(FbxDeformer::eBlendShape);
-					if (lBlendShapeDeformerCount > 0)
-					{
-						FbxBlendShape* lBlendShape = (FbxBlendShape*)lGeometry->GetDeformer(0, FbxDeformer::eBlendShape);
-						int lBlendShapeChannelCount = lBlendShape->GetBlendShapeChannelCount();
-						for (int lChannelIndex = 0; lChannelIndex < lBlendShapeChannelCount; ++lChannelIndex)
-						{
-							FbxBlendShapeChannel* lChannel = lBlendShape->GetBlendShapeChannel(lChannelIndex);
-							FbxString lChannelName = lChannel->GetNameOnly();
-							if (lChannelName == channelName)
-							{
-								FbxAnimCurve* lAnimCurve = lGeometry->GetShapeChannel(0, lChannelIndex, lAnimLayer, true);
-								lAnimCurve->KeyModifyBegin();
-
-								for each (auto keyframe in keyframeList->BlendShape->Keyframes)
-								{
-									lTime.SetSecondDouble(keyframe->time);
-									int lKeyIndex = lAnimCurve->KeyAdd(lTime);
-									lAnimCurve->KeySetValue(lKeyIndex, keyframe->value);
-									lAnimCurve->KeySetInterpolation(lKeyIndex, FbxAnimCurveDef::eInterpolationCubic);
-								}
-
-								lAnimCurve->KeyModifyEnd();
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	void Fbx::Exporter::ExportMorphs()
-	{
-		if (imported->MeshList == nullptr)
-		{
-			return;
-		}
-		for each (ImportedMorph ^ morph in imported->MorphList)
-		{
-			auto frame = imported->RootFrame->FindFrameByPath(morph->Path);
-			if (frame != nullptr)
-			{
-				FbxNode* pNode = (FbxNode*)frameToNode[frame];
-				FbxMesh* pMesh = pNode->GetMesh();
-
-				FbxBlendShape* lBlendShape = FbxBlendShape::Create(pScene, pMesh->GetNameOnly() + FbxString("BlendShape"));
-				pMesh->AddDeformer(lBlendShape);
-
-				for (int i = 0; i < morph->Channels->Count; i++)
-				{
-					auto channel = morph->Channels[i];
-
-					FbxBlendShapeChannel* lBlendShapeChannel;
-					WITH_MARSHALLED_STRING
-					(
-						pChannelName,
-						channel->Name,
-						lBlendShapeChannel = FbxBlendShapeChannel::Create(pScene, pChannelName);
-					);
-					lBlendShape->AddBlendShapeChannel(lBlendShapeChannel);
-
-					for each (ImportedMorphKeyframe ^ keyframe in channel->KeyframeList)
-					{
-						FbxShape* lShape = FbxShape::Create(pScene, FbxString(keyframe->Weight));
-						lBlendShapeChannel->AddTargetShape(lShape, keyframe->Weight);
-
-						auto vectorCount = pMesh->GetControlPointsCount();
-						FbxVector4* orilVector4 = pMesh->GetControlPoints();
-						lShape->InitControlPoints(vectorCount);
-						FbxVector4* lVector4 = lShape->GetControlPoints();
-
-						for (int j = 0; j < vectorCount; j++)
-						{
-							auto vertex = orilVector4[j];
-							lVector4[j] = FbxVector4(vertex);
-						}
-						for (int j = 0; j < keyframe->VertexList->Count; j++)
-						{
-							auto index = keyframe->VertexList[j]->Index;
-							auto vertex = keyframe->VertexList[j]->Vertex->Vertex;
-							lVector4[index] = FbxVector4(vertex.X, vertex.Y, vertex.Z, 0);
-						}
-					}
-				}
-			}
-		}
-	}
-}

AssetStudioFBXNative/AssetStudioFBXNative.rc

@@ -0,0 +1,99 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Language neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "FileDescription", "AssetStudioFBXNative"
+            VALUE "FileVersion", "1.0.0.1"
+            VALUE "InternalName", "AssetStudioFBXNative.dll"
+            VALUE "LegalCopyright", "Copyright (C) Perfare 2018-2020; Copyright (C) hozuki 2020"
+            VALUE "OriginalFilename", "AssetStudioFBXNative.dll"
+            VALUE "ProductName", "AssetStudioFBXNative"
+            VALUE "ProductVersion", "1.0.0.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // Language neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

AssetStudioFBXNative/AssetStudioFBXNative.vcxproj

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{11ea25a3-ed68-40ee-a9d0-7fde3b583027}</ProjectGuid>
+    <RootNamespace>AssetStudioFBXNative</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetExt>.dll</TargetExt>
+    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_AS_DLL;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libfbxsdk-mt.lib;libxml2-mt.lib;zlib-mt.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\lib\vs2019\x86\debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_AS_DLL;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libfbxsdk-mt.lib;libxml2-mt.lib;zlib-mt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\lib\vs2019\x86\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_AS_DLL;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libfbxsdk-mt.lib;libxml2-mt.lib;zlib-mt.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\lib\vs2019\x64\debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_AS_DLL;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libfbxsdk-mt.lib;libxml2-mt.lib;zlib-mt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Program Files\Autodesk\FBX\FBX SDK\2020.2.1\lib\vs2019\x64\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="asfbx_anim_context.cpp" />
+    <ClCompile Include="asfbx_context.cpp" />
+    <ClCompile Include="api.cpp" />
+    <ClCompile Include="asfbx_morph_context.cpp" />
+    <ClCompile Include="asfbx_skin_context.cpp" />
+    <ClCompile Include="utils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="api.h" />
+    <ClInclude Include="asfbx_anim_context.h" />
+    <ClInclude Include="asfbx_context.h" />
+    <ClInclude Include="asfbx_morph_context.h" />
+    <ClInclude Include="asfbx_skin_context.h" />
+    <ClInclude Include="bool32_t.h" />
+    <ClInclude Include="dllexport.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="utils.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="cpp.hint" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="AssetStudioFBXNative.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <Target Name="AfterBuild">
+    <MSBuild Condition=" '$(Platform)' == 'Win32' " Projects="$(MSBuildProjectFile)" Properties="Platform=x64;PlatFormTarget=x64" RunEachTargetSeparately="true" />
+  </Target>
+</Project>

AssetStudioFBXNative/AssetStudioFBXNative.vcxproj.filters

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="源文件">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="头文件">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="资源文件">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="utils.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="api.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="asfbx_context.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="asfbx_skin_context.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="asfbx_anim_context.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="asfbx_morph_context.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="dllexport.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="api.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="utils.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="bool32_t.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="asfbx_context.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="asfbx_skin_context.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="asfbx_anim_context.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="asfbx_morph_context.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="cpp.hint" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="AssetStudioFBXNative.rc">
+      <Filter>资源文件</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

AssetStudioFBXNative/api.h

@@ -0,0 +1,161 @@
+#pragma once
+
+#include "dllexport.h"
+#include "bool32_t.h"
+
+namespace fbxsdk
+{
+	class FbxNode;
+	class FbxFileTexture;
+	template<typename T, const int Alignment = 16>
+	class FbxArray;
+	class FbxCluster;
+	class FbxMesh;
+	class FbxSurfacePhong;
+}
+
+struct AsFbxContext;
+struct AsFbxSkinContext;
+struct AsFbxAnimContext;
+struct AsFbxMorphContext;
+
+AS_API(void) AsUtilQuaternionToEuler(float qx, float qy, float qz, float qw, float* vx, float* vy, float* vz);
+
+AS_API(void) AsUtilEulerToQuaternion(float vx, float vy, float vz, float* qx, float* qy, float* qz, float* qw);
+
+// All strings ([const] char *) in this header are UTF-8 strings.
+
+AS_API(AsFbxContext*) AsFbxCreateContext();
+
+// Do not free pErrMsg
+AS_API(bool32_t) AsFbxInitializeContext(AsFbxContext* pContext, const char* pFileName, float scaleFactor, int32_t versionIndex, bool32_t isAscii, bool32_t is60Fps, const char** pErrMsg);
+
+AS_API(void) AsFbxDisposeContext(AsFbxContext** ppContext);
+
+AS_API(void) AsFbxSetFramePaths(AsFbxContext* pContext, const char* ppPaths[], int32_t count);
+
+AS_API(void) AsFbxExportScene(AsFbxContext* pContext);
+
+AS_API(fbxsdk::FbxNode*) AsFbxGetSceneRootNode(AsFbxContext* pContext);
+
+AS_API(fbxsdk::FbxNode*) AsFbxExportSingleFrame(AsFbxContext* pContext, fbxsdk::FbxNode* pParentNode, const char* pFramePath, const char* pFrameName, float localPositionX, float localPositionY, float localPositionZ, float localRotationX, float localRotationY, float localRotationZ, float localScaleX, float localScaleY, float localScaleZ);
+
+AS_API(void) AsFbxSetJointsNode_CastToBone(AsFbxContext* pContext, fbxsdk::FbxNode* pNode, float boneSize);
+
+AS_API(void) AsFbxSetJointsNode_BoneInPath(AsFbxContext* pContext, fbxsdk::FbxNode* pNode, float boneSize);
+
+AS_API(void) AsFbxSetJointsNode_Generic(AsFbxContext* pContext, fbxsdk::FbxNode* pNode);
+
+AS_API(void) AsFbxPrepareMaterials(AsFbxContext* pContext, int32_t materialCount, int32_t textureCount);
+
+AS_API(fbxsdk::FbxFileTexture*) AsFbxCreateTexture(AsFbxContext* pContext, const char* pMatTexName);
+
+AS_API(void) AsFbxLinkTexture(int32_t dest, fbxsdk::FbxFileTexture* pTexture, fbxsdk::FbxSurfacePhong* pMaterial, float offsetX, float offsetY, float scaleX, float scaleY);
+
+AS_API(fbxsdk::FbxArray<fbxsdk::FbxCluster*>*) AsFbxMeshCreateClusterArray(int32_t boneCount);
+
+AS_API(void) AsFbxMeshDisposeClusterArray(fbxsdk::FbxArray<fbxsdk::FbxCluster*>** ppArray);
+
+AS_API(fbxsdk::FbxCluster*) AsFbxMeshCreateCluster(AsFbxContext* pContext, fbxsdk::FbxNode* pBoneNode);
+
+AS_API(void) AsFbxMeshAddCluster(fbxsdk::FbxArray<fbxsdk::FbxCluster*>* pArray, /* CanBeNull */ fbxsdk::FbxCluster* pCluster);
+
+AS_API(fbxsdk::FbxMesh*) AsFbxMeshCreateMesh(AsFbxContext* pContext, fbxsdk::FbxNode* pFrameNode);
+
+AS_API(void) AsFbxMeshInitControlPoints(fbxsdk::FbxMesh* pMesh, int32_t vertexCount);
+
+AS_API(void) AsFbxMeshCreateElementNormal(fbxsdk::FbxMesh* pMesh);
+
+AS_API(void) AsFbxMeshCreateDiffuseUV(fbxsdk::FbxMesh* pMesh, int32_t uv);
+
+AS_API(void) AsFbxMeshCreateNormalMapUV(fbxsdk::FbxMesh* pMesh, int32_t uv);
+
+AS_API(void) AsFbxMeshCreateElementTangent(fbxsdk::FbxMesh* pMesh);
+
+AS_API(void) AsFbxMeshCreateElementVertexColor(fbxsdk::FbxMesh* pMesh);
+
+AS_API(void) AsFbxMeshCreateElementMaterial(fbxsdk::FbxMesh* pMesh);
+
+AS_API(fbxsdk::FbxSurfacePhong*) AsFbxCreateMaterial(AsFbxContext* pContext, const char* pMatName,
+	float diffuseR, float diffuseG, float diffuseB,
+	float ambientR, float ambientG, float ambientB,
+	float emissiveR, float emissiveG, float emissiveB,
+	float specularR, float specularG, float specularB,
+	float reflectR, float reflectG, float reflectB,
+	float shininess, float transparency);
+
+AS_API(int32_t) AsFbxAddMaterialToFrame(fbxsdk::FbxNode* pFrameNode, fbxsdk::FbxSurfacePhong* pMaterial);
+
+AS_API(void) AsFbxSetFrameShadingModeToTextureShading(fbxsdk::FbxNode* pFrameNode);
+
+AS_API(void) AsFbxMeshSetControlPoint(fbxsdk::FbxMesh* pMesh, int32_t index, float x, float y, float z);
+
+AS_API(void) AsFbxMeshAddPolygon(fbxsdk::FbxMesh* pMesh, int32_t materialIndex, int32_t index0, int32_t index1, int32_t index2);
+
+AS_API(void) AsFbxMeshElementNormalAdd(fbxsdk::FbxMesh* pMesh, int32_t elementIndex, float x, float y, float z);
+
+AS_API(void) AsFbxMeshElementUVAdd(fbxsdk::FbxMesh* pMesh, int32_t elementIndex, float u, float v);
+
+AS_API(void) AsFbxMeshElementTangentAdd(fbxsdk::FbxMesh* pMesh, int32_t elementIndex, float x, float y, float z, float w);
+
+AS_API(void) AsFbxMeshElementVertexColorAdd(fbxsdk::FbxMesh* pMesh, int32_t elementIndex, float r, float g, float b, float a);
+
+AS_API(void) AsFbxMeshSetBoneWeight(fbxsdk::FbxArray<fbxsdk::FbxCluster*>* pClusterArray, int32_t boneIndex, int32_t vertexIndex, float weight);
+
+AS_API(AsFbxSkinContext*) AsFbxMeshCreateSkinContext(AsFbxContext* pContext, fbxsdk::FbxNode* pFrameNode);
+
+AS_API(void) AsFbxMeshDisposeSkinContext(AsFbxSkinContext** ppSkinContext);
+
+AS_API(bool32_t) FbxClusterArray_HasItemAt(fbxsdk::FbxArray<fbxsdk::FbxCluster*>* pClusterArray, int32_t index);
+
+AS_API(void) AsFbxMeshSkinAddCluster(AsFbxSkinContext* pSkinContext, fbxsdk::FbxArray<fbxsdk::FbxCluster*>* pClusterArray, int32_t index, float pBoneMatrix[16]);
+
+AS_API(void) AsFbxMeshAddDeformer(AsFbxSkinContext* pSkinContext, fbxsdk::FbxMesh* pMesh);
+
+AS_API(AsFbxAnimContext*) AsFbxAnimCreateContext(bool32_t eulerFilter);
+
+AS_API(void) AsFbxAnimDisposeContext(AsFbxAnimContext** ppAnimContext);
+
+AS_API(void) AsFbxAnimPrepareStackAndLayer(AsFbxContext* pContext, AsFbxAnimContext* pAnimContext, const char* pTakeName);
+
+AS_API(void) AsFbxAnimLoadCurves(fbxsdk::FbxNode* pNode, AsFbxAnimContext* pAnimContext);
+
+AS_API(void) AsFbxAnimBeginKeyModify(AsFbxAnimContext* pAnimContext);
+
+AS_API(void) AsFbxAnimEndKeyModify(AsFbxAnimContext* pAnimContext);
+
+AS_API(void) AsFbxAnimAddScalingKey(AsFbxAnimContext* pAnimContext, float time, float x, float y, float z);
+
+AS_API(void) AsFbxAnimAddRotationKey(AsFbxAnimContext* pAnimContext, float time, float x, float y, float z);
+
+AS_API(void) AsFbxAnimAddTranslationKey(AsFbxAnimContext* pAnimContext, float time, float x, float y, float z);
+
+AS_API(void) AsFbxAnimApplyEulerFilter(AsFbxAnimContext* pAnimContext, float filterPrecision);
+
+AS_API(int32_t) AsFbxAnimGetCurrentBlendShapeChannelCount(AsFbxAnimContext* pAnimContext, fbxsdk::FbxNode* pNode);
+
+AS_API(bool32_t) AsFbxAnimIsBlendShapeChannelMatch(AsFbxAnimContext* pAnimContext, int32_t channelIndex, const char* channelName);
+
+AS_API(void) AsFbxAnimBeginBlendShapeAnimCurve(AsFbxAnimContext* pAnimContext, int32_t channelIndex);
+
+AS_API(void) AsFbxAnimEndBlendShapeAnimCurve(AsFbxAnimContext* pAnimContext);
+
+AS_API(void) AsFbxAnimAddBlendShapeKeyframe(AsFbxAnimContext* pAnimContext, float time, float value);
+
+AS_API(AsFbxMorphContext*) AsFbxMorphCreateContext();
+
+AS_API(void) AsFbxMorphInitializeContext(AsFbxContext* pContext, AsFbxMorphContext* pMorphContext, fbxsdk::FbxNode* pNode);
+
+AS_API(void) AsFbxMorphDisposeContext(AsFbxMorphContext** ppMorphContext);
+
+AS_API(void) AsFbxMorphAddBlendShapeChannel(AsFbxContext* pContext, AsFbxMorphContext* pMorphContext, const char* channelName);
+
+AS_API(void) AsFbxMorphAddBlendShapeChannelShape(AsFbxContext* pContext, AsFbxMorphContext* pMorphContext, float weight, const char* shapeName);
+
+AS_API(void) AsFbxMorphCopyBlendShapeControlPoints(AsFbxMorphContext* pMorphContext);
+
+AS_API(void) AsFbxMorphSetBlendShapeVertex(AsFbxMorphContext* pMorphContext, uint32_t index, float x, float y, float z);
+
+AS_API(void) AsFbxMorphCopyBlendShapeControlPointsNormal(AsFbxMorphContext* pMorphContext);
+
+AS_API(void) AsFbxMorphSetBlendShapeVertexNormal(AsFbxMorphContext* pMorphContext, uint32_t index, float x, float y, float z);

AssetStudioFBXNative/asfbx_anim_context.cpp

@@ -0,0 +1,27 @@
+#include "asfbx_anim_context.h"
+
+AsFbxAnimContext::AsFbxAnimContext(bool32_t eulerFilter)
+	: lFilter(nullptr)
+{
+	if (eulerFilter)
+	{
+		lFilter = new FbxAnimCurveFilterUnroll();
+	}
+
+	lAnimStack = nullptr;
+	lAnimLayer = nullptr;
+
+	lCurveSX = nullptr;
+	lCurveSY = nullptr;
+	lCurveSZ = nullptr;
+	lCurveRX = nullptr;
+	lCurveRY = nullptr;
+	lCurveRZ = nullptr;
+	lCurveTX = nullptr;
+	lCurveTY = nullptr;
+	lCurveTZ = nullptr;
+
+	pMesh = nullptr;
+	lBlendShape = nullptr;
+	lAnimCurve = nullptr;
+}

AssetStudioFBXNative/asfbx_anim_context.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <fbxsdk.h>
+
+#include "bool32_t.h"
+
+struct AsFbxAnimContext
+{
+
+	FbxAnimCurveFilterUnroll* lFilter;
+
+	FbxAnimStack* lAnimStack;
+	FbxAnimLayer* lAnimLayer;
+
+	FbxAnimCurve* lCurveSX;
+	FbxAnimCurve* lCurveSY;
+	FbxAnimCurve* lCurveSZ;
+	FbxAnimCurve* lCurveRX;
+	FbxAnimCurve* lCurveRY;
+	FbxAnimCurve* lCurveRZ;
+	FbxAnimCurve* lCurveTX;
+	FbxAnimCurve* lCurveTY;
+	FbxAnimCurve* lCurveTZ;
+
+	FbxMesh* pMesh;
+	FbxBlendShape* lBlendShape;
+	FbxAnimCurve* lAnimCurve;
+
+	AsFbxAnimContext(bool32_t eulerFilter);
+	~AsFbxAnimContext() = default;
+
+};

AssetStudioFBXNative/asfbx_context.cpp

@@ -0,0 +1,33 @@
+#include <fbxsdk.h>
+
+#include "asfbx_context.h"
+
+AsFbxContext::AsFbxContext()
+{
+	pSdkManager = nullptr;
+	pScene = nullptr;
+	pTextures = nullptr;
+	pMaterials = nullptr;
+	pExporter = nullptr;
+	pBindPose = nullptr;
+}
+
+AsFbxContext::~AsFbxContext()
+{
+	framePaths.clear();
+
+	delete pMaterials;
+	delete pTextures;
+
+	if (pExporter != nullptr) {
+		pExporter->Destroy();
+	}
+
+	if (pScene != nullptr) {
+		pScene->Destroy();
+	}
+
+	if (pSdkManager != nullptr) {
+		pSdkManager->Destroy();
+	}
+}

AssetStudioFBXNative/asfbx_context.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <unordered_set>
+
+struct AsFbxContext
+{
+
+	fbxsdk::FbxManager* pSdkManager;
+	fbxsdk::FbxScene* pScene;
+	fbxsdk::FbxArray<fbxsdk::FbxFileTexture*>* pTextures;
+	fbxsdk::FbxArray<fbxsdk::FbxSurfacePhong*>* pMaterials;
+	fbxsdk::FbxExporter* pExporter;
+	fbxsdk::FbxPose* pBindPose;
+
+	std::unordered_set<std::string> framePaths;
+
+	AsFbxContext();
+	~AsFbxContext();
+};

AssetStudioFBXNative/asfbx_morph_context.cpp

@@ -0,0 +1,9 @@
+#include "asfbx_morph_context.h"
+
+AsFbxMorphContext::AsFbxMorphContext()
+{
+	pMesh = nullptr;
+	lBlendShape = nullptr;
+	lBlendShapeChannel = nullptr;
+	lShape = nullptr;
+}

AssetStudioFBXNative/asfbx_morph_context.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <fbxsdk.h>
+
+struct AsFbxMorphContext
+{
+
+	FbxMesh* pMesh;
+	FbxBlendShape* lBlendShape;
+	FbxBlendShapeChannel* lBlendShapeChannel;
+	FbxShape* lShape;
+
+	AsFbxMorphContext();
+	~AsFbxMorphContext() = default;
+
+};

AssetStudioFBXNative/asfbx_skin_context.cpp

@@ -0,0 +1,16 @@
+#include "asfbx_skin_context.h"
+#include "asfbx_context.h"
+
+AsFbxSkinContext::AsFbxSkinContext(AsFbxContext* pContext, FbxNode* pFrameNode)
+	: pSkin(nullptr)
+{
+	if (pContext != nullptr && pContext->pScene != nullptr)
+	{
+		pSkin = FbxSkin::Create(pContext->pScene, "");
+	}
+
+	if (pFrameNode != nullptr) 
+	{
+		lMeshMatrix = pFrameNode->EvaluateGlobalTransform();
+	}
+}

AssetStudioFBXNative/asfbx_skin_context.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <fbxsdk.h>
+
+struct AsFbxContext;
+
+struct AsFbxSkinContext
+{
+	
+	FbxSkin* pSkin;
+	FbxAMatrix lMeshMatrix;
+
+	AsFbxSkinContext(AsFbxContext* pContext, FbxNode* pFrameNode);
+	~AsFbxSkinContext() = default;
+
+};

AssetStudioFBXNative/bool32_t.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <cstdint>
+
+typedef uint32_t bool32_t;

AssetStudioFBXNative/cpp.hint

@@ -0,0 +1 @@
+#define AS_API(ret_type)

AssetStudioFBXNative/dllexport.h

@@ -0,0 +1,56 @@
+#pragma once
+
+#if defined(_MSC_VER)
+#if _MSC_VER < 1910 // MSVC 2017-
+#error MSVC 2017 or later is required.
+#endif
+#endif
+
+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__)
+#ifdef _AS_DLL
+#ifdef __GNUC__
+#define _AS_EXPORT __attribute__ ((dllexport))
+#else
+#define _AS_EXPORT __declspec(dllexport)
+#endif
+#else
+#ifdef __GNUC__
+#define _AS_EXPORT __attribute__ ((dllimport))
+#else
+#define _AS_EXPORT __declspec(dllimport)
+#endif
+#endif
+#define _AS_LOCAL
+#else
+#if __GNUC__ >= 4
+#define _AS_EXPORT __attribute__ ((visibility ("default")))
+#define _AS_LOCAL  __attribute__ ((visibility ("hidden")))
+#else
+#define _AS_EXPORT
+#define _AS_LOCAL
+#endif
+#endif
+
+#ifdef __cplusplus
+#ifndef _EXTERN_C_STMT
+#define _EXTERN_C_STMT extern "C"
+#endif
+#else
+#ifndef _EXTERN_C_STMT
+#define _EXTERN_C_STMT
+#endif
+#endif
+
+#ifndef _AS_CALL
+#if defined(WIN32) || defined(_WIN32)
+#define _AS_CALL __stdcall
+#else
+#define _AS_CALL /* __cdecl */
+#endif
+#endif
+
+#if defined(_MSC_VER)
+#define AS_API(ret_type) _EXTERN_C_STMT _AS_EXPORT ret_type _AS_CALL
+#else
+#define AS_API(ret_type) _EXTERN_C_STMT _AS_EXPORT _AS_CALL ret_type
+#endif

AssetStudioFBXNative/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by AssetStudioFBXNative.rc
+
+// <20>¶<EFBFBD><C2B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>Ĭ<EFBFBD><C4AC>ֵ
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

AssetStudioFBXNative/utils.cpp

@@ -0,0 +1,43 @@
+#include <fbxsdk.h>
+#include <cassert>
+
+#include "utils.h"
+
+Vector3::Vector3()
+	: X(0), Y(0), Z(0)
+{
+}
+
+Vector3::Vector3(float x, float y, float z)
+	: X(x), Y(y), Z(z)
+{
+}
+
+Quaternion::Quaternion()
+	: X(0), Y(0), Z(0), W(1)
+{
+}
+
+Quaternion::Quaternion(float x, float y, float z)
+	: X(x), Y(y), Z(z), W(1)
+{
+}
+
+Quaternion::Quaternion(float x, float y, float z, float w)
+	: X(x), Y(y), Z(z), W(w)
+{
+}
+
+Vector3 QuaternionToEuler(Quaternion q) {
+	FbxAMatrix lMatrixRot;
+	lMatrixRot.SetQ(FbxQuaternion(q.X, q.Y, q.Z, q.W));
+	FbxVector4 lEuler = lMatrixRot.GetR();
+	return Vector3((float)lEuler[0], (float)lEuler[1], (float)lEuler[2]);
+}
+
+Quaternion EulerToQuaternion(Vector3 v) {
+	FbxAMatrix lMatrixRot;
+	lMatrixRot.SetR(FbxVector4(v.X, v.Y, v.Z));
+	FbxQuaternion lQuaternion = lMatrixRot.GetQ();
+	return Quaternion((float)lQuaternion[0], (float)lQuaternion[1], (float)lQuaternion[2], (float)lQuaternion[3]);
+}

AssetStudioFBXNative/utils.h

@@ -0,0 +1,29 @@
+#pragma once
+
+struct Vector3 {
+
+	float X;
+	float Y;
+	float Z;
+
+	Vector3();
+	Vector3(float x, float y, float z);
+
+};
+
+struct Quaternion {
+
+	float X;
+	float Y;
+	float Z;
+	float W;
+
+	Quaternion();
+	Quaternion(float x, float y, float z);
+	Quaternion(float x, float y, float z, float w);
+
+};
+
+Vector3 QuaternionToEuler(Quaternion q);
+
+Quaternion EulerToQuaternion(Vector3 v);

AssetStudioFBXWrapper/AssetStudioFBXWrapper.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Version>0.16.0.0</Version>
+    <AssemblyVersion>0.16.0.0</AssemblyVersion>
+    <FileVersion>0.16.0.0</FileVersion>
+    <Copyright>Copyright © Perfare 2018-2022; Copyright © hozuki 2020</Copyright>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AssetStudio.PInvoke\AssetStudio.PInvoke.csproj" />
+    <ProjectReference Include="..\AssetStudio\AssetStudio.csproj" />
+  </ItemGroup>
+
+</Project>

AssetStudioFBXWrapper/Fbx.PInvoke.cs

@@ -0,0 +1,16 @@
+using System.Runtime.InteropServices;
+using AssetStudio.FbxInterop;
+
+namespace AssetStudio
+{
+    partial class Fbx
+    {
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsUtilQuaternionToEuler(float qx, float qy, float qz, float qw, out float vx, out float vy, out float vz);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsUtilEulerToQuaternion(float vx, float vy, float vz, out float qx, out float qy, out float qz, out float qw);
+
+    }
+}

AssetStudioFBXWrapper/Fbx.cs

@@ -0,0 +1,58 @@
+using AssetStudio.FbxInterop;
+using AssetStudio.PInvoke;
+using System.IO;
+
+namespace AssetStudio
+{
+    public static partial class Fbx
+    {
+
+        static Fbx()
+        {
+            DllLoader.PreloadDll(FbxDll.DllName);
+        }
+
+        public static Vector3 QuaternionToEuler(Quaternion q)
+        {
+            AsUtilQuaternionToEuler(q.X, q.Y, q.Z, q.W, out var x, out var y, out var z);
+            return new Vector3(x, y, z);
+        }
+
+        public static Quaternion EulerToQuaternion(Vector3 v)
+        {
+            AsUtilEulerToQuaternion(v.X, v.Y, v.Z, out var x, out var y, out var z, out var w);
+            return new Quaternion(x, y, z, w);
+        }
+
+        public static class Exporter
+        {
+
+            public static void Export(string path, IImported imported, bool eulerFilter, float filterPrecision,
+                bool allNodes, bool skins, bool animation, bool blendShape, bool castToBone, float boneSize, bool exportAllUvsAsDiffuseMaps, float scaleFactor, int versionIndex, bool isAscii)
+            {
+                var file = new FileInfo(path);
+                var dir = file.Directory;
+
+                if (!dir.Exists)
+                {
+                    dir.Create();
+                }
+
+                var currentDir = Directory.GetCurrentDirectory();
+                Directory.SetCurrentDirectory(dir.FullName);
+
+                var name = Path.GetFileName(path);
+
+                using (var exporter = new FbxExporter(name, imported, allNodes, skins, castToBone, boneSize, exportAllUvsAsDiffuseMaps, scaleFactor, versionIndex, isAscii))
+                {
+                    exporter.Initialize();
+                    exporter.ExportAll(blendShape, animation, eulerFilter, filterPrecision);
+                }
+
+                Directory.SetCurrentDirectory(currentDir);
+            }
+
+        }
+
+    }
+}

AssetStudioFBXWrapper/FbxDll.cs

@@ -0,0 +1,10 @@
+namespace AssetStudio.FbxInterop
+{
+    internal static class FbxDll
+    {
+
+        internal const string DllName = "AssetStudioFBXNative";
+        internal const string FbxsdkDllName = "libfbxsdk";
+
+    }
+}

AssetStudioFBXWrapper/FbxExporter.cs

@@ -0,0 +1,244 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace AssetStudio.FbxInterop
+{
+    internal sealed class FbxExporter : IDisposable
+    {
+
+        private FbxExporterContext _context;
+
+        private readonly string _fileName;
+        private readonly IImported _imported;
+        private readonly bool _allNodes;
+        private readonly bool _exportSkins;
+        private readonly bool _castToBone;
+        private readonly float _boneSize;
+        private readonly bool _exportAllUvsAsDiffuseMaps;
+        private readonly float _scaleFactor;
+        private readonly int _versionIndex;
+        private readonly bool _isAscii;
+
+        internal FbxExporter(string fileName, IImported imported, bool allNodes, bool exportSkins, bool castToBone, float boneSize, bool exportAllUvsAsDiffuseMaps, float scaleFactor, int versionIndex, bool isAscii)
+        {
+            _context = new FbxExporterContext();
+
+            _fileName = fileName;
+            _imported = imported;
+            _allNodes = allNodes;
+            _exportSkins = exportSkins;
+            _castToBone = castToBone;
+            _boneSize = boneSize;
+            _exportAllUvsAsDiffuseMaps = exportAllUvsAsDiffuseMaps;
+            _scaleFactor = scaleFactor;
+            _versionIndex = versionIndex;
+            _isAscii = isAscii;
+        }
+
+        ~FbxExporter()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            if (IsDisposed)
+            {
+                return;
+            }
+
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public bool IsDisposed { get; private set; }
+
+        private void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _context.Dispose();
+            }
+
+            IsDisposed = true;
+        }
+
+        internal void Initialize()
+        {
+            var is60Fps = _imported.AnimationList.Count > 0 && _imported.AnimationList[0].SampleRate.Equals(60.0f);
+
+            _context.Initialize(_fileName, _scaleFactor, _versionIndex, _isAscii, is60Fps);
+
+            if (!_allNodes)
+            {
+                var framePaths = SearchHierarchy();
+
+                _context.SetFramePaths(framePaths);
+            }
+        }
+
+        internal void ExportAll(bool blendShape, bool animation, bool eulerFilter, float filterPrecision)
+        {
+            var meshFrames = new List<ImportedFrame>();
+
+            ExportRootFrame(meshFrames);
+
+            if (_imported.MeshList != null)
+            {
+                SetJointsFromImportedMeshes();
+
+                PrepareMaterials();
+
+                ExportMeshFrames(_imported.RootFrame, meshFrames);
+            }
+            else
+            {
+                SetJointsNode(_imported.RootFrame, null, true);
+            }
+
+
+
+            if (blendShape)
+            {
+                ExportMorphs();
+            }
+
+            if (animation)
+            {
+                ExportAnimations(eulerFilter, filterPrecision);
+            }
+
+            ExportScene();
+        }
+
+        private void ExportMorphs()
+        {
+            _context.ExportMorphs(_imported.RootFrame, _imported.MorphList);
+        }
+
+        private void ExportAnimations(bool eulerFilter, float filterPrecision)
+        {
+            _context.ExportAnimations(_imported.RootFrame, _imported.AnimationList, eulerFilter, filterPrecision);
+        }
+
+        private void ExportRootFrame(List<ImportedFrame> meshFrames)
+        {
+            _context.ExportFrame(_imported.MeshList, meshFrames, _imported.RootFrame);
+        }
+
+        private void ExportScene()
+        {
+            _context.ExportScene();
+        }
+
+        private void SetJointsFromImportedMeshes()
+        {
+            if (!_exportSkins)
+            {
+                return;
+            }
+
+            Debug.Assert(_imported.MeshList != null);
+
+            var bonePaths = new HashSet<string>();
+
+            foreach (var mesh in _imported.MeshList)
+            {
+                var boneList = mesh.BoneList;
+
+                if (boneList != null)
+                {
+                    foreach (var bone in boneList)
+                    {
+                        bonePaths.Add(bone.Path);
+                    }
+                }
+            }
+
+            SetJointsNode(_imported.RootFrame, bonePaths, _castToBone);
+        }
+
+        private void SetJointsNode(ImportedFrame rootFrame, HashSet<string> bonePaths, bool castToBone)
+        {
+            _context.SetJointsNode(rootFrame, bonePaths, castToBone, _boneSize);
+        }
+
+        private void PrepareMaterials()
+        {
+            _context.PrepareMaterials(_imported.MaterialList.Count, _imported.TextureList.Count);
+        }
+
+        private void ExportMeshFrames(ImportedFrame rootFrame, List<ImportedFrame> meshFrames)
+        {
+            foreach (var meshFrame in meshFrames)
+            {
+                _context.ExportMeshFromFrame(rootFrame, meshFrame, _imported.MeshList, _imported.MaterialList, _imported.TextureList, _exportSkins, _exportAllUvsAsDiffuseMaps);
+            }
+        }
+
+        private HashSet<string> SearchHierarchy()
+        {
+            if (_imported.MeshList == null || _imported.MeshList.Count == 0)
+            {
+                return null;
+            }
+
+            var exportFrames = new HashSet<string>();
+
+            SearchHierarchy(_imported.RootFrame, _imported.MeshList, exportFrames);
+
+            return exportFrames;
+        }
+
+        private static void SearchHierarchy(ImportedFrame rootFrame, List<ImportedMesh> meshList, HashSet<string> exportFrames)
+        {
+            var frameStack = new Stack<ImportedFrame>();
+
+            frameStack.Push(rootFrame);
+
+            while (frameStack.Count > 0)
+            {
+                var frame = frameStack.Pop();
+
+                var meshListSome = ImportedHelpers.FindMesh(frame.Path, meshList);
+
+                if (meshListSome != null)
+                {
+                    var parent = frame;
+
+                    while (parent != null)
+                    {
+                        exportFrames.Add(parent.Path);
+                        parent = parent.Parent;
+                    }
+
+                    var boneList = meshListSome.BoneList;
+
+                    if (boneList != null)
+                    {
+                        foreach (var bone in boneList)
+                        {
+                            if (!exportFrames.Contains(bone.Path))
+                            {
+                                var boneParent = rootFrame.FindFrameByPath(bone.Path);
+
+                                while (boneParent != null)
+                                {
+                                    exportFrames.Add(boneParent.Path);
+                                    boneParent = boneParent.Parent;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                for (var i = frame.Count - 1; i >= 0; i -= 1)
+                {
+                    frameStack.Push(frame[i]);
+                }
+            }
+        }
+
+    }
+}

AssetStudioFBXWrapper/FbxExporterContext.PInvoke.cs

@@ -0,0 +1,325 @@
+using System;
+using System.Runtime.InteropServices;
+using AssetStudio.PInvoke;
+
+namespace AssetStudio.FbxInterop
+{
+    partial class FbxExporterContext
+    {
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxCreateContext();
+
+        private static bool AsFbxInitializeContext(IntPtr context, string fileName, float scaleFactor, int versionIndex, bool isAscii, bool is60Fps, out string errorMessage)
+        {
+            bool b;
+            IntPtr pErrMsg;
+
+            using (var fileNameUtf8 = new Utf8StringHandle(fileName))
+            {
+                b = AsFbxInitializeContext(context, fileNameUtf8.DangerousGetHandle(), scaleFactor, versionIndex, isAscii, is60Fps, out pErrMsg);
+            }
+
+            errorMessage = Utf8StringHandle.ReadUtf8StringFromPointer(pErrMsg);
+
+            return b;
+        }
+
+        // Do not free the pointer strErrorMessage
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool AsFbxInitializeContext(IntPtr context, IntPtr strFileName, float scaleFactor, int versionIndex, [MarshalAs(UnmanagedType.Bool)] bool isAscii, [MarshalAs(UnmanagedType.Bool)] bool is60Fps, out IntPtr strErrorMessage);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxDisposeContext(ref IntPtr ppContext);
+
+        private static void AsFbxSetFramePaths(IntPtr context, string[] framePaths)
+        {
+            var framePathCount = framePaths.Length;
+
+            if (framePathCount == 0)
+            {
+                AsFbxSetFramePaths(context, Array.Empty<IntPtr>(), 0);
+            }
+            else
+            {
+                var utf8Paths = new Utf8StringHandle[framePathCount];
+
+                try
+                {
+                    for (var i = 0; i < framePathCount; i += 1)
+                    {
+                        utf8Paths[i] = new Utf8StringHandle(framePaths[i]);
+                    }
+
+                    var pathPointers = new IntPtr[framePathCount];
+
+                    for (var i = 0; i < framePathCount; i += 1)
+                    {
+                        pathPointers[i] = utf8Paths[i].DangerousGetHandle();
+                    }
+
+                    AsFbxSetFramePaths(context, pathPointers, framePathCount);
+                }
+                finally
+                {
+                    foreach (var path in utf8Paths)
+                    {
+                        path?.Dispose();
+                    }
+                }
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxSetFramePaths(IntPtr context, [MarshalAs(UnmanagedType.LPArray)] IntPtr[] strFramePaths, int count);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxExportScene(IntPtr context);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxGetSceneRootNode(IntPtr context);
+
+        private static IntPtr AsFbxExportSingleFrame(IntPtr context, IntPtr parentNode, string framePath, string frameName, in Vector3 localPosition, in Vector3 localRotation, in Vector3 localScale)
+        {
+            using (var framePathUtf8 = new Utf8StringHandle(framePath))
+            {
+                using (var frameNameUtf8 = new Utf8StringHandle(frameName))
+                {
+                    return AsFbxExportSingleFrame(context, parentNode, framePathUtf8.DangerousGetHandle(), frameNameUtf8.DangerousGetHandle(), localPosition.X, localPosition.Y, localPosition.Z, localRotation.X, localRotation.Y, localRotation.Z, localScale.X, localScale.Y, localScale.Z);
+                }
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxExportSingleFrame(IntPtr context, IntPtr parentNode, IntPtr strFramePath, IntPtr strFrameName, float localPositionX, float localPositionY, float localPositionZ, float localRotationX, float localRotationY, float localRotationZ, float localScaleX, float localScaleY, float localScaleZ);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxSetJointsNode_CastToBone(IntPtr context, IntPtr node, float boneSize);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxSetJointsNode_BoneInPath(IntPtr context, IntPtr node, float boneSize);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxSetJointsNode_Generic(IntPtr context, IntPtr node);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxPrepareMaterials(IntPtr context, int materialCount, int textureCount);
+
+        private static IntPtr AsFbxCreateTexture(IntPtr context, string matTexName)
+        {
+            using (var matTexNameUtf8 = new Utf8StringHandle(matTexName))
+            {
+                return AsFbxCreateTexture(context, matTexNameUtf8.DangerousGetHandle());
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxCreateTexture(IntPtr context, IntPtr strMatTexName);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxLinkTexture(int dest, IntPtr texture, IntPtr material, float offsetX, float offsetY, float scaleX, float scaleY);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxMeshCreateClusterArray(int boneCount);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshDisposeClusterArray(ref IntPtr ppArray);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxMeshCreateCluster(IntPtr context, IntPtr boneNode);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshAddCluster(IntPtr array, IntPtr cluster);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxMeshCreateMesh(IntPtr context, IntPtr frameNode);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshInitControlPoints(IntPtr mesh, int vertexCount);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshCreateElementNormal(IntPtr mesh);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshCreateDiffuseUV(IntPtr mesh, int uv);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshCreateNormalMapUV(IntPtr mesh, int uv);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshCreateElementTangent(IntPtr mesh);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshCreateElementVertexColor(IntPtr mesh);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshCreateElementMaterial(IntPtr mesh);
+
+        private static IntPtr AsFbxCreateMaterial(IntPtr pContext, string matName, in Color diffuse, in Color ambient, in Color emissive, in Color specular, in Color reflection, float shininess, float transparency)
+        {
+            using (var matNameUtf8 = new Utf8StringHandle(matName))
+            {
+                return AsFbxCreateMaterial(pContext, matNameUtf8.DangerousGetHandle(), diffuse.R, diffuse.G, diffuse.B, ambient.R, ambient.G, ambient.B, emissive.R, emissive.G, emissive.B, specular.R, specular.G, specular.B, reflection.R, reflection.G, reflection.B, shininess, transparency);
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxCreateMaterial(IntPtr pContext, IntPtr pMatName,
+            float diffuseR, float diffuseG, float diffuseB,
+            float ambientR, float ambientG, float ambientB,
+            float emissiveR, float emissiveG, float emissiveB,
+            float specularR, float specularG, float specularB,
+            float reflectR, float reflectG, float reflectB,
+            float shininess, float transparency);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern int AsFbxAddMaterialToFrame(IntPtr frameNode, IntPtr material);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxSetFrameShadingModeToTextureShading(IntPtr frameNode);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshSetControlPoint(IntPtr mesh, int index, float x, float y, float z);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshAddPolygon(IntPtr mesh, int materialIndex, int index0, int index1, int index2);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshElementNormalAdd(IntPtr mesh, int elementIndex, float x, float y, float z);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshElementUVAdd(IntPtr mesh, int elementIndex, float u, float v);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshElementTangentAdd(IntPtr mesh, int elementIndex, float x, float y, float z, float w);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshElementVertexColorAdd(IntPtr mesh, int elementIndex, float r, float g, float b, float a);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshSetBoneWeight(IntPtr pClusterArray, int boneIndex, int vertexIndex, float weight);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxMeshCreateSkinContext(IntPtr context, IntPtr frameNode);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshDisposeSkinContext(ref IntPtr ppSkinContext);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool FbxClusterArray_HasItemAt(IntPtr pClusterArray, int index);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private unsafe static extern void AsFbxMeshSkinAddCluster(IntPtr pSkinContext, IntPtr pClusterArray, int index, float* pBoneMatrix);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMeshAddDeformer(IntPtr pSkinContext, IntPtr pMesh);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxAnimCreateContext([MarshalAs(UnmanagedType.Bool)] bool eulerFilter);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimDisposeContext(ref IntPtr ppAnimContext);
+
+        private static void AsFbxAnimPrepareStackAndLayer(IntPtr pContext, IntPtr pAnimContext, string takeName)
+        {
+            using (var takeNameUtf8 = new Utf8StringHandle(takeName))
+            {
+                AsFbxAnimPrepareStackAndLayer(pContext, pAnimContext, takeNameUtf8.DangerousGetHandle());
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimPrepareStackAndLayer(IntPtr pContext, IntPtr pAnimContext, IntPtr strTakeName);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimLoadCurves(IntPtr pNode, IntPtr pAnimContext);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimBeginKeyModify(IntPtr pAnimContext);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimEndKeyModify(IntPtr pAnimContext);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimAddScalingKey(IntPtr pAnimContext, float time, float x, float y, float z);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimAddRotationKey(IntPtr pAnimContext, float time, float x, float y, float z);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimAddTranslationKey(IntPtr pAnimContext, float time, float x, float y, float z);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimApplyEulerFilter(IntPtr pAnimContext, float filterPrecision);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern int AsFbxAnimGetCurrentBlendShapeChannelCount(IntPtr pAnimContext, IntPtr pNode);
+
+        private static bool AsFbxAnimIsBlendShapeChannelMatch(IntPtr pAnimContext, int channelIndex, string channelName)
+        {
+            using (var channelNameUtf8 = new Utf8StringHandle(channelName))
+            {
+                return AsFbxAnimIsBlendShapeChannelMatch(pAnimContext, channelIndex, channelNameUtf8.DangerousGetHandle());
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool AsFbxAnimIsBlendShapeChannelMatch(IntPtr pAnimContext, int channelIndex, IntPtr strChannelName);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimBeginBlendShapeAnimCurve(IntPtr pAnimContext, int channelIndex);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimEndBlendShapeAnimCurve(IntPtr pAnimContext);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxAnimAddBlendShapeKeyframe(IntPtr pAnimContext, float time, float value);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern IntPtr AsFbxMorphCreateContext();
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphInitializeContext(IntPtr pContext, IntPtr pMorphContext, IntPtr pNode);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphDisposeContext(ref IntPtr ppMorphContext);
+
+        private static void AsFbxMorphAddBlendShapeChannel(IntPtr pContext, IntPtr pMorphContext, string channelName)
+        {
+            using (var channelNameUtf8 = new Utf8StringHandle(channelName))
+            {
+                AsFbxMorphAddBlendShapeChannel(pContext, pMorphContext, channelNameUtf8.DangerousGetHandle());
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphAddBlendShapeChannel(IntPtr pContext, IntPtr pMorphContext, IntPtr strChannelName);
+
+        private static void AsFbxMorphAddBlendShapeChannelShape(IntPtr pContext, IntPtr pMorphContext, float weight, string shapeName)
+        {
+            using (var shapeNameUtf8 = new Utf8StringHandle(shapeName))
+            {
+                AsFbxMorphAddBlendShapeChannelShape(pContext, pMorphContext, weight, shapeNameUtf8.DangerousGetHandle());
+            }
+        }
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphAddBlendShapeChannelShape(IntPtr pContext, IntPtr pMorphContext, float weight, IntPtr strShapeName);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphCopyBlendShapeControlPoints(IntPtr pMorphContext);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphSetBlendShapeVertex(IntPtr pMorphContext, uint index, float x, float y, float z);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphCopyBlendShapeControlPointsNormal(IntPtr pMorphContext);
+
+        [DllImport(FbxDll.DllName, CallingConvention = CallingConvention.Winapi)]
+        private static extern void AsFbxMorphSetBlendShapeVertexNormal(IntPtr pMorphContext, uint index, float x, float y, float z);
+
+    }
+}

AssetStudioFBXWrapper/FbxExporterContext.cs

@@ -0,0 +1,643 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.CompilerServices;
+
+namespace AssetStudio.FbxInterop
+{
+    internal sealed partial class FbxExporterContext : IDisposable
+    {
+
+        private IntPtr _pContext;
+        private readonly Dictionary<ImportedFrame, IntPtr> _frameToNode;
+        private readonly List<KeyValuePair<string, IntPtr>> _createdMaterials;
+        private readonly Dictionary<string, IntPtr> _createdTextures;
+
+        public FbxExporterContext()
+        {
+            _pContext = AsFbxCreateContext();
+            _frameToNode = new Dictionary<ImportedFrame, IntPtr>();
+            _createdMaterials = new List<KeyValuePair<string, IntPtr>>();
+            _createdTextures = new Dictionary<string, IntPtr>();
+        }
+
+        ~FbxExporterContext()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            if (IsDisposed)
+            {
+                return;
+            }
+
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public bool IsDisposed { get; private set; }
+
+        private void Dispose(bool disposing)
+        {
+            IsDisposed = true;
+
+            _frameToNode.Clear();
+            _createdMaterials.Clear();
+            _createdTextures.Clear();
+
+            AsFbxDisposeContext(ref _pContext);
+        }
+
+        private void EnsureNotDisposed()
+        {
+            if (IsDisposed)
+            {
+                throw new ObjectDisposedException(nameof(FbxExporterContext));
+            }
+        }
+
+        internal void Initialize(string fileName, float scaleFactor, int versionIndex, bool isAscii, bool is60Fps)
+        {
+            EnsureNotDisposed();
+
+            var b = AsFbxInitializeContext(_pContext, fileName, scaleFactor, versionIndex, isAscii, is60Fps, out var errorMessage);
+
+            if (!b)
+            {
+                var fullMessage = $"Failed to initialize FbxExporter: {errorMessage}";
+                throw new ApplicationException(fullMessage);
+            }
+        }
+
+        internal void SetFramePaths(HashSet<string> framePaths)
+        {
+            EnsureNotDisposed();
+
+            if (framePaths == null || framePaths.Count == 0)
+            {
+                return;
+            }
+
+            var framePathList = new List<string>(framePaths);
+            var framePathArray = framePathList.ToArray();
+
+            AsFbxSetFramePaths(_pContext, framePathArray);
+        }
+
+        internal void ExportScene()
+        {
+            EnsureNotDisposed();
+
+            AsFbxExportScene(_pContext);
+        }
+
+        internal void ExportFrame(List<ImportedMesh> meshList, List<ImportedFrame> meshFrames, ImportedFrame rootFrame)
+        {
+            var rootNode = AsFbxGetSceneRootNode(_pContext);
+
+            Debug.Assert(rootNode != IntPtr.Zero);
+
+            var nodeStack = new Stack<IntPtr>();
+            var frameStack = new Stack<ImportedFrame>();
+
+            nodeStack.Push(rootNode);
+            frameStack.Push(rootFrame);
+
+            while (nodeStack.Count > 0)
+            {
+                var parentNode = nodeStack.Pop();
+                var frame = frameStack.Pop();
+
+                var childNode = AsFbxExportSingleFrame(_pContext, parentNode, frame.Path, frame.Name, frame.LocalPosition, frame.LocalRotation, frame.LocalScale);
+
+                if (meshList != null && ImportedHelpers.FindMesh(frame.Path, meshList) != null)
+                {
+                    meshFrames.Add(frame);
+                }
+
+                _frameToNode.Add(frame, childNode);
+
+                for (var i = frame.Count - 1; i >= 0; i -= 1)
+                {
+                    nodeStack.Push(childNode);
+                    frameStack.Push(frame[i]);
+                }
+            }
+        }
+
+        internal void SetJointsNode(ImportedFrame rootFrame, HashSet<string> bonePaths, bool castToBone, float boneSize)
+        {
+            var frameStack = new Stack<ImportedFrame>();
+
+            frameStack.Push(rootFrame);
+
+            while (frameStack.Count > 0)
+            {
+                var frame = frameStack.Pop();
+
+                if (_frameToNode.TryGetValue(frame, out var node))
+                {
+                    Debug.Assert(node != IntPtr.Zero);
+
+                    if (castToBone)
+                    {
+                        AsFbxSetJointsNode_CastToBone(_pContext, node, boneSize);
+                    }
+                    else
+                    {
+                        Debug.Assert(bonePaths != null);
+
+                        if (bonePaths.Contains(frame.Path))
+                        {
+                            AsFbxSetJointsNode_BoneInPath(_pContext, node, boneSize);
+                        }
+                        else
+                        {
+                            AsFbxSetJointsNode_Generic(_pContext, node);
+                        }
+                    }
+                }
+
+                for (var i = frame.Count - 1; i >= 0; i -= 1)
+                {
+                    frameStack.Push(frame[i]);
+                }
+            }
+        }
+
+        internal void PrepareMaterials(int materialCount, int textureCount)
+        {
+            AsFbxPrepareMaterials(_pContext, materialCount, textureCount);
+        }
+
+        internal void ExportMeshFromFrame(ImportedFrame rootFrame, ImportedFrame meshFrame, List<ImportedMesh> meshList, List<ImportedMaterial> materialList, List<ImportedTexture> textureList, bool exportSkins, bool exportAllUvsAsDiffuseMaps)
+        {
+            var meshNode = _frameToNode[meshFrame];
+            var mesh = ImportedHelpers.FindMesh(meshFrame.Path, meshList);
+
+            ExportMesh(rootFrame, materialList, textureList, meshNode, mesh, exportSkins, exportAllUvsAsDiffuseMaps);
+        }
+
+        private IntPtr ExportTexture(ImportedTexture texture)
+        {
+            if (texture == null)
+            {
+                return IntPtr.Zero;
+            }
+
+            if (_createdTextures.ContainsKey(texture.Name))
+            {
+                return _createdTextures[texture.Name];
+            }
+
+            var pTex = AsFbxCreateTexture(_pContext, texture.Name);
+
+            _createdTextures.Add(texture.Name, pTex);
+
+            var file = new FileInfo(texture.Name);
+
+            using (var writer = new BinaryWriter(file.Create()))
+            {
+                writer.Write(texture.Data);
+            }
+
+            return pTex;
+        }
+
+        private void ExportMesh(ImportedFrame rootFrame, List<ImportedMaterial> materialList, List<ImportedTexture> textureList, IntPtr frameNode, ImportedMesh importedMesh, bool exportSkins, bool exportAllUvsAsDiffuseMaps)
+        {
+            var boneList = importedMesh.BoneList;
+            var totalBoneCount = 0;
+            var hasBones = false;
+            if (exportSkins && boneList?.Count > 0)
+            {
+                totalBoneCount = boneList.Count;
+                hasBones = true;
+            }
+
+            var pClusterArray = IntPtr.Zero;
+
+            try
+            {
+                if (hasBones)
+                {
+                    pClusterArray = AsFbxMeshCreateClusterArray(totalBoneCount);
+
+                    foreach (var bone in boneList)
+                    {
+                        if (bone.Path != null)
+                        {
+                            var frame = rootFrame.FindFrameByPath(bone.Path);
+                            var boneNode = _frameToNode[frame];
+
+                            var cluster = AsFbxMeshCreateCluster(_pContext, boneNode);
+
+                            AsFbxMeshAddCluster(pClusterArray, cluster);
+                        }
+                        else
+                        {
+                            AsFbxMeshAddCluster(pClusterArray, IntPtr.Zero);
+                        }
+                    }
+                }
+
+                var mesh = AsFbxMeshCreateMesh(_pContext, frameNode);
+
+                AsFbxMeshInitControlPoints(mesh, importedMesh.VertexList.Count);
+
+                if (importedMesh.hasNormal)
+                {
+                    AsFbxMeshCreateElementNormal(mesh);
+                }
+
+                for (int i = 0; i < importedMesh.hasUV.Length; i++)
+                {
+                    if (!importedMesh.hasUV[i]) { continue; }
+
+                    if (i == 1 && !exportAllUvsAsDiffuseMaps)
+                    {
+                        AsFbxMeshCreateNormalMapUV(mesh, 1);
+                    }
+                    else
+                    {
+                        AsFbxMeshCreateDiffuseUV(mesh, i);
+                    }
+                }
+
+                if (importedMesh.hasTangent)
+                {
+                    AsFbxMeshCreateElementTangent(mesh);
+                }
+
+                if (importedMesh.hasColor)
+                {
+                    AsFbxMeshCreateElementVertexColor(mesh);
+                }
+
+                AsFbxMeshCreateElementMaterial(mesh);
+
+                foreach (var meshObj in importedMesh.SubmeshList)
+                {
+                    var materialIndex = 0;
+                    var mat = ImportedHelpers.FindMaterial(meshObj.Material, materialList);
+
+                    if (mat != null)
+                    {
+                        var foundMat = _createdMaterials.FindIndex(kv => kv.Key == mat.Name);
+                        IntPtr pMat;
+
+                        if (foundMat >= 0)
+                        {
+                            pMat = _createdMaterials[foundMat].Value;
+                        }
+                        else
+                        {
+                            var diffuse = mat.Diffuse;
+                            var ambient = mat.Ambient;
+                            var emissive = mat.Emissive;
+                            var specular = mat.Specular;
+                            var reflection = mat.Reflection;
+
+                            pMat = AsFbxCreateMaterial(_pContext, mat.Name, in diffuse, in ambient, in emissive, in specular, in reflection, mat.Shininess, mat.Transparency);
+
+                            _createdMaterials.Add(new KeyValuePair<string, IntPtr>(mat.Name, pMat));
+                        }
+
+                        materialIndex = AsFbxAddMaterialToFrame(frameNode, pMat);
+
+                        var hasTexture = false;
+
+                        foreach (var texture in mat.Textures)
+                        {
+                            var tex = ImportedHelpers.FindTexture(texture.Name, textureList);
+                            var pTexture = ExportTexture(tex);
+
+                            if (pTexture != IntPtr.Zero)
+                            {
+                                switch (texture.Dest)
+                                {
+                                    case 0:
+                                    case 1:
+                                    case 2:
+                                    case 3:
+                                        {
+                                            AsFbxLinkTexture(texture.Dest, pTexture, pMat, texture.Offset.X, texture.Offset.Y, texture.Scale.X, texture.Scale.Y);
+                                            hasTexture = true;
+                                            break;
+                                        }
+                                    default:
+                                        break;
+                                }
+                            }
+                        }
+
+                        if (hasTexture)
+                        {
+                            AsFbxSetFrameShadingModeToTextureShading(frameNode);
+                        }
+                    }
+
+                    foreach (var face in meshObj.FaceList)
+                    {
+                        var index0 = face.VertexIndices[0] + meshObj.BaseVertex;
+                        var index1 = face.VertexIndices[1] + meshObj.BaseVertex;
+                        var index2 = face.VertexIndices[2] + meshObj.BaseVertex;
+
+                        AsFbxMeshAddPolygon(mesh, materialIndex, index0, index1, index2);
+                    }
+                }
+
+                var vertexList = importedMesh.VertexList;
+
+                var vertexCount = vertexList.Count;
+
+                for (var j = 0; j < vertexCount; j += 1)
+                {
+                    var importedVertex = vertexList[j];
+
+                    var vertex = importedVertex.Vertex;
+                    AsFbxMeshSetControlPoint(mesh, j, vertex.X, vertex.Y, vertex.Z);
+
+                    if (importedMesh.hasNormal)
+                    {
+                        var normal = importedVertex.Normal;
+                        AsFbxMeshElementNormalAdd(mesh, 0, normal.X, normal.Y, normal.Z);
+                    }
+
+                    for (var uvIndex = 0; uvIndex < importedMesh.hasUV.Length; uvIndex += 1)
+                    {
+                        if (importedMesh.hasUV[uvIndex])
+                        {
+                            var uv = importedVertex.UV[uvIndex];
+                            AsFbxMeshElementUVAdd(mesh, uvIndex, uv[0], uv[1]);
+                        }
+                    }
+
+                    if (importedMesh.hasTangent)
+                    {
+                        var tangent = importedVertex.Tangent;
+                        AsFbxMeshElementTangentAdd(mesh, 0, tangent.X, tangent.Y, tangent.Z, tangent.W);
+                    }
+
+                    if (importedMesh.hasColor)
+                    {
+                        var color = importedVertex.Color;
+                        AsFbxMeshElementVertexColorAdd(mesh, 0, color.R, color.G, color.B, color.A);
+                    }
+
+                    if (hasBones && importedVertex.BoneIndices != null)
+                    {
+                        var boneIndices = importedVertex.BoneIndices;
+                        var boneWeights = importedVertex.Weights;
+
+                        for (var k = 0; k < 4; k += 1)
+                        {
+                            if (boneIndices[k] < totalBoneCount && boneWeights[k] > 0)
+                            {
+                                AsFbxMeshSetBoneWeight(pClusterArray, boneIndices[k], j, boneWeights[k]);
+                            }
+                        }
+                    }
+                }
+
+
+                if (hasBones)
+                {
+                    IntPtr pSkinContext = IntPtr.Zero;
+
+                    try
+                    {
+                        pSkinContext = AsFbxMeshCreateSkinContext(_pContext, frameNode);
+
+                        unsafe
+                        {
+                            var boneMatrix = stackalloc float[16];
+
+                            for (var j = 0; j < totalBoneCount; j += 1)
+                            {
+                                if (!FbxClusterArray_HasItemAt(pClusterArray, j))
+                                {
+                                    continue;
+                                }
+
+                                var m = boneList[j].Matrix;
+
+                                CopyMatrix4x4(in m, boneMatrix);
+
+                                AsFbxMeshSkinAddCluster(pSkinContext, pClusterArray, j, boneMatrix);
+                            }
+                        }
+
+                        AsFbxMeshAddDeformer(pSkinContext, mesh);
+                    }
+                    finally
+                    {
+                        AsFbxMeshDisposeSkinContext(ref pSkinContext);
+                    }
+                }
+            }
+            finally
+            {
+                AsFbxMeshDisposeClusterArray(ref pClusterArray);
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static unsafe void CopyMatrix4x4(in Matrix4x4 matrix, float* buffer)
+        {
+            for (var m = 0; m < 4; m += 1)
+            {
+                for (var n = 0; n < 4; n += 1)
+                {
+                    var index = IndexFrom4x4(m, n);
+                    buffer[index] = matrix[m, n];
+                }
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static int IndexFrom4x4(int m, int n)
+        {
+            return 4 * m + n;
+        }
+
+        internal void ExportAnimations(ImportedFrame rootFrame, List<ImportedKeyframedAnimation> animationList, bool eulerFilter, float filterPrecision)
+        {
+            if (animationList == null || animationList.Count == 0)
+            {
+                return;
+            }
+
+            var pAnimContext = IntPtr.Zero;
+
+            try
+            {
+                pAnimContext = AsFbxAnimCreateContext(eulerFilter);
+
+                for (int i = 0; i < animationList.Count; i++)
+                {
+                    var importedAnimation = animationList[i];
+                    string takeName;
+
+                    if (importedAnimation.Name != null)
+                    {
+                        takeName = importedAnimation.Name;
+                    }
+                    else
+                    {
+                        takeName = $"Take{i.ToString()}";
+                    }
+
+                    AsFbxAnimPrepareStackAndLayer(_pContext, pAnimContext, takeName);
+
+                    ExportKeyframedAnimation(rootFrame, importedAnimation, pAnimContext, filterPrecision);
+                }
+            }
+            finally
+            {
+                AsFbxAnimDisposeContext(ref pAnimContext);
+            }
+        }
+
+        private void ExportKeyframedAnimation(ImportedFrame rootFrame, ImportedKeyframedAnimation parser, IntPtr pAnimContext, float filterPrecision)
+        {
+            foreach (var track in parser.TrackList)
+            {
+                if (track.Path == null)
+                {
+                    continue;
+                }
+
+                var frame = rootFrame.FindFrameByPath(track.Path);
+
+                if (frame == null)
+                {
+                    continue;
+                }
+
+                var pNode = _frameToNode[frame];
+
+                AsFbxAnimLoadCurves(pNode, pAnimContext);
+
+                AsFbxAnimBeginKeyModify(pAnimContext);
+
+                foreach (var scaling in track.Scalings)
+                {
+                    var value = scaling.value;
+                    AsFbxAnimAddScalingKey(pAnimContext, scaling.time, value.X, value.Y, value.Z);
+                }
+
+                foreach (var rotation in track.Rotations)
+                {
+                    var value = rotation.value;
+                    AsFbxAnimAddRotationKey(pAnimContext, rotation.time, value.X, value.Y, value.Z);
+                }
+
+                foreach (var translation in track.Translations)
+                {
+                    var value = translation.value;
+                    AsFbxAnimAddTranslationKey(pAnimContext, translation.time, value.X, value.Y, value.Z);
+                }
+
+                AsFbxAnimEndKeyModify(pAnimContext);
+
+                AsFbxAnimApplyEulerFilter(pAnimContext, filterPrecision);
+
+                var blendShape = track.BlendShape;
+
+                if (blendShape != null)
+                {
+                    var channelCount = AsFbxAnimGetCurrentBlendShapeChannelCount(pAnimContext, pNode);
+
+                    if (channelCount > 0)
+                    {
+                        for (var channelIndex = 0; channelIndex < channelCount; channelIndex += 1)
+                        {
+                            if (!AsFbxAnimIsBlendShapeChannelMatch(pAnimContext, channelIndex, blendShape.ChannelName))
+                            {
+                                continue;
+                            }
+
+                            AsFbxAnimBeginBlendShapeAnimCurve(pAnimContext, channelIndex);
+
+                            foreach (var keyframe in blendShape.Keyframes)
+                            {
+                                AsFbxAnimAddBlendShapeKeyframe(pAnimContext, keyframe.time, keyframe.value);
+                            }
+
+                            AsFbxAnimEndBlendShapeAnimCurve(pAnimContext);
+                        }
+                    }
+                }
+            }
+        }
+
+        internal void ExportMorphs(ImportedFrame rootFrame, List<ImportedMorph> morphList)
+        {
+            if (morphList == null || morphList.Count == 0)
+            {
+                return;
+            }
+
+            foreach (var morph in morphList)
+            {
+                var frame = rootFrame.FindFrameByPath(morph.Path);
+
+                if (frame == null)
+                {
+                    continue;
+                }
+
+                var pNode = _frameToNode[frame];
+
+                var pMorphContext = IntPtr.Zero;
+
+                try
+                {
+                    pMorphContext = AsFbxMorphCreateContext();
+
+                    AsFbxMorphInitializeContext(_pContext, pMorphContext, pNode);
+
+                    foreach (var channel in morph.Channels)
+                    {
+                        AsFbxMorphAddBlendShapeChannel(_pContext, pMorphContext, channel.Name);
+
+                        for (var i = 0; i < channel.KeyframeList.Count; i++)
+                        {
+                            var keyframe = channel.KeyframeList[i];
+
+                            AsFbxMorphAddBlendShapeChannelShape(_pContext, pMorphContext, keyframe.Weight, i == 0 ? channel.Name : $"{channel.Name}_{i + 1}");
+
+                            AsFbxMorphCopyBlendShapeControlPoints(pMorphContext);
+
+                            foreach (var vertex in keyframe.VertexList)
+                            {
+                                var v = vertex.Vertex.Vertex;
+                                AsFbxMorphSetBlendShapeVertex(pMorphContext, vertex.Index, v.X, v.Y, v.Z);
+                            }
+
+                            if (keyframe.hasNormals)
+                            {
+                                AsFbxMorphCopyBlendShapeControlPointsNormal(pMorphContext);
+
+                                foreach (var vertex in keyframe.VertexList)
+                                {
+                                    var v = vertex.Vertex.Normal;
+                                    AsFbxMorphSetBlendShapeVertexNormal(pMorphContext, vertex.Index, v.X, v.Y, v.Z);
+                                }
+                            }
+                        }
+                    }
+                }
+                finally
+                {
+                    AsFbxMorphDisposeContext(ref pMorphContext);
+                }
+            }
+        }
+
+    }
+}

AssetStudioGUI/AssetStudioGUI.csproj

@@ -1,179 +1,84 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 	<PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{52B196FB-4C8A-499B-B877-1A0EB4F33EC0}</ProjectGuid>
 		<OutputType>WinExe</OutputType>
-    <RootNamespace>AssetStudioGUI</RootNamespace>
+		<TargetFrameworks>net472;net5.0-windows;net6.0-windows</TargetFrameworks>
-    <AssemblyName>AssetStudioGUI</AssemblyName>
+		<UseWindowsForms>true</UseWindowsForms>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>none</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>none</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
 		<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>
+
 	<ItemGroup>
-    <Reference Include="OpenTK, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+		<ProjectReference Include="..\AssetStudioUtility\AssetStudioUtility.csproj" />
-      <HintPath>..\packages\OpenTK.3.1.0\lib\net20\OpenTK.dll</HintPath>
+		<ProjectReference Include="..\AssetStudio\AssetStudio.csproj" />
-    </Reference>
-    <Reference Include="OpenTK.GLControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenTK.GLControl.3.1.0\lib\net20\OpenTK.GLControl.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
 	</ItemGroup>
+
 	<ItemGroup>
-    <Compile Include="AssetStudioGUIForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AssetStudioGUIForm.designer.cs">
-      <DependentUpon>AssetStudioGUIForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Components\AssetItem.cs" />
-    <Compile Include="Components\GameObjectTreeNode.cs" />
-    <Compile Include="Components\GOHierarchy.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Components\OpenFolderDialog.cs" />
-    <Compile Include="Components\TreeViewExtensions.cs" />
-    <Compile Include="Components\TypeTreeItem.cs" />
-    <Compile Include="Exporter.cs" />
-    <Compile Include="ExportOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ExportOptions.designer.cs">
-      <DependentUpon>ExportOptions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GUILogger.cs" />
-    <Compile Include="GUIProgress.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Studio.cs" />
-    <Compile Include="TGASharpLib.cs" />
-    <EmbeddedResource Include="AssetStudioGUIForm.resx">
-      <DependentUpon>AssetStudioGUIForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ExportOptions.resx">
-      <DependentUpon>ExportOptions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="OpenTK.dll.config" />
-    <None Include="packages.config" />
 		<None Include="Properties\Settings.settings">
 			<Generator>SettingsSingleFileGenerator</Generator>
 			<LastGenOutput>Settings.Designer.cs</LastGenOutput>
 		</None>
-    <Compile Include="Properties\Settings.Designer.cs">
+		<Compile Update="Properties\Settings.Designer.cs">
 			<AutoGen>True</AutoGen>
 			<DependentUpon>Settings.settings</DependentUpon>
 			<DesignTimeSharedInput>True</DesignTimeSharedInput>
 		</Compile>
 	</ItemGroup>
+
 	<ItemGroup>
-    <None Include="App.config" />
+		<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>
-    <None Include="Resources\preview.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\as.ico" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(Platform)' == 'x86'">
 		<ContentWithTargetPath Include="Libraries\x86\fmod.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>fmod.dll</TargetPath>
+			<TargetPath>x86\fmod.dll</TargetPath>
 		</ContentWithTargetPath>
-    <ContentWithTargetPath Include="Libraries\x86\libfbxsdk.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>libfbxsdk.dll</TargetPath>
-    </ContentWithTargetPath>
-  </ItemGroup>
-  <ItemGroup Condition="'$(Platform)' == 'x64'">
 		<ContentWithTargetPath Include="Libraries\x64\fmod.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>fmod.dll</TargetPath>
+			<TargetPath>x64\fmod.dll</TargetPath>
-    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Libraries\x64\libfbxsdk.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>libfbxsdk.dll</TargetPath>
 		</ContentWithTargetPath>
 	</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.1.0" />
+		<PackageReference Include="OpenTK.GLControl" Version="3.1.0" />
+	</ItemGroup>
+
 	<ItemGroup>
-    <ProjectReference Include="..\AssetStudioUtility\AssetStudioUtility.csproj">
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-      <Project>{80aec261-21ee-4e4f-a93b-7a744dc84888}</Project>
-      <Name>AssetStudioUtility</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\AssetStudio\AssetStudio.csproj">
-      <Project>{7662f8c2-7bfd-442e-a948-a43b4f7eb06e}</Project>
-      <Name>AssetStudio</Name>
-    </ProjectReference>
 	</ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
+	<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>
+
+	<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>

AssetStudioGUI/AssetStudioGUIForm.Designer.cs

@@ -41,6 +41,8 @@
             this.displayAll = new System.Windows.Forms.ToolStripMenuItem();
             this.enablePreview = new System.Windows.Forms.ToolStripMenuItem();
             this.displayInfo = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripMenuItem();
+            this.specifyUnityVersion = new System.Windows.Forms.ToolStripTextBox();
             this.showExpOpt = new System.Windows.Forms.ToolStripMenuItem();
             this.modelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportAllObjectssplitToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
@@ -64,9 +66,15 @@
             this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripMenuItem();
             this.filterTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.allToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.debugMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripMenuItem();
             this.exportClassStructuresMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -87,6 +95,8 @@
             this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.progressbarPanel = new System.Windows.Forms.Panel();
             this.progressBar1 = new System.Windows.Forms.ProgressBar();
+            this.tabControl2 = new System.Windows.Forms.TabControl();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
             this.previewPanel = new System.Windows.Forms.Panel();
             this.assetInfoLabel = new System.Windows.Forms.Label();
             this.FMODpanel = new System.Windows.Forms.Panel();
@@ -101,19 +111,18 @@
             this.FMODpauseButton = new System.Windows.Forms.Button();
             this.FMODplayButton = new System.Windows.Forms.Button();
             this.fontPreviewBox = new System.Windows.Forms.RichTextBox();
-            this.textPreviewBox = new System.Windows.Forms.TextBox();
             this.glControl1 = new OpenTK.GLControl();
-            this.classPreviewPanel = new System.Windows.Forms.Panel();
+            this.textPreviewBox = new System.Windows.Forms.TextBox();
             this.classTextBox = new System.Windows.Forms.TextBox();
+            this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.dumpTextBox = new System.Windows.Forms.TextBox();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
             this.timer = new System.Windows.Forms.Timer(this.components);
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
-            this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportSelectedAssetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.dumpSelectedAssetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportAnimatorwithselectedAnimationClipMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.goToSceneHierarchyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.showOriginalFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -127,11 +136,13 @@
             this.tabPage2.SuspendLayout();
             this.tabPage3.SuspendLayout();
             this.progressbarPanel.SuspendLayout();
+            this.tabControl2.SuspendLayout();
+            this.tabPage4.SuspendLayout();
             this.previewPanel.SuspendLayout();
             this.FMODpanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.FMODprogressBar)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.FMODvolumeBar)).BeginInit();
-            this.classPreviewPanel.SuspendLayout();
+            this.tabPage5.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.contextMenuStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -147,7 +158,7 @@
             this.debugMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(1264, 24);
+            this.menuStrip1.Size = new System.Drawing.Size(1264, 25);
             this.menuStrip1.TabIndex = 0;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -160,39 +171,39 @@
             this.extractFileToolStripMenuItem,
             this.extractFolderToolStripMenuItem});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(39, 21);
             this.fileToolStripMenuItem.Text = "File";
             // 
             // loadFileToolStripMenuItem
             // 
             this.loadFileToolStripMenuItem.Name = "loadFileToolStripMenuItem";
-            this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(154, 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(144, 22);
+            this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 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(141, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(151, 6);
             // 
             // extractFileToolStripMenuItem
             // 
             this.extractFileToolStripMenuItem.Name = "extractFileToolStripMenuItem";
-            this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            this.extractFileToolStripMenuItem.Size = new System.Drawing.Size(154, 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(144, 22);
+            this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.extractFolderToolStripMenuItem.Text = "Extract folder";
             this.extractFolderToolStripMenuItem.Click += new System.EventHandler(this.extractFolderToolStripMenuItem_Click);
             // 
@@ -202,16 +213,17 @@
             this.displayAll,
             this.enablePreview,
             this.displayInfo,
+            this.toolStripMenuItem14,
             this.showExpOpt});
             this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
-            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
+            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(66, 21);
             this.optionsToolStripMenuItem.Text = "Options";
             // 
             // displayAll
             // 
             this.displayAll.CheckOnClick = true;
             this.displayAll.Name = "displayAll";
-            this.displayAll.Size = new System.Drawing.Size(207, 22);
+            this.displayAll.Size = new System.Drawing.Size(223, 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.";
@@ -223,7 +235,7 @@
             this.enablePreview.CheckOnClick = true;
             this.enablePreview.CheckState = System.Windows.Forms.CheckState.Checked;
             this.enablePreview.Name = "enablePreview";
-            this.enablePreview.Size = new System.Drawing.Size(207, 22);
+            this.enablePreview.Size = new System.Drawing.Size(223, 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.";
@@ -235,16 +247,30 @@
             this.displayInfo.CheckOnClick = true;
             this.displayInfo.CheckState = System.Windows.Forms.CheckState.Checked;
             this.displayInfo.Name = "displayInfo";
-            this.displayInfo.Size = new System.Drawing.Size(207, 22);
+            this.displayInfo.Size = new System.Drawing.Size(223, 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.";
             this.displayInfo.CheckedChanged += new System.EventHandler(this.displayAssetInfo_Check);
             // 
+            // toolStripMenuItem14
+            // 
+            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.Text = "Specify Unity version";
+            // 
+            // specifyUnityVersion
+            // 
+            this.specifyUnityVersion.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F);
+            this.specifyUnityVersion.Name = "specifyUnityVersion";
+            this.specifyUnityVersion.Size = new System.Drawing.Size(100, 23);
+            // 
             // showExpOpt
             // 
             this.showExpOpt.Name = "showExpOpt";
-            this.showExpOpt.Size = new System.Drawing.Size(207, 22);
+            this.showExpOpt.Size = new System.Drawing.Size(223, 22);
             this.showExpOpt.Text = "Export options";
             this.showExpOpt.Click += new System.EventHandler(this.showExpOpt_Click);
             // 
@@ -258,46 +284,46 @@
             this.exportSelectedObjectsmergeToolStripMenuItem,
             this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem});
             this.modelToolStripMenuItem.Name = "modelToolStripMenuItem";
-            this.modelToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
+            this.modelToolStripMenuItem.Size = new System.Drawing.Size(58, 21);
             this.modelToolStripMenuItem.Text = "Model";
             // 
             // exportAllObjectssplitToolStripMenuItem1
             // 
             this.exportAllObjectssplitToolStripMenuItem1.Name = "exportAllObjectssplitToolStripMenuItem1";
-            this.exportAllObjectssplitToolStripMenuItem1.Size = new System.Drawing.Size(382, 22);
+            this.exportAllObjectssplitToolStripMenuItem1.Size = new System.Drawing.Size(417, 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(382, 22);
+            this.exportSelectedObjectsToolStripMenuItem.Size = new System.Drawing.Size(417, 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(382, 22);
+            this.exportSelectedObjectsWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(417, 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(379, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(414, 6);
             // 
             // exportSelectedObjectsmergeToolStripMenuItem
             // 
             this.exportSelectedObjectsmergeToolStripMenuItem.Name = "exportSelectedObjectsmergeToolStripMenuItem";
-            this.exportSelectedObjectsmergeToolStripMenuItem.Size = new System.Drawing.Size(382, 22);
+            this.exportSelectedObjectsmergeToolStripMenuItem.Size = new System.Drawing.Size(417, 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(382, 22);
+            this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(417, 22);
             this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Text = "Export selected objects (merge) + selected AnimationClips";
             this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedObjectsmergeWithAnimationClipToolStripMenuItem_Click);
             // 
@@ -311,48 +337,50 @@
             this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem,
             this.toolStripSeparator4,
             this.toolStripMenuItem2,
-            this.toolStripMenuItem3});
+            this.toolStripMenuItem3,
+            this.toolStripSeparator2,
+            this.toolStripMenuItem10});
             this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(53, 20);
+            this.exportToolStripMenuItem.Size = new System.Drawing.Size(58, 21);
             this.exportToolStripMenuItem.Text = "Export";
             // 
             // exportAllAssetsMenuItem
             // 
             this.exportAllAssetsMenuItem.Name = "exportAllAssetsMenuItem";
-            this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(266, 22);
+            this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(284, 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(266, 22);
+            this.exportSelectedAssetsMenuItem.Size = new System.Drawing.Size(284, 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(266, 22);
+            this.exportFilteredAssetsMenuItem.Size = new System.Drawing.Size(284, 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(263, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(281, 6);
             // 
             // exportAnimatorWithSelectedAnimationClipToolStripMenuItem
             // 
             this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Name = "exportAnimatorWithSelectedAnimationClipToolStripMenuItem";
-            this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(266, 22);
+            this.exportAnimatorWithSelectedAnimationClipToolStripMenuItem.Size = new System.Drawing.Size(284, 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(263, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(281, 6);
             // 
             // toolStripMenuItem2
             // 
@@ -361,27 +389,27 @@
             this.toolStripMenuItem5,
             this.toolStripMenuItem6});
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(266, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(284, 22);
             this.toolStripMenuItem2.Text = "Raw";
             // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(165, 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(152, 22);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 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(152, 22);
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(165, 22);
             this.toolStripMenuItem6.Text = "Filtered assets";
             this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
             // 
@@ -392,36 +420,72 @@
             this.toolStripMenuItem8,
             this.toolStripMenuItem9});
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(266, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(284, 22);
             this.toolStripMenuItem3.Text = "Dump";
             // 
             // toolStripMenuItem7
             // 
             this.toolStripMenuItem7.Name = "toolStripMenuItem7";
-            this.toolStripMenuItem7.Size = new System.Drawing.Size(152, 22);
+            this.toolStripMenuItem7.Size = new System.Drawing.Size(165, 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(152, 22);
+            this.toolStripMenuItem8.Size = new System.Drawing.Size(165, 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(152, 22);
+            this.toolStripMenuItem9.Size = new System.Drawing.Size(165, 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);
+            // 
+            // toolStripMenuItem10
+            // 
+            this.toolStripMenuItem10.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem11,
+            this.toolStripMenuItem12,
+            this.toolStripMenuItem13});
+            this.toolStripMenuItem10.Name = "toolStripMenuItem10";
+            this.toolStripMenuItem10.Size = new System.Drawing.Size(284, 22);
+            this.toolStripMenuItem10.Text = "Asset list to XML";
+            // 
+            // toolStripMenuItem11
+            // 
+            this.toolStripMenuItem11.Name = "toolStripMenuItem11";
+            this.toolStripMenuItem11.Size = new System.Drawing.Size(165, 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.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.Text = "Filtered assets";
+            this.toolStripMenuItem13.Click += new System.EventHandler(this.toolStripMenuItem13_Click);
+            // 
             // filterTypeToolStripMenuItem
             // 
             this.filterTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.allToolStripMenuItem});
             this.filterTypeToolStripMenuItem.Name = "filterTypeToolStripMenuItem";
-            this.filterTypeToolStripMenuItem.Size = new System.Drawing.Size(72, 20);
+            this.filterTypeToolStripMenuItem.Size = new System.Drawing.Size(80, 21);
             this.filterTypeToolStripMenuItem.Text = "Filter Type";
             // 
             // allToolStripMenuItem
@@ -430,22 +494,33 @@
             this.allToolStripMenuItem.CheckOnClick = true;
             this.allToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.allToolStripMenuItem.Name = "allToolStripMenuItem";
-            this.allToolStripMenuItem.Size = new System.Drawing.Size(88, 22);
+            this.allToolStripMenuItem.Size = new System.Drawing.Size(90, 22);
             this.allToolStripMenuItem.Text = "All";
             this.allToolStripMenuItem.Click += new System.EventHandler(this.typeToolStripMenuItem_Click);
             // 
             // debugMenuItem
             // 
             this.debugMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem15,
             this.exportClassStructuresMenuItem});
             this.debugMenuItem.Name = "debugMenuItem";
-            this.debugMenuItem.Size = new System.Drawing.Size(54, 20);
+            this.debugMenuItem.Size = new System.Drawing.Size(59, 21);
             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.Click += new System.EventHandler(this.toolStripMenuItem15_Click);
+            // 
             // exportClassStructuresMenuItem
             // 
             this.exportClassStructuresMenuItem.Name = "exportClassStructuresMenuItem";
-            this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(191, 22);
+            this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(207, 22);
             this.exportClassStructuresMenuItem.Text = "Export class structures";
             this.exportClassStructuresMenuItem.Click += new System.EventHandler(this.exportClassStructuresMenuItem_Click);
             // 
@@ -453,7 +528,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, 24);
+            this.splitContainer1.Location = new System.Drawing.Point(0, 25);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
@@ -464,11 +539,10 @@
             // 
             // splitContainer1.Panel2
             // 
-            this.splitContainer1.Panel2.Controls.Add(this.previewPanel);
+            this.splitContainer1.Panel2.Controls.Add(this.tabControl2);
-            this.splitContainer1.Panel2.Controls.Add(this.classPreviewPanel);
             this.splitContainer1.Panel2.Controls.Add(this.statusStrip1);
             this.splitContainer1.Panel2MinSize = 400;
-            this.splitContainer1.Size = new System.Drawing.Size(1264, 657);
+            this.splitContainer1.Size = new System.Drawing.Size(1264, 656);
             this.splitContainer1.SplitterDistance = 482;
             this.splitContainer1.TabIndex = 2;
             this.splitContainer1.TabStop = false;
@@ -483,7 +557,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, 633);
+            this.tabControl1.Size = new System.Drawing.Size(480, 634);
             this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.tabControl1.TabIndex = 0;
             this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabPageSelected);
@@ -494,7 +568,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, 607);
+            this.tabPage1.Size = new System.Drawing.Size(472, 608);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "Scene Hierarchy";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -504,7 +578,7 @@
             this.sceneTreeView.CheckBoxes = true;
             this.sceneTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.sceneTreeView.HideSelection = false;
-            this.sceneTreeView.Location = new System.Drawing.Point(0, 20);
+            this.sceneTreeView.Location = new System.Drawing.Point(0, 21);
             this.sceneTreeView.Name = "sceneTreeView";
             this.sceneTreeView.Size = new System.Drawing.Size(472, 587);
             this.sceneTreeView.TabIndex = 1;
@@ -516,7 +590,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, 20);
+            this.treeSearch.Size = new System.Drawing.Size(472, 21);
             this.treeSearch.TabIndex = 0;
             this.treeSearch.Text = " Search ";
             this.treeSearch.TextChanged += new System.EventHandler(this.treeSearch_TextChanged);
@@ -530,7 +604,7 @@
             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, 664);
+            this.tabPage2.Size = new System.Drawing.Size(472, 608);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "Asset List";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -547,9 +621,9 @@
             this.assetListView.FullRowSelect = true;
             this.assetListView.GridLines = true;
             this.assetListView.HideSelection = false;
-            this.assetListView.Location = new System.Drawing.Point(0, 20);
+            this.assetListView.Location = new System.Drawing.Point(0, 21);
             this.assetListView.Name = "assetListView";
-            this.assetListView.Size = new System.Drawing.Size(472, 644);
+            this.assetListView.Size = new System.Drawing.Size(472, 587);
             this.assetListView.TabIndex = 1;
             this.assetListView.UseCompatibleStateImageBehavior = false;
             this.assetListView.View = System.Windows.Forms.View.Details;
@@ -589,7 +663,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, 20);
+            this.listSearch.Size = new System.Drawing.Size(472, 21);
             this.listSearch.TabIndex = 0;
             this.listSearch.Text = " Filter ";
             this.listSearch.TextChanged += new System.EventHandler(this.ListSearchTextChanged);
@@ -601,7 +675,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, 664);
+            this.tabPage3.Size = new System.Drawing.Size(472, 608);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "Asset Classes";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -617,7 +691,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, 664);
+            this.classesListView.Size = new System.Drawing.Size(472, 608);
             this.classesListView.TabIndex = 0;
             this.classesListView.UseCompatibleStateImageBehavior = false;
             this.classesListView.View = System.Windows.Forms.View.Details;
@@ -639,21 +713,43 @@
             // 
             this.progressbarPanel.Controls.Add(this.progressBar1);
             this.progressbarPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.progressbarPanel.Location = new System.Drawing.Point(0, 633);
+            this.progressbarPanel.Location = new System.Drawing.Point(0, 634);
             this.progressbarPanel.Name = "progressbarPanel";
             this.progressbarPanel.Padding = new System.Windows.Forms.Padding(1, 3, 1, 1);
-            this.progressbarPanel.Size = new System.Drawing.Size(480, 22);
+            this.progressbarPanel.Size = new System.Drawing.Size(480, 20);
             this.progressbarPanel.TabIndex = 2;
             // 
             // progressBar1
             // 
             this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.progressBar1.Location = new System.Drawing.Point(1, 3);
+            this.progressBar1.Location = new System.Drawing.Point(1, 2);
             this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(478, 18);
+            this.progressBar1.Size = new System.Drawing.Size(478, 17);
             this.progressBar1.Step = 1;
             this.progressBar1.TabIndex = 1;
             // 
+            // tabControl2
+            // 
+            this.tabControl2.Controls.Add(this.tabPage4);
+            this.tabControl2.Controls.Add(this.tabPage5);
+            this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            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.TabIndex = 4;
+            this.tabControl2.SelectedIndexChanged += new System.EventHandler(this.tabControl2_SelectedIndexChanged);
+            // 
+            // tabPage4
+            // 
+            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.TabIndex = 0;
+            this.tabPage4.Text = "Preview";
+            this.tabPage4.UseVisualStyleBackColor = true;
+            // 
             // previewPanel
             // 
             this.previewPanel.BackColor = System.Drawing.SystemColors.ControlDark;
@@ -662,12 +758,13 @@
             this.previewPanel.Controls.Add(this.assetInfoLabel);
             this.previewPanel.Controls.Add(this.FMODpanel);
             this.previewPanel.Controls.Add(this.fontPreviewBox);
-            this.previewPanel.Controls.Add(this.textPreviewBox);
             this.previewPanel.Controls.Add(this.glControl1);
+            this.previewPanel.Controls.Add(this.textPreviewBox);
+            this.previewPanel.Controls.Add(this.classTextBox);
             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(776, 633);
+            this.previewPanel.Size = new System.Drawing.Size(768, 606);
             this.previewPanel.TabIndex = 1;
             this.previewPanel.Resize += new System.EventHandler(this.preview_Resize);
             // 
@@ -676,9 +773,9 @@
             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, 8);
+            this.assetInfoLabel.Location = new System.Drawing.Point(4, 7);
             this.assetInfoLabel.Name = "assetInfoLabel";
-            this.assetInfoLabel.Size = new System.Drawing.Size(0, 13);
+            this.assetInfoLabel.Size = new System.Drawing.Size(0, 12);
             this.assetInfoLabel.TabIndex = 0;
             // 
             // FMODpanel
@@ -697,7 +794,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(776, 633);
+            this.FMODpanel.Size = new System.Drawing.Size(768, 606);
             this.FMODpanel.TabIndex = 2;
             this.FMODpanel.Visible = false;
             // 
@@ -705,9 +802,9 @@
             // 
             this.FMODcopyright.AutoSize = true;
             this.FMODcopyright.ForeColor = System.Drawing.SystemColors.ControlLight;
-            this.FMODcopyright.Location = new System.Drawing.Point(232, 379);
+            this.FMODcopyright.Location = new System.Drawing.Point(214, 337);
             this.FMODcopyright.Name = "FMODcopyright";
-            this.FMODcopyright.Size = new System.Drawing.Size(283, 13);
+            this.FMODcopyright.Size = new System.Drawing.Size(341, 12);
             this.FMODcopyright.TabIndex = 9;
             this.FMODcopyright.Text = "Audio Engine supplied by FMOD by Firelight Technologies.";
             // 
@@ -715,37 +812,38 @@
             // 
             this.FMODinfoLabel.AutoSize = true;
             this.FMODinfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.FMODinfoLabel.Location = new System.Drawing.Point(287, 269);
+            this.FMODinfoLabel.Location = new System.Drawing.Point(269, 235);
             this.FMODinfoLabel.Name = "FMODinfoLabel";
-            this.FMODinfoLabel.Size = new System.Drawing.Size(0, 13);
+            this.FMODinfoLabel.Size = new System.Drawing.Size(0, 12);
             this.FMODinfoLabel.TabIndex = 8;
             // 
             // FMODtimerLabel
             // 
+            this.FMODtimerLabel.AutoSize = true;
             this.FMODtimerLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.FMODtimerLabel.Location = new System.Drawing.Point(422, 269);
+            this.FMODtimerLabel.Location = new System.Drawing.Point(460, 235);
             this.FMODtimerLabel.Name = "FMODtimerLabel";
-            this.FMODtimerLabel.Size = new System.Drawing.Size(155, 13);
+            this.FMODtimerLabel.Size = new System.Drawing.Size(95, 12);
             this.FMODtimerLabel.TabIndex = 7;
             this.FMODtimerLabel.Text = "0:00.0 / 0:00.0";
-            this.FMODtimerLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
             // 
             // FMODstatusLabel
             // 
+            this.FMODstatusLabel.AutoSize = true;
             this.FMODstatusLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.FMODstatusLabel.Location = new System.Drawing.Point(231, 269);
+            this.FMODstatusLabel.Location = new System.Drawing.Point(213, 235);
             this.FMODstatusLabel.Name = "FMODstatusLabel";
-            this.FMODstatusLabel.Size = new System.Drawing.Size(50, 13);
+            this.FMODstatusLabel.Size = new System.Drawing.Size(47, 12);
             this.FMODstatusLabel.TabIndex = 6;
             this.FMODstatusLabel.Text = "Stopped";
             // 
             // FMODprogressBar
             // 
             this.FMODprogressBar.AutoSize = false;
-            this.FMODprogressBar.Location = new System.Drawing.Point(231, 288);
+            this.FMODprogressBar.Location = new System.Drawing.Point(213, 253);
             this.FMODprogressBar.Maximum = 1000;
             this.FMODprogressBar.Name = "FMODprogressBar";
-            this.FMODprogressBar.Size = new System.Drawing.Size(350, 24);
+            this.FMODprogressBar.Size = new System.Drawing.Size(350, 22);
             this.FMODprogressBar.TabIndex = 5;
             this.FMODprogressBar.TickStyle = System.Windows.Forms.TickStyle.None;
             this.FMODprogressBar.Scroll += new System.EventHandler(this.FMODprogressBar_Scroll);
@@ -755,7 +853,7 @@
             // FMODvolumeBar
             // 
             this.FMODvolumeBar.LargeChange = 2;
-            this.FMODvolumeBar.Location = new System.Drawing.Point(478, 317);
+            this.FMODvolumeBar.Location = new System.Drawing.Point(460, 280);
             this.FMODvolumeBar.Name = "FMODvolumeBar";
             this.FMODvolumeBar.Size = new System.Drawing.Size(104, 45);
             this.FMODvolumeBar.TabIndex = 4;
@@ -766,9 +864,9 @@
             // FMODloopButton
             // 
             this.FMODloopButton.Appearance = System.Windows.Forms.Appearance.Button;
-            this.FMODloopButton.Location = new System.Drawing.Point(417, 317);
+            this.FMODloopButton.Location = new System.Drawing.Point(399, 280);
             this.FMODloopButton.Name = "FMODloopButton";
-            this.FMODloopButton.Size = new System.Drawing.Size(55, 46);
+            this.FMODloopButton.Size = new System.Drawing.Size(55, 42);
             this.FMODloopButton.TabIndex = 3;
             this.FMODloopButton.Text = "Loop";
             this.FMODloopButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -777,9 +875,9 @@
             // 
             // FMODstopButton
             // 
-            this.FMODstopButton.Location = new System.Drawing.Point(356, 317);
+            this.FMODstopButton.Location = new System.Drawing.Point(338, 280);
             this.FMODstopButton.Name = "FMODstopButton";
-            this.FMODstopButton.Size = new System.Drawing.Size(55, 46);
+            this.FMODstopButton.Size = new System.Drawing.Size(55, 42);
             this.FMODstopButton.TabIndex = 2;
             this.FMODstopButton.Text = "Stop";
             this.FMODstopButton.UseVisualStyleBackColor = true;
@@ -787,9 +885,9 @@
             // 
             // FMODpauseButton
             // 
-            this.FMODpauseButton.Location = new System.Drawing.Point(295, 317);
+            this.FMODpauseButton.Location = new System.Drawing.Point(277, 280);
             this.FMODpauseButton.Name = "FMODpauseButton";
-            this.FMODpauseButton.Size = new System.Drawing.Size(55, 46);
+            this.FMODpauseButton.Size = new System.Drawing.Size(55, 42);
             this.FMODpauseButton.TabIndex = 1;
             this.FMODpauseButton.Text = "Pause";
             this.FMODpauseButton.UseVisualStyleBackColor = true;
@@ -797,9 +895,9 @@
             // 
             // FMODplayButton
             // 
-            this.FMODplayButton.Location = new System.Drawing.Point(234, 317);
+            this.FMODplayButton.Location = new System.Drawing.Point(216, 280);
             this.FMODplayButton.Name = "FMODplayButton";
-            this.FMODplayButton.Size = new System.Drawing.Size(55, 46);
+            this.FMODplayButton.Size = new System.Drawing.Size(55, 42);
             this.FMODplayButton.TabIndex = 0;
             this.FMODplayButton.Text = "Play";
             this.FMODplayButton.UseVisualStyleBackColor = true;
@@ -812,33 +910,19 @@
             this.fontPreviewBox.Location = new System.Drawing.Point(0, 0);
             this.fontPreviewBox.Name = "fontPreviewBox";
             this.fontPreviewBox.ReadOnly = true;
-            this.fontPreviewBox.Size = new System.Drawing.Size(776, 633);
+            this.fontPreviewBox.Size = new System.Drawing.Size(768, 606);
             this.fontPreviewBox.TabIndex = 0;
             this.fontPreviewBox.Text = resources.GetString("fontPreviewBox.Text");
             this.fontPreviewBox.Visible = false;
             this.fontPreviewBox.WordWrap = false;
             // 
-            // 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.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(776, 633);
-            this.textPreviewBox.TabIndex = 2;
-            this.textPreviewBox.Visible = false;
-            this.textPreviewBox.WordWrap = false;
-            // 
             // glControl1
             // 
             this.glControl1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             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(776, 633);
+            this.glControl1.Size = new System.Drawing.Size(768, 606);
             this.glControl1.TabIndex = 4;
             this.glControl1.Visible = false;
             this.glControl1.VSync = false;
@@ -849,15 +933,19 @@
             this.glControl1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.glControl1_MouseUp);
             this.glControl1.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.glControl1_MouseWheel);
             // 
-            // classPreviewPanel
+            // textPreviewBox
             // 
-            this.classPreviewPanel.Controls.Add(this.classTextBox);
+            this.textPreviewBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.classPreviewPanel.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.classPreviewPanel.Location = new System.Drawing.Point(0, 0);
+            this.textPreviewBox.Location = new System.Drawing.Point(0, 0);
-            this.classPreviewPanel.Name = "classPreviewPanel";
+            this.textPreviewBox.Multiline = true;
-            this.classPreviewPanel.Size = new System.Drawing.Size(776, 633);
+            this.textPreviewBox.Name = "textPreviewBox";
-            this.classPreviewPanel.TabIndex = 3;
+            this.textPreviewBox.ReadOnly = true;
-            this.classPreviewPanel.Visible = false;
+            this.textPreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.textPreviewBox.Size = new System.Drawing.Size(768, 606);
+            this.textPreviewBox.TabIndex = 2;
+            this.textPreviewBox.Visible = false;
+            this.textPreviewBox.WordWrap = false;
             // 
             // classTextBox
             // 
@@ -867,15 +955,38 @@
             this.classTextBox.Name = "classTextBox";
             this.classTextBox.ReadOnly = true;
             this.classTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.classTextBox.Size = new System.Drawing.Size(776, 633);
+            this.classTextBox.Size = new System.Drawing.Size(768, 606);
             this.classTextBox.TabIndex = 3;
+            this.classTextBox.Visible = false;
             this.classTextBox.WordWrap = false;
             // 
+            // tabPage5
+            // 
+            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.TabIndex = 1;
+            this.tabPage5.Text = "Dump";
+            this.tabPage5.UseVisualStyleBackColor = true;
+            // 
+            // dumpTextBox
+            // 
+            this.dumpTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dumpTextBox.Location = new System.Drawing.Point(0, 0);
+            this.dumpTextBox.Multiline = true;
+            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.TabIndex = 0;
+            this.dumpTextBox.WordWrap = false;
+            // 
             // statusStrip1
             // 
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 633);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 632);
             this.statusStrip1.Name = "statusStrip1";
             this.statusStrip1.Size = new System.Drawing.Size(776, 22);
             this.statusStrip1.TabIndex = 2;
@@ -902,49 +1013,36 @@
             this.openFileDialog1.Multiselect = true;
             this.openFileDialog1.RestoreDirectory = true;
             // 
-            // saveFileDialog1
-            // 
-            this.saveFileDialog1.Filter = "FBX file|*.fbx";
-            this.saveFileDialog1.RestoreDirectory = true;
-            // 
             // contextMenuStrip1
             // 
             this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.copyToolStripMenuItem,
             this.exportSelectedAssetsToolStripMenuItem,
-            this.dumpSelectedAssetsToolStripMenuItem,
             this.exportAnimatorwithselectedAnimationClipMenuItem,
             this.goToSceneHierarchyToolStripMenuItem,
             this.showOriginalFileToolStripMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(304, 136);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(327, 114);
             // 
             // copyToolStripMenuItem
             // 
             this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
-            this.copyToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
-            this.copyToolStripMenuItem.Text = "Copy";
+            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(303, 22);
+            this.exportSelectedAssetsToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
             this.exportSelectedAssetsToolStripMenuItem.Text = "Export selected assets";
             this.exportSelectedAssetsToolStripMenuItem.Click += new System.EventHandler(this.exportSelectedAssetsToolStripMenuItem_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);
-            // 
             // exportAnimatorwithselectedAnimationClipMenuItem
             // 
             this.exportAnimatorwithselectedAnimationClipMenuItem.Name = "exportAnimatorwithselectedAnimationClipMenuItem";
-            this.exportAnimatorwithselectedAnimationClipMenuItem.Size = new System.Drawing.Size(303, 22);
+            this.exportAnimatorwithselectedAnimationClipMenuItem.Size = new System.Drawing.Size(326, 22);
             this.exportAnimatorwithselectedAnimationClipMenuItem.Text = "Export Animator + selected AnimationClips";
             this.exportAnimatorwithselectedAnimationClipMenuItem.Visible = false;
             this.exportAnimatorwithselectedAnimationClipMenuItem.Click += new System.EventHandler(this.exportAnimatorwithAnimationClipMenuItem_Click);
@@ -952,7 +1050,7 @@
             // goToSceneHierarchyToolStripMenuItem
             // 
             this.goToSceneHierarchyToolStripMenuItem.Name = "goToSceneHierarchyToolStripMenuItem";
-            this.goToSceneHierarchyToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
+            this.goToSceneHierarchyToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
             this.goToSceneHierarchyToolStripMenuItem.Text = "Go to scene hierarchy";
             this.goToSceneHierarchyToolStripMenuItem.Visible = false;
             this.goToSceneHierarchyToolStripMenuItem.Click += new System.EventHandler(this.goToSceneHierarchyToolStripMenuItem_Click);
@@ -960,25 +1058,26 @@
             // showOriginalFileToolStripMenuItem
             // 
             this.showOriginalFileToolStripMenuItem.Name = "showOriginalFileToolStripMenuItem";
-            this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(303, 22);
+            this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(326, 22);
             this.showOriginalFileToolStripMenuItem.Text = "Show original file";
             this.showOriginalFileToolStripMenuItem.Visible = false;
             this.showOriginalFileToolStripMenuItem.Click += new System.EventHandler(this.showOriginalFileToolStripMenuItem_Click);
             // 
             // AssetStudioGUIForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AllowDrop = true;
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1264, 681);
             this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.menuStrip1);
             this.Icon = global::AssetStudioGUI.Properties.Resources._as;
             this.KeyPreview = true;
             this.MainMenuStrip = this.menuStrip1;
-            this.MinimumSize = new System.Drawing.Size(620, 400);
+            this.MinimumSize = new System.Drawing.Size(620, 372);
             this.Name = "AssetStudioGUIForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "AssetStudioGUI";
+            this.DragDrop += new System.Windows.Forms.DragEventHandler(this.AssetStudioGUIForm_DragDrop);
+            this.DragEnter += new System.Windows.Forms.DragEventHandler(this.AssetStudioGUIForm_DragEnter);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.AssetStudioForm_KeyDown);
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();
@@ -994,14 +1093,16 @@
             this.tabPage2.PerformLayout();
             this.tabPage3.ResumeLayout(false);
             this.progressbarPanel.ResumeLayout(false);
+            this.tabControl2.ResumeLayout(false);
+            this.tabPage4.ResumeLayout(false);
             this.previewPanel.ResumeLayout(false);
             this.previewPanel.PerformLayout();
             this.FMODpanel.ResumeLayout(false);
             this.FMODpanel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.FMODprogressBar)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.FMODvolumeBar)).EndInit();
-            this.classPreviewPanel.ResumeLayout(false);
+            this.tabPage5.ResumeLayout(false);
-            this.classPreviewPanel.PerformLayout();
+            this.tabPage5.PerformLayout();
             this.statusStrip1.ResumeLayout(false);
             this.statusStrip1.PerformLayout();
             this.contextMenuStrip1.ResumeLayout(false);
@@ -1058,7 +1159,6 @@
         private System.Windows.Forms.ToolStripMenuItem extractFileToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem extractFolderToolStripMenuItem;
         private System.Windows.Forms.OpenFileDialog openFileDialog1;
-        private System.Windows.Forms.SaveFileDialog saveFileDialog1;
         private System.Windows.Forms.ToolStripMenuItem showExpOpt;
         private GOHierarchy sceneTreeView;
         private System.Windows.Forms.ToolStripMenuItem debugMenuItem;
@@ -1066,7 +1166,6 @@
         private System.Windows.Forms.ListView classesListView;
         private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.Panel classPreviewPanel;
         private System.Windows.Forms.TextBox classTextBox;
         private System.Windows.Forms.ToolStripMenuItem exportClassStructuresMenuItem;
         private System.Windows.Forms.Label FMODcopyright;
@@ -1098,7 +1197,18 @@
         private System.Windows.Forms.ColumnHeader columnHeaderContainer;
         private System.Windows.Forms.ColumnHeader columnHeaderPathID;
         private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem dumpSelectedAssetsToolStripMenuItem;
+        private System.Windows.Forms.TabControl tabControl2;
+        private System.Windows.Forms.TabPage tabPage4;
+        private System.Windows.Forms.TabPage tabPage5;
+        private System.Windows.Forms.TextBox dumpTextBox;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem10;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem11;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem12;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem13;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem14;
+        private System.Windows.Forms.ToolStripTextBox specifyUnityVersion;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem15;
     }
 }
 

AssetStudioGUI/AssetStudioGUIForm.cs

@@ -1,11 +1,11 @@
 using AssetStudio;
+using Newtonsoft.Json;
 using OpenTK;
 using OpenTK.Graphics.OpenGL;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.Drawing.Text;
 using System.Globalization;
 using System.IO;
@@ -18,17 +18,21 @@ using System.Timers;
 using System.Windows.Forms;
 using static AssetStudioGUI.Studio;
 using Font = AssetStudio.Font;
-using PixelFormat = System.Drawing.Imaging.PixelFormat;
+#if NET472
 using Vector3 = OpenTK.Vector3;
 using Vector4 = OpenTK.Vector4;
+#else
+using Vector3 = OpenTK.Mathematics.Vector3;
+using Vector4 = OpenTK.Mathematics.Vector4;
+using Matrix4 = OpenTK.Mathematics.Matrix4;
+#endif
 
 namespace AssetStudioGUI
 {
     partial class AssetStudioGUIForm : Form
     {
         private AssetItem lastSelectedItem;
-        private AssetItem lastLoadedAsset;
+        private DirectBitmap imageTexture;
-        private Bitmap imageTexture;
         private string tempClipboard;
 
         private FMOD.System system;
@@ -81,6 +85,11 @@ namespace AssetStudioGUI
         private int nextGObject;
         private List<TreeNode> treeSrcResults = new List<TreeNode>();
 
+        private string openDirectoryBackup = string.Empty;
+        private string saveDirectoryBackup = string.Empty;
+
+        private GUILogger logger;
+
         [DllImport("gdi32.dll")]
         private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [In] ref uint pcFonts);
 
@@ -96,27 +105,27 @@ namespace AssetStudioGUI
             enablePreview.Checked = Properties.Settings.Default.enablePreview;
             FMODinit();
 
-            Logger.Default = new GUILogger(StatusStripUpdate);
+            logger = new GUILogger(StatusStripUpdate);
-            Progress.Default = new GUIProgress(SetProgressBarValue);
+            Logger.Default = logger;
+            Progress.Default = new Progress<int>(SetProgressBarValue);
             Studio.StatusStripUpdate = StatusStripUpdate;
-
-            this.AllowDrop = true;
-            this.DragEnter += AssetStudioGUIForm_DragEnter;
-            this.DragDrop += AssetStudioGUIForm_DragDrop;
         }
 
         private void AssetStudioGUIForm_DragEnter(object sender, DragEventArgs e)
         {
-            if (e.Data.GetDataPresent(DataFormats.FileDrop)) e.Effect = DragDropEffects.Move;
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                e.Effect = DragDropEffects.Move;
+            }
         }
 
         private async void AssetStudioGUIForm_DragDrop(object sender, DragEventArgs e)
         {
-            string[] paths = (string[])e.Data.GetData(DataFormats.FileDrop);
+            var paths = (string[])e.Data.GetData(DataFormats.FileDrop);
             if (paths.Length > 0)
             {
                 ResetForm();
-
+                assetsManager.SpecifyUnityVersion = specifyUnityVersion.Text;
                 if (paths.Length == 1 && Directory.Exists(paths[0]))
                 {
                     await Task.Run(() => assetsManager.LoadFolder(paths[0]));
@@ -125,16 +134,18 @@ namespace AssetStudioGUI
                 {
                     await Task.Run(() => assetsManager.LoadFiles(paths));
                 }
-
                 BuildAssetStructures();
             }
         }
 
         private async void loadFile_Click(object sender, EventArgs e)
         {
-            if (openFileDialog1.ShowDialog() == DialogResult.OK)
+            openFileDialog1.InitialDirectory = openDirectoryBackup;
+            if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
             {
                 ResetForm();
+                openDirectoryBackup = Path.GetDirectoryName(openFileDialog1.FileNames[0]);
+                assetsManager.SpecifyUnityVersion = specifyUnityVersion.Text;
                 await Task.Run(() => assetsManager.LoadFiles(openFileDialog1.FileNames));
                 BuildAssetStructures();
             }
@@ -143,29 +154,47 @@ namespace AssetStudioGUI
         private async void loadFolder_Click(object sender, EventArgs e)
         {
             var openFolderDialog = new OpenFolderDialog();
+            openFolderDialog.InitialFolder = openDirectoryBackup;
             if (openFolderDialog.ShowDialog(this) == DialogResult.OK)
             {
                 ResetForm();
+                openDirectoryBackup = openFolderDialog.Folder;
+                assetsManager.SpecifyUnityVersion = specifyUnityVersion.Text;
                 await Task.Run(() => assetsManager.LoadFolder(openFolderDialog.Folder));
                 BuildAssetStructures();
             }
         }
 
-        private void extractFileToolStripMenuItem_Click(object sender, EventArgs e)
+        private async void extractFileToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (openFileDialog1.ShowDialog() == DialogResult.OK)
+            if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
             {
-                ExtractFile(openFileDialog1.FileNames);
+                var saveFolderDialog = new OpenFolderDialog();
+                saveFolderDialog.Title = "Select the save folder";
+                if (saveFolderDialog.ShowDialog(this) == DialogResult.OK)
+                {
+                    var fileNames = openFileDialog1.FileNames;
+                    var savePath = saveFolderDialog.Folder;
+                    var extractedCount = await Task.Run(() => ExtractFile(fileNames, savePath));
+                    StatusStripUpdate($"Finished extracting {extractedCount} files.");
+                }
             }
         }
 
-        private void extractFolderToolStripMenuItem_Click(object sender, EventArgs e)
+        private async void extractFolderToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var openFolderDialog1 = new OpenFolderDialog();
+            var openFolderDialog = new OpenFolderDialog();
-            if (openFolderDialog1.ShowDialog(this) == DialogResult.OK)
+            if (openFolderDialog.ShowDialog(this) == DialogResult.OK)
             {
-                var files = Directory.GetFiles(openFolderDialog1.Folder, "*.*", SearchOption.AllDirectories);
+                var saveFolderDialog = new OpenFolderDialog();
-                ExtractFile(files);
+                saveFolderDialog.Title = "Select the save folder";
+                if (saveFolderDialog.ShowDialog(this) == DialogResult.OK)
+                {
+                    var path = openFolderDialog.Folder;
+                    var savePath = saveFolderDialog.Folder;
+                    var extractedCount = await Task.Run(() => ExtractFolder(path, savePath));
+                    StatusStripUpdate($"Finished extracting {extractedCount} files.");
+                }
             }
         }
 
@@ -173,7 +202,7 @@ namespace AssetStudioGUI
         {
             if (assetsManager.assetsFileList.Count == 0)
             {
-                StatusStripUpdate("No file was loaded.");
+                StatusStripUpdate("No Unity file can be loaded.");
                 return;
             }
 
@@ -193,10 +222,6 @@ namespace AssetStudioGUI
 
             sceneTreeView.BeginUpdate();
             sceneTreeView.Nodes.AddRange(treeNodeCollection.ToArray());
-            foreach (var node in treeNodeCollection)
-            {
-                node.HideCheckBox();
-            }
             sceneTreeView.EndUpdate();
             treeNodeCollection.Clear();
 
@@ -288,31 +313,31 @@ namespace AssetStudioGUI
             {
                 if (e.Control)
                 {
-                    bool dirty = false;
+                    var need = false;
                     switch (e.KeyCode)
                     {
                         case Keys.B:
                             textureChannels[0] = !textureChannels[0];
-                            dirty = true;
+                            need = true;
                             break;
                         case Keys.G:
                             textureChannels[1] = !textureChannels[1];
-                            dirty = true;
+                            need = true;
                             break;
                         case Keys.R:
                             textureChannels[2] = !textureChannels[2];
-                            dirty = true;
+                            need = true;
                             break;
                         case Keys.A:
                             textureChannels[3] = !textureChannels[3];
-                            dirty = true;
+                            need = true;
                             break;
                     }
-                    if (dirty)
+                    if (need)
                     {
-                        PreviewAsset(lastLoadedAsset);
+                        if (lastSelectedItem != null)
-                        if (lastSelectedItem != null && assetInfoLabel.Text != null)
                         {
+                            PreviewAsset(lastSelectedItem);
                             assetInfoLabel.Text = lastSelectedItem.InfoText;
                         }
                     }
@@ -333,10 +358,10 @@ namespace AssetStudioGUI
                     Progress.Reset();
                     foreach (TypeTreeItem item in classesListView.Items)
                     {
-                        var versionPath = savePath + "\\" + item.Group.Header;
+                        var versionPath = Path.Combine(savePath, item.Group.Header);
                         Directory.CreateDirectory(versionPath);
 
-                        var saveFile = $"{versionPath}\\{item.SubItems[1].Text} {item.Text}.txt";
+                        var saveFile = $"{versionPath}{Path.DirectorySeparatorChar}{item.SubItems[1].Text} {item.Text}.txt";
                         File.WriteAllText(saveFile, item.ToString());
 
                         Progress.Report(++i, count);
@@ -355,16 +380,16 @@ namespace AssetStudioGUI
 
         private void enablePreview_Check(object sender, EventArgs e)
         {
-            if (lastLoadedAsset != null)
+            if (lastSelectedItem != null)
             {
-                switch (lastLoadedAsset.Type)
+                switch (lastSelectedItem.Type)
                 {
                     case ClassIDType.Texture2D:
                     case ClassIDType.Sprite:
                         {
                             if (enablePreview.Checked && imageTexture != null)
                             {
-                                previewPanel.BackgroundImage = imageTexture;
+                                previewPanel.BackgroundImage = imageTexture.Bitmap;
                             }
                             else
                             {
@@ -396,7 +421,7 @@ namespace AssetStudioGUI
                             }
                             else if (FMODpanel.Visible)
                             {
-                                PreviewAsset(lastLoadedAsset);
+                                PreviewAsset(lastSelectedItem);
                             }
 
                             break;
@@ -407,8 +432,7 @@ namespace AssetStudioGUI
             }
             else if (lastSelectedItem != null && enablePreview.Checked)
             {
-                lastLoadedAsset = lastSelectedItem;
+                PreviewAsset(lastSelectedItem);
-                PreviewAsset(lastLoadedAsset);
             }
 
             Properties.Settings.Default.enablePreview = enablePreview.Checked;
@@ -433,7 +457,7 @@ namespace AssetStudioGUI
         private void showExpOpt_Click(object sender, EventArgs e)
         {
             var exportOpt = new ExportOptions();
-            exportOpt.ShowDialog();
+            exportOpt.ShowDialog(this);
         }
 
         private void assetListView_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e)
@@ -449,14 +473,8 @@ namespace AssetStudioGUI
                     treeSearch.Select();
                     break;
                 case 1:
-                    classPreviewPanel.Visible = false;
-                    previewPanel.Visible = true;
                     listSearch.Select();
                     break;
-                case 2:
-                    previewPanel.Visible = false;
-                    classPreviewPanel.Visible = true;
-                    break;
             }
         }
 
@@ -471,7 +489,7 @@ namespace AssetStudioGUI
 
         private void treeSearch_Leave(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(treeSearch.Text))
+            if (treeSearch.Text == "")
             {
                 treeSearch.Text = " Search ";
                 treeSearch.ForeColor = SystemColors.GrayText;
@@ -541,7 +559,7 @@ namespace AssetStudioGUI
 
         private void listSearch_Leave(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(listSearch.Text))
+            if (listSearch.Text == "")
             {
                 enableFiltering = false;
                 listSearch.Text = " Filter ";
@@ -618,13 +636,13 @@ namespace AssetStudioGUI
         {
             previewPanel.BackgroundImage = Properties.Resources.preview;
             previewPanel.BackgroundImageLayout = ImageLayout.Center;
+            classTextBox.Visible = false;
             assetInfoLabel.Visible = false;
             assetInfoLabel.Text = null;
             textPreviewBox.Visible = false;
             fontPreviewBox.Visible = false;
             FMODpanel.Visible = false;
             glControl1.Visible = false;
-            lastLoadedAsset = null;
             StatusStripUpdate("");
 
             FMODreset();
@@ -633,21 +651,32 @@ namespace AssetStudioGUI
 
             if (e.IsSelected)
             {
+                if (tabControl2.SelectedIndex == 1)
+                {
+                    dumpTextBox.Text = DumpAsset(lastSelectedItem.Asset);
+                }
                 if (enablePreview.Checked)
                 {
-                    lastLoadedAsset = lastSelectedItem;
+                    PreviewAsset(lastSelectedItem);
-                    PreviewAsset(lastLoadedAsset);
+                    if (displayInfo.Checked && lastSelectedItem.InfoText != null)
-                }
-                if (displayInfo.Checked && assetInfoLabel.Text != null)//only display the label if asset has info text
                     {
                         assetInfoLabel.Text = lastSelectedItem.InfoText;
                         assetInfoLabel.Visible = true;
                     }
                 }
             }
+        }
 
         private void classesListView_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
         {
+            classTextBox.Visible = true;
+            assetInfoLabel.Visible = false;
+            assetInfoLabel.Text = null;
+            textPreviewBox.Visible = false;
+            fontPreviewBox.Visible = false;
+            FMODpanel.Visible = false;
+            glControl1.Visible = false;
+            StatusStripUpdate("");
             if (e.IsSelected)
             {
                 classTextBox.Text = ((TypeTreeItem)classesListView.SelectedItems[0]).ToString();
@@ -723,9 +752,11 @@ namespace AssetStudioGUI
 
         private void PreviewTexture2D(AssetItem assetItem, Texture2D m_Texture2D)
         {
-            var bitmap = m_Texture2D.ConvertToBitmap(true);
+            var image = m_Texture2D.ConvertToImage(true);
-            if (bitmap != null)
+            if (image != null)
             {
+                var bitmap = new DirectBitmap(image.ConvertToBytes(), m_Texture2D.m_Width, m_Texture2D.m_Height);
+                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)
                 {
@@ -753,13 +784,11 @@ namespace AssetStudioGUI
                     assetItem.InfoText += "None";
                 if (validChannel != 4)
                 {
-                    var bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+                    var bytes = bitmap.Bits;
-                    var bytes = new byte[bitmap.Width * bitmap.Height * 4];
+                    for (int i = 0; i < bitmap.Height; i++)
-                    Marshal.Copy(bmpData.Scan0, bytes, 0, bytes.Length);
-                    for (int i = 0; i < bmpData.Height; i++)
                     {
-                        int offset = Math.Abs(bmpData.Stride) * i;
+                        int offset = Math.Abs(bitmap.Stride) * i;
-                        for (int j = 0; j < bmpData.Width; j++)
+                        for (int j = 0; j < bitmap.Width; j++)
                         {
                             bytes[offset] = textureChannels[0] ? bytes[offset] : validChannel == 1 && textureChannels[3] ? byte.MaxValue : byte.MinValue;
                             bytes[offset + 1] = textureChannels[1] ? bytes[offset + 1] : validChannel == 1 && textureChannels[3] ? byte.MaxValue : byte.MinValue;
@@ -768,8 +797,6 @@ namespace AssetStudioGUI
                             offset += 4;
                         }
                     }
-                    Marshal.Copy(bytes, 0, bmpData.Scan0, bytes.Length);
-                    bitmap.UnlockBits(bmpData);
                 }
                 PreviewTexture(bitmap);
 
@@ -789,40 +816,40 @@ namespace AssetStudioGUI
             {
                 switch (m_AudioClip.m_Type)
                 {
-                    case AudioType.ACC:
+                    case FMODSoundType.ACC:
                         assetItem.InfoText += "Acc";
                         break;
-                    case AudioType.AIFF:
+                    case FMODSoundType.AIFF:
                         assetItem.InfoText += "AIFF";
                         break;
-                    case AudioType.IT:
+                    case FMODSoundType.IT:
                         assetItem.InfoText += "Impulse tracker";
                         break;
-                    case AudioType.MOD:
+                    case FMODSoundType.MOD:
                         assetItem.InfoText += "Protracker / Fasttracker MOD";
                         break;
-                    case AudioType.MPEG:
+                    case FMODSoundType.MPEG:
                         assetItem.InfoText += "MP2/MP3 MPEG";
                         break;
-                    case AudioType.OGGVORBIS:
+                    case FMODSoundType.OGGVORBIS:
                         assetItem.InfoText += "Ogg vorbis";
                         break;
-                    case AudioType.S3M:
+                    case FMODSoundType.S3M:
                         assetItem.InfoText += "ScreamTracker 3";
                         break;
-                    case AudioType.WAV:
+                    case FMODSoundType.WAV:
                         assetItem.InfoText += "Microsoft WAV";
                         break;
-                    case AudioType.XM:
+                    case FMODSoundType.XM:
                         assetItem.InfoText += "FastTracker 2 XM";
                         break;
-                    case AudioType.XMA:
+                    case FMODSoundType.XMA:
                         assetItem.InfoText += "Xbox360 XMA";
                         break;
-                    case AudioType.VAG:
+                    case FMODSoundType.VAG:
                         assetItem.InfoText += "PlayStation Portable ADPCM";
                         break;
-                    case AudioType.AUDIOQUEUE:
+                    case FMODSoundType.AUDIOQUEUE:
                         assetItem.InfoText += "iPhone";
                         break;
                     default:
@@ -846,7 +873,7 @@ namespace AssetStudioGUI
                     case AudioCompressionFormat.MP3:
                         assetItem.InfoText += "MP3";
                         break;
-                    case AudioCompressionFormat.VAG:
+                    case AudioCompressionFormat.PSMVAG:
                         assetItem.InfoText += "PlayStation Portable ADPCM";
                         break;
                     case AudioCompressionFormat.HEVAG:
@@ -881,11 +908,16 @@ namespace AssetStudioGUI
             var result = system.createSound(m_AudioData, FMOD.MODE.OPENMEMORY | loopMode, ref exinfo, out sound);
             if (ERRCHECK(result)) return;
 
+            sound.getNumSubSounds(out var numsubsounds);
+
+            if (numsubsounds > 0)
+            {
                 result = sound.getSubSound(0, out var subsound);
                 if (result == FMOD.RESULT.OK)
                 {
                     sound = subsound;
                 }
+            }
 
             result = sound.getLength(out FMODlenms, FMOD.TIMEUNIT.MS);
             if (ERRCHECK(result)) return;
@@ -911,12 +943,20 @@ namespace AssetStudioGUI
         private void PreviewTextAsset(TextAsset m_TextAsset)
         {
             var text = Encoding.UTF8.GetString(m_TextAsset.m_Script);
-            PreviewText(text.Replace("\n", "\r\n"));
+            text = text.Replace("\n", "\r\n").Replace("\0", "");
+            PreviewText(text);
         }
 
         private void PreviewMonoBehaviour(MonoBehaviour m_MonoBehaviour)
         {
-            PreviewText(m_MonoBehaviour.Dump() ?? GetScriptString(m_MonoBehaviour.reader));
+            var obj = m_MonoBehaviour.ToType();
+            if (obj == null)
+            {
+                var type = MonoBehaviourToTypeTree(m_MonoBehaviour);
+                obj = m_MonoBehaviour.ToType(type);
+            }
+            var str = JsonConvert.SerializeObject(obj, Formatting.Indented);
+            PreviewText(str);
         }
 
         private void PreviewFont(Font m_Font)
@@ -1120,11 +1160,12 @@ namespace AssetStudioGUI
 
         private void PreviewSprite(AssetItem assetItem, Sprite m_Sprite)
         {
-            var bitmap = m_Sprite.GetImage();
+            var image = m_Sprite.GetImage();
-            if (bitmap != null)
+            if (image != null)
             {
+                var bitmap = new DirectBitmap(image.ConvertToBytes(), image.Width, image.Height);
+                image.Dispose();
                 assetItem.InfoText = $"Width: {bitmap.Width}\nHeight: {bitmap.Height}\n";
-
                 PreviewTexture(bitmap);
             }
             else
@@ -1133,11 +1174,11 @@ namespace AssetStudioGUI
             }
         }
 
-        private void PreviewTexture(Bitmap bitmap)
+        private void PreviewTexture(DirectBitmap bitmap)
         {
             imageTexture?.Dispose();
             imageTexture = bitmap;
-            previewPanel.BackgroundImage = imageTexture;
+            previewPanel.BackgroundImage = imageTexture.Bitmap;
             if (imageTexture.Width > previewPanel.Width || imageTexture.Height > previewPanel.Height)
                 previewPanel.BackgroundImageLayout = ImageLayout.Zoom;
             else
@@ -1178,6 +1219,7 @@ namespace AssetStudioGUI
         {
             Text = $"AssetStudioGUI v{Application.ProductVersion}";
             assetsManager.Clear();
+            assemblyLoader.Clear();
             exportableAssets.Clear();
             visibleAssets.Clear();
             sceneTreeView.Nodes.Clear();
@@ -1187,6 +1229,7 @@ namespace AssetStudioGUI
             classesListView.Groups.Clear();
             previewPanel.BackgroundImage = Properties.Resources.preview;
             imageTexture?.Dispose();
+            imageTexture = null;
             previewPanel.BackgroundImageLayout = ImageLayout.Center;
             assetInfoLabel.Visible = false;
             assetInfoLabel.Text = null;
@@ -1194,13 +1237,10 @@ namespace AssetStudioGUI
             fontPreviewBox.Visible = false;
             glControl1.Visible = false;
             lastSelectedItem = null;
-            lastLoadedAsset = null;
             sortColumn = -1;
             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++)
@@ -1209,12 +1249,6 @@ namespace AssetStudioGUI
             }
 
             FMODreset();
-
-            if (scriptDumper != null)
-            {
-                scriptDumper.Dispose();
-                scriptDumper = null;
-            }
         }
 
         private void assetListView_MouseClick(object sender, MouseEventArgs e)
@@ -1251,12 +1285,7 @@ namespace AssetStudioGUI
 
         private void exportSelectedAssetsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            ExportAssets(2, ExportType.Convert);
+            ExportAssets(ExportFilter.Selected, ExportType.Convert);
-        }
-
-        private void dumpSelectedAssetsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ExportAssets(2, ExportType.Dump);
         }
 
         private void showOriginalFileToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1286,10 +1315,12 @@ namespace AssetStudioGUI
 
             if (animator != null)
             {
-                var saveFolderDialog1 = new OpenFolderDialog();
+                var saveFolderDialog = new OpenFolderDialog();
-                if (saveFolderDialog1.ShowDialog(this) == DialogResult.OK)
+                saveFolderDialog.InitialFolder = saveDirectoryBackup;
+                if (saveFolderDialog.ShowDialog(this) == DialogResult.OK)
                 {
-                    var exportPath = saveFolderDialog1.Folder + "\\Animator\\";
+                    saveDirectoryBackup = saveFolderDialog.Folder;
+                    var exportPath = Path.Combine(saveFolderDialog.Folder, "Animator") + Path.DirectorySeparatorChar;
                     ExportAnimatorWithAnimationClip(animator, animationList, exportPath);
                 }
             }
@@ -1309,10 +1340,12 @@ namespace AssetStudioGUI
         {
             if (sceneTreeView.Nodes.Count > 0)
             {
-                var saveFolderDialog1 = new OpenFolderDialog();
+                var saveFolderDialog = new OpenFolderDialog();
-                if (saveFolderDialog1.ShowDialog(this) == DialogResult.OK)
+                saveFolderDialog.InitialFolder = saveDirectoryBackup;
+                if (saveFolderDialog.ShowDialog(this) == DialogResult.OK)
                 {
-                    var exportPath = saveFolderDialog1.Folder + "\\GameObject\\";
+                    saveDirectoryBackup = saveFolderDialog.Folder;
+                    var exportPath = Path.Combine(saveFolderDialog.Folder, "GameObject") + Path.DirectorySeparatorChar;
                     List<AssetItem> animationList = null;
                     if (animation)
                     {
@@ -1347,12 +1380,16 @@ namespace AssetStudioGUI
             {
                 var gameObjects = new List<GameObject>();
                 GetSelectedParentNode(sceneTreeView.Nodes, gameObjects);
+                if (gameObjects.Count > 0)
+                {
                     var saveFileDialog = new SaveFileDialog();
                     saveFileDialog.FileName = gameObjects[0].m_Name + " (merge).fbx";
                     saveFileDialog.AddExtension = false;
                     saveFileDialog.Filter = "Fbx file (*.fbx)|*.fbx";
-                if (saveFileDialog.ShowDialog() == DialogResult.OK)
+                    saveFileDialog.InitialDirectory = saveDirectoryBackup;
+                    if (saveFileDialog.ShowDialog(this) == DialogResult.OK)
                     {
+                        saveDirectoryBackup = Path.GetDirectoryName(saveFileDialog.FileName);
                         var exportPath = saveFileDialog.FileName;
                         List<AssetItem> animationList = null;
                         if (animation)
@@ -1366,6 +1403,11 @@ namespace AssetStudioGUI
                         ExportObjectsMergeWithAnimationClip(exportPath, gameObjects, animationList);
                     }
                 }
+                else
+                {
+                    StatusStripUpdate("No Object selected for export.");
+                }
+            }
         }
 
         private void goToSceneHierarchyToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1380,57 +1422,74 @@ namespace AssetStudioGUI
 
         private void exportAllAssetsMenuItem_Click(object sender, EventArgs e)
         {
-            ExportAssets(1, ExportType.Convert);
+            ExportAssets(ExportFilter.All, ExportType.Convert);
         }
 
         private void exportSelectedAssetsMenuItem_Click(object sender, EventArgs e)
         {
-            ExportAssets(2, ExportType.Convert);
+            ExportAssets(ExportFilter.Selected, ExportType.Convert);
         }
 
         private void exportFilteredAssetsMenuItem_Click(object sender, EventArgs e)
         {
-            ExportAssets(3, ExportType.Convert);
+            ExportAssets(ExportFilter.Filtered, ExportType.Convert);
         }
 
         private void toolStripMenuItem4_Click(object sender, EventArgs e)
         {
-            ExportAssets(1, ExportType.Raw);
+            ExportAssets(ExportFilter.All, ExportType.Raw);
         }
 
         private void toolStripMenuItem5_Click(object sender, EventArgs e)
         {
-            ExportAssets(2, ExportType.Raw);
+            ExportAssets(ExportFilter.Selected, ExportType.Raw);
         }
 
         private void toolStripMenuItem6_Click(object sender, EventArgs e)
         {
-            ExportAssets(3, ExportType.Raw);
+            ExportAssets(ExportFilter.Filtered, ExportType.Raw);
         }
 
         private void toolStripMenuItem7_Click(object sender, EventArgs e)
         {
-            ExportAssets(1, ExportType.Dump);
+            ExportAssets(ExportFilter.All, ExportType.Dump);
         }
 
         private void toolStripMenuItem8_Click(object sender, EventArgs e)
         {
-            ExportAssets(2, ExportType.Dump);
+            ExportAssets(ExportFilter.Selected, ExportType.Dump);
         }
 
         private void toolStripMenuItem9_Click(object sender, EventArgs e)
         {
-            ExportAssets(3, ExportType.Dump);
+            ExportAssets(ExportFilter.Filtered, ExportType.Dump);
+        }
+
+        private void toolStripMenuItem11_Click(object sender, EventArgs e)
+        {
+            ExportAssetsList(ExportFilter.All);
+        }
+
+        private void toolStripMenuItem12_Click(object sender, EventArgs e)
+        {
+            ExportAssetsList(ExportFilter.Selected);
+        }
+
+        private void toolStripMenuItem13_Click(object sender, EventArgs e)
+        {
+            ExportAssetsList(ExportFilter.Filtered);
         }
 
         private void exportAllObjectssplitToolStripMenuItem1_Click(object sender, EventArgs e)
         {
             if (sceneTreeView.Nodes.Count > 0)
             {
-                var saveFolderDialog1 = new OpenFolderDialog();
+                var saveFolderDialog = new OpenFolderDialog();
-                if (saveFolderDialog1.ShowDialog(this) == DialogResult.OK)
+                saveFolderDialog.InitialFolder = saveDirectoryBackup;
+                if (saveFolderDialog.ShowDialog(this) == DialogResult.OK)
                 {
-                    var savePath = saveFolderDialog1.Folder + "\\";
+                    saveDirectoryBackup = saveFolderDialog.Folder;
+                    var savePath = saveFolderDialog.Folder + Path.DirectorySeparatorChar;
                     ExportSplitObjects(savePath, sceneTreeView.Nodes);
                 }
             }
@@ -1483,29 +1542,64 @@ namespace AssetStudioGUI
             assetListView.EndUpdate();
         }
 
-        private void ExportAssets(int type, ExportType exportType)
+        private void ExportAssets(ExportFilter type, ExportType exportType)
         {
             if (exportableAssets.Count > 0)
             {
-                var saveFolderDialog1 = new OpenFolderDialog();
+                var saveFolderDialog = new OpenFolderDialog();
-                if (saveFolderDialog1.ShowDialog(this) == DialogResult.OK)
+                saveFolderDialog.InitialFolder = saveDirectoryBackup;
+                if (saveFolderDialog.ShowDialog(this) == DialogResult.OK)
                 {
                     timer.Stop();
-
+                    saveDirectoryBackup = saveFolderDialog.Folder;
                     List<AssetItem> toExportAssets = null;
                     switch (type)
                     {
-                        case 1: //All Assets
+                        case ExportFilter.All:
                             toExportAssets = exportableAssets;
                             break;
-                        case 2: //Selected Assets
+                        case ExportFilter.Selected:
                             toExportAssets = GetSelectedAssets();
                             break;
-                        case 3: //Filtered Assets
+                        case ExportFilter.Filtered:
                             toExportAssets = visibleAssets;
                             break;
                     }
-                    Studio.ExportAssets(saveFolderDialog1.Folder, toExportAssets, exportType);
+                    Studio.ExportAssets(saveFolderDialog.Folder, toExportAssets, exportType);
+                }
+            }
+            else
+            {
+                StatusStripUpdate("No exportable assets loaded");
+            }
+        }
+
+        private void ExportAssetsList(ExportFilter type)
+        {
+            // XXX: Only exporting as XML for now, but would JSON(/CSV/other) be useful too?
+
+            if (exportableAssets.Count > 0)
+            {
+                var saveFolderDialog = new OpenFolderDialog();
+                saveFolderDialog.InitialFolder = saveDirectoryBackup;
+                if (saveFolderDialog.ShowDialog(this) == DialogResult.OK)
+                {
+                    timer.Stop();
+                    saveDirectoryBackup = saveFolderDialog.Folder;
+                    List<AssetItem> toExportAssets = null;
+                    switch (type)
+                    {
+                        case ExportFilter.All:
+                            toExportAssets = exportableAssets;
+                            break;
+                        case ExportFilter.Selected:
+                            toExportAssets = GetSelectedAssets();
+                            break;
+                        case ExportFilter.Filtered:
+                            toExportAssets = visibleAssets;
+                            break;
+                    }
+                    Studio.ExportAssetsList(saveFolderDialog.Folder, toExportAssets, ExportListType.XML);
                 }
             }
             else
@@ -1530,7 +1624,7 @@ namespace AssetStudioGUI
                 Application.Exit();
             }
 
-            result = system.init(1, FMOD.INITFLAGS.NORMAL, IntPtr.Zero);
+            result = system.init(2, FMOD.INITFLAGS.NORMAL, IntPtr.Zero);
             if (ERRCHECK(result)) { return; }
 
             result = system.getMasterSoundGroup(out masterSoundGroup);
@@ -1942,6 +2036,19 @@ 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

@@ -147,9 +147,6 @@ The quick brown fox jumps over the lazy dog. 1234567890</value>
   <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>636, 17</value>
   </metadata>
-  <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>784, 17</value>
-  </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>147, 17</value>
   </metadata>

AssetStudioGUI/Components/GameObjectTreeNode.cs

@@ -7,11 +7,6 @@ namespace AssetStudioGUI
     {
         public GameObject gameObject;
 
-        public GameObjectTreeNode(string name)
-        {
-            Text = name;
-        }
-
         public GameObjectTreeNode(GameObject gameObject)
         {
             this.gameObject = gameObject;

AssetStudioGUI/Components/OpenFolderDialog.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -15,12 +14,13 @@ namespace AssetStudioGUI
 
         internal DialogResult ShowDialog(IWin32Window owner = null)
         {
+//#if NETFRAMEWORK
             if (Environment.OSVersion.Version.Major >= 6)
             {
                 return ShowVistaDialog(owner);
             }
-
+//#endif
-            return ShowLegacyDialog(owner);
+            return ShowFolderBrowserDialog(owner);
         }
 
         private DialogResult ShowVistaDialog(IWin32Window owner)
@@ -29,9 +29,11 @@ namespace AssetStudioGUI
             frm.GetOptions(out var options);
             options |= NativeMethods.FOS_PICKFOLDERS | NativeMethods.FOS_FORCEFILESYSTEM | NativeMethods.FOS_NOVALIDATE | NativeMethods.FOS_NOTESTFILECREATE | NativeMethods.FOS_DONTADDTORECENT;
             frm.SetOptions(options);
-            if (Title != null)
+            if (!string.IsNullOrEmpty(Title))
+            {
                 frm.SetTitle(Title);
-            if (InitialFolder != null)
+            }
+            if (!string.IsNullOrEmpty(InitialFolder))
             {
                 var riid = new Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE"); //IShellItem  
                 if (NativeMethods.SHCreateItemFromParsingName(InitialFolder, IntPtr.Zero, ref riid, out var directoryShellItem) == NativeMethods.S_OK)
@@ -39,7 +41,7 @@ namespace AssetStudioGUI
                     frm.SetFolder(directoryShellItem);
                 }
             }
-            if (DefaultFolder != null)
+            if (!string.IsNullOrEmpty(DefaultFolder))
             {
                 var riid = new Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE"); //IShellItem  
                 if (NativeMethods.SHCreateItemFromParsingName(DefaultFolder, IntPtr.Zero, ref riid, out var directoryShellItem) == NativeMethods.S_OK)
@@ -72,7 +74,7 @@ namespace AssetStudioGUI
             return DialogResult.Cancel;
         }
 
-        private DialogResult ShowLegacyDialog(IWin32Window owner)
+        private DialogResult ShowFolderBrowserDialog(IWin32Window owner)
         {
             using (var frm = new FolderBrowserDialog())
             {
@@ -80,13 +82,20 @@ namespace AssetStudioGUI
                 {
                     frm.SelectedPath = InitialFolder;
                 }
-                if ((owner == null ? frm.ShowDialog() : frm.ShowDialog(owner)) == DialogResult.OK)
+#if !NETFRAMEWORK
+                if (Title != null)
                 {
-                    Folder = Path.GetDirectoryName(frm.SelectedPath);
+                    frm.Description = Title;
-                    return DialogResult.OK;
+                    frm.UseDescriptionForTitle = true;
                 }
-
+#endif
-                return DialogResult.Cancel;
+                var result = owner == null ? frm.ShowDialog() : frm.ShowDialog(owner);
+                if (result == DialogResult.OK)
+                {
+                    Folder = frm.SelectedPath;
+                    return result;
+                }
+                return result;
             }
         }
     }

AssetStudioGUI/Components/TreeViewExtensions.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-
-namespace AssetStudioGUI
-{
-    internal static class TreeViewExtensions
-    {
-        private const int TVIF_STATE = 0x8;
-        private const int TVIS_STATEIMAGEMASK = 0xF000;
-        private const int TV_FIRST = 0x1100;
-        private const int TVM_SETITEM = TV_FIRST + 63;
-
-        [StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Auto)]
-        private struct TVITEM
-        {
-            public int mask;
-            public IntPtr hItem;
-            public int state;
-            public int stateMask;
-            [MarshalAs(UnmanagedType.LPTStr)]
-            public string lpszText;
-            public int cchTextMax;
-            public int iImage;
-            public int iSelectedImage;
-            public int cChildren;
-            public IntPtr lParam;
-        }
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, ref TVITEM lParam);
-
-        /// <summary>
-        /// Hides the checkbox for the specified node on a TreeView control.
-        /// </summary>
-        public static void HideCheckBox(this TreeNode node)
-        {
-            var tvi = new TVITEM
-            {
-                hItem = node.Handle,
-                mask = TVIF_STATE,
-                stateMask = TVIS_STATEIMAGEMASK,
-                state = node.StateImageIndex //freeze bugfix (no)
-            };
-            SendMessage(node.TreeView.Handle, TVM_SETITEM, IntPtr.Zero, ref tvi);
-        }
-    }
-}

AssetStudioGUI/Components/TypeTreeItem.cs

@@ -7,19 +7,19 @@ namespace AssetStudioGUI
 {
     internal class TypeTreeItem : ListViewItem
     {
-        private List<TypeTreeNode> m_Nodes;
+        private TypeTree m_Type;
 
-        public TypeTreeItem(int typeID, List<TypeTreeNode> m_Nodes)
+        public TypeTreeItem(int typeID, TypeTree m_Type)
         {
-            this.m_Nodes = m_Nodes;
+            this.m_Type = m_Type;
-            Text = m_Nodes[0].m_Type + " " + m_Nodes[0].m_Name;
+            Text = m_Type.m_Nodes[0].m_Type + " " + m_Type.m_Nodes[0].m_Name;
             SubItems.Add(typeID.ToString());
         }
 
         public override string ToString()
         {
             var sb = new StringBuilder();
-            foreach (var i in m_Nodes)
+            foreach (var i in m_Type.m_Nodes)
             {
                 sb.AppendFormat("{0}{1} {2} {3} {4}\r\n", new string('\t', i.m_Level), i.m_Type, i.m_Name, i.m_ByteSize, (i.m_MetaFlag & 0x4000) != 0);
             }

AssetStudioGUI/DirectBitmap.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Runtime.InteropServices;
+
+namespace AssetStudioGUI
+{
+    public sealed class DirectBitmap : IDisposable
+    {
+        public DirectBitmap(byte[] buff, int width, int height)
+        {
+            Width = width;
+            Height = height;
+            Bits = buff;
+            m_handle = GCHandle.Alloc(Bits, GCHandleType.Pinned);
+            m_bitmap = new Bitmap(Width, Height, Stride, PixelFormat.Format32bppArgb, m_handle.AddrOfPinnedObject());
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                m_bitmap.Dispose();
+                m_handle.Free();
+            }
+            m_bitmap = null;
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        public int Height { get; }
+        public int Width { get; }
+        public int Stride => Width * 4;
+        public byte[] Bits { get; }
+        public Bitmap Bitmap => m_bitmap;
+
+        private Bitmap m_bitmap;
+        private readonly GCHandle m_handle;
+    }
+}

AssetStudioGUI/ExportOptions.Designer.cs

@@ -28,11 +28,10 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.OKbutton = new System.Windows.Forms.Button();
             this.Cancel = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.pathIDAsDumpName = new System.Windows.Forms.CheckBox();
-            this.pathIDAsImageName = 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();
@@ -45,6 +44,7 @@
             this.tobmp = new System.Windows.Forms.RadioButton();
             this.converttexture = new System.Windows.Forms.CheckBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.exportAllUvsAsDiffuseMaps = new System.Windows.Forms.CheckBox();
             this.exportBlendShape = new System.Windows.Forms.CheckBox();
             this.exportAnimations = new System.Windows.Forms.CheckBox();
             this.scaleFactor = new System.Windows.Forms.NumericUpDown();
@@ -61,6 +61,7 @@
             this.castToBone = new System.Windows.Forms.CheckBox();
             this.exportAllNodes = new System.Windows.Forms.CheckBox();
             this.eulerFilter = new System.Windows.Forms.CheckBox();
+            this.exportUvsTooltip = new System.Windows.Forms.ToolTip(this.components);
             this.groupBox1.SuspendLayout();
             this.panel1.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -71,9 +72,9 @@
             // 
             // OKbutton
             // 
-            this.OKbutton.Location = new System.Drawing.Point(308, 347);
+            this.OKbutton.Location = new System.Drawing.Point(318, 351);
             this.OKbutton.Name = "OKbutton";
-            this.OKbutton.Size = new System.Drawing.Size(75, 23);
+            this.OKbutton.Size = new System.Drawing.Size(75, 21);
             this.OKbutton.TabIndex = 6;
             this.OKbutton.Text = "OK";
             this.OKbutton.UseVisualStyleBackColor = true;
@@ -82,9 +83,9 @@
             // Cancel
             // 
             this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.Cancel.Location = new System.Drawing.Point(389, 347);
+            this.Cancel.Location = new System.Drawing.Point(399, 351);
             this.Cancel.Name = "Cancel";
-            this.Cancel.Size = new System.Drawing.Size(75, 23);
+            this.Cancel.Size = new System.Drawing.Size(75, 21);
             this.Cancel.TabIndex = 7;
             this.Cancel.Text = "Cancel";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -93,8 +94,6 @@
             // groupBox1
             // 
             this.groupBox1.AutoSize = true;
-            this.groupBox1.Controls.Add(this.pathIDAsDumpName);
-            this.groupBox1.Controls.Add(this.pathIDAsImageName);
             this.groupBox1.Controls.Add(this.openAfterExport);
             this.groupBox1.Controls.Add(this.restoreExtensionName);
             this.groupBox1.Controls.Add(this.assetGroupOptions);
@@ -102,45 +101,21 @@
             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, 13);
+            this.groupBox1.Location = new System.Drawing.Point(12, 12);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(246, 327);
+            this.groupBox1.Size = new System.Drawing.Size(232, 334);
             this.groupBox1.TabIndex = 9;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Export";
             // 
-            // pathIDAsDumpName
-            // 
-            this.pathIDAsDumpName.AutoSize = true;
-            this.pathIDAsDumpName.Checked = true;
-            this.pathIDAsDumpName.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.pathIDAsDumpName.Location = new System.Drawing.Point(6, 217);
-            this.pathIDAsDumpName.Name = "pathIDAsDumpName";
-            this.pathIDAsDumpName.Size = new System.Drawing.Size(201, 17);
-            this.pathIDAsDumpName.TabIndex = 12;
-            this.pathIDAsDumpName.Text = "Dump assets with PathID as filename";
-            this.pathIDAsDumpName.UseVisualStyleBackColor = true;
-            // 
-            // pathIDAsImageName
-            // 
-            this.pathIDAsImageName.AutoSize = true;
-            this.pathIDAsImageName.Checked = true;
-            this.pathIDAsImageName.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.pathIDAsImageName.Location = new System.Drawing.Point(6, 196);
-            this.pathIDAsImageName.Name = "pathIDAsImageName";
-            this.pathIDAsImageName.Size = new System.Drawing.Size(234, 17);
-            this.pathIDAsImageName.TabIndex = 11;
-            this.pathIDAsImageName.Text = "Export image assets with PathID as filename";
-            this.pathIDAsImageName.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, 173);
+            this.openAfterExport.Location = new System.Drawing.Point(6, 160);
             this.openAfterExport.Name = "openAfterExport";
-            this.openAfterExport.Size = new System.Drawing.Size(137, 17);
+            this.openAfterExport.Size = new System.Drawing.Size(168, 16);
             this.openAfterExport.TabIndex = 10;
             this.openAfterExport.Text = "Open folder after export";
             this.openAfterExport.UseVisualStyleBackColor = true;
@@ -150,9 +125,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, 63);
+            this.restoreExtensionName.Location = new System.Drawing.Point(6, 58);
             this.restoreExtensionName.Name = "restoreExtensionName";
-            this.restoreExtensionName.Size = new System.Drawing.Size(190, 17);
+            this.restoreExtensionName.Size = new System.Drawing.Size(216, 16);
             this.restoreExtensionName.TabIndex = 9;
             this.restoreExtensionName.Text = "Restore TextAsset extension name";
             this.restoreExtensionName.UseVisualStyleBackColor = true;
@@ -166,17 +141,17 @@
             "container path",
             "source file name",
             "do not group"});
-            this.assetGroupOptions.Location = new System.Drawing.Point(6, 35);
+            this.assetGroupOptions.Location = new System.Drawing.Point(6, 32);
             this.assetGroupOptions.Name = "assetGroupOptions";
-            this.assetGroupOptions.Size = new System.Drawing.Size(149, 21);
+            this.assetGroupOptions.Size = new System.Drawing.Size(149, 20);
             this.assetGroupOptions.TabIndex = 8;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(6, 18);
+            this.label6.Location = new System.Drawing.Point(6, 17);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(127, 13);
+            this.label6.Size = new System.Drawing.Size(149, 12);
             this.label6.TabIndex = 7;
             this.label6.Text = "Group exported assets by";
             // 
@@ -185,9 +160,9 @@
             this.convertAudio.AutoSize = true;
             this.convertAudio.Checked = true;
             this.convertAudio.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.convertAudio.Location = new System.Drawing.Point(6, 150);
+            this.convertAudio.Location = new System.Drawing.Point(6, 138);
             this.convertAudio.Name = "convertAudio";
-            this.convertAudio.Size = new System.Drawing.Size(179, 17);
+            this.convertAudio.Size = new System.Drawing.Size(198, 16);
             this.convertAudio.TabIndex = 6;
             this.convertAudio.Text = "Convert AudioClip to WAV(PCM)";
             this.convertAudio.UseVisualStyleBackColor = true;
@@ -198,51 +173,51 @@
             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, 111);
+            this.panel1.Location = new System.Drawing.Point(20, 102);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(202, 33);
+            this.panel1.Size = new System.Drawing.Size(202, 30);
             this.panel1.TabIndex = 5;
             // 
             // totga
             // 
             this.totga.AutoSize = true;
-            this.totga.Location = new System.Drawing.Point(150, 7);
+            this.totga.Location = new System.Drawing.Point(150, 6);
             this.totga.Name = "totga";
-            this.totga.Size = new System.Drawing.Size(47, 17);
+            this.totga.Size = new System.Drawing.Size(41, 16);
             this.totga.TabIndex = 2;
-            this.totga.Text = "TGA";
+            this.totga.Text = "Tga";
             this.totga.UseVisualStyleBackColor = true;
             // 
             // tojpg
             // 
             this.tojpg.AutoSize = true;
-            this.tojpg.Location = new System.Drawing.Point(97, 7);
+            this.tojpg.Location = new System.Drawing.Point(97, 6);
             this.tojpg.Name = "tojpg";
-            this.tojpg.Size = new System.Drawing.Size(52, 17);
+            this.tojpg.Size = new System.Drawing.Size(47, 16);
             this.tojpg.TabIndex = 4;
-            this.tojpg.Text = "JPEG";
+            this.tojpg.Text = "Jpeg";
             this.tojpg.UseVisualStyleBackColor = true;
             // 
             // topng
             // 
             this.topng.AutoSize = true;
             this.topng.Checked = true;
-            this.topng.Location = new System.Drawing.Point(50, 7);
+            this.topng.Location = new System.Drawing.Point(50, 6);
             this.topng.Name = "topng";
-            this.topng.Size = new System.Drawing.Size(48, 17);
+            this.topng.Size = new System.Drawing.Size(41, 16);
             this.topng.TabIndex = 3;
             this.topng.TabStop = true;
-            this.topng.Text = "PNG";
+            this.topng.Text = "Png";
             this.topng.UseVisualStyleBackColor = true;
             // 
             // tobmp
             // 
             this.tobmp.AutoSize = true;
-            this.tobmp.Location = new System.Drawing.Point(3, 7);
+            this.tobmp.Location = new System.Drawing.Point(3, 6);
             this.tobmp.Name = "tobmp";
-            this.tobmp.Size = new System.Drawing.Size(48, 17);
+            this.tobmp.Size = new System.Drawing.Size(41, 16);
             this.tobmp.TabIndex = 2;
-            this.tobmp.Text = "BMP";
+            this.tobmp.Text = "Bmp";
             this.tobmp.UseVisualStyleBackColor = true;
             // 
             // converttexture
@@ -250,9 +225,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, 87);
+            this.converttexture.Location = new System.Drawing.Point(6, 80);
             this.converttexture.Name = "converttexture";
-            this.converttexture.Size = new System.Drawing.Size(116, 17);
+            this.converttexture.Size = new System.Drawing.Size(126, 16);
             this.converttexture.TabIndex = 1;
             this.converttexture.Text = "Convert Texture2D";
             this.converttexture.UseVisualStyleBackColor = true;
@@ -260,6 +235,7 @@
             // groupBox2
             // 
             this.groupBox2.AutoSize = true;
+            this.groupBox2.Controls.Add(this.exportAllUvsAsDiffuseMaps);
             this.groupBox2.Controls.Add(this.exportBlendShape);
             this.groupBox2.Controls.Add(this.exportAnimations);
             this.groupBox2.Controls.Add(this.scaleFactor);
@@ -276,21 +252,34 @@
             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(258, 13);
+            this.groupBox2.Location = new System.Drawing.Point(250, 12);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(206, 327);
+            this.groupBox2.Size = new System.Drawing.Size(224, 334);
             this.groupBox2.TabIndex = 11;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Fbx";
             // 
+            // exportAllUvsAsDiffuseMaps
+            // 
+            this.exportAllUvsAsDiffuseMaps.AccessibleDescription = "";
+            this.exportAllUvsAsDiffuseMaps.AutoSize = true;
+            this.exportAllUvsAsDiffuseMaps.Location = new System.Drawing.Point(6, 171);
+            this.exportAllUvsAsDiffuseMaps.Name = "exportAllUvsAsDiffuseMaps";
+            this.exportAllUvsAsDiffuseMaps.Size = new System.Drawing.Size(204, 16);
+            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 " +
+        "map.");
+            this.exportAllUvsAsDiffuseMaps.UseVisualStyleBackColor = true;
+            // 
             // exportBlendShape
             // 
             this.exportBlendShape.AutoSize = true;
             this.exportBlendShape.Checked = true;
             this.exportBlendShape.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.exportBlendShape.Location = new System.Drawing.Point(6, 138);
+            this.exportBlendShape.Location = new System.Drawing.Point(6, 127);
             this.exportBlendShape.Name = "exportBlendShape";
-            this.exportBlendShape.Size = new System.Drawing.Size(114, 17);
+            this.exportBlendShape.Size = new System.Drawing.Size(126, 16);
             this.exportBlendShape.TabIndex = 22;
             this.exportBlendShape.Text = "Export blendshape";
             this.exportBlendShape.UseVisualStyleBackColor = true;
@@ -300,9 +289,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, 114);
+            this.exportAnimations.Location = new System.Drawing.Point(6, 105);
             this.exportAnimations.Name = "exportAnimations";
-            this.exportAnimations.Size = new System.Drawing.Size(109, 17);
+            this.exportAnimations.Size = new System.Drawing.Size(126, 16);
             this.exportAnimations.TabIndex = 21;
             this.exportAnimations.Text = "Export animations";
             this.exportAnimations.UseVisualStyleBackColor = true;
@@ -315,9 +304,9 @@
             0,
             0,
             131072});
-            this.scaleFactor.Location = new System.Drawing.Point(83, 219);
+            this.scaleFactor.Location = new System.Drawing.Point(83, 224);
             this.scaleFactor.Name = "scaleFactor";
-            this.scaleFactor.Size = new System.Drawing.Size(60, 20);
+            this.scaleFactor.Size = new System.Drawing.Size(60, 21);
             this.scaleFactor.TabIndex = 20;
             this.scaleFactor.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.scaleFactor.Value = new decimal(new int[] {
@@ -329,9 +318,9 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(6, 221);
+            this.label5.Location = new System.Drawing.Point(6, 226);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(64, 13);
+            this.label5.Size = new System.Drawing.Size(71, 12);
             this.label5.TabIndex = 19;
             this.label5.Text = "ScaleFactor";
             // 
@@ -342,17 +331,17 @@
             this.fbxFormat.Items.AddRange(new object[] {
             "Binary",
             "Ascii"});
-            this.fbxFormat.Location = new System.Drawing.Point(77, 252);
+            this.fbxFormat.Location = new System.Drawing.Point(77, 254);
             this.fbxFormat.Name = "fbxFormat";
-            this.fbxFormat.Size = new System.Drawing.Size(61, 21);
+            this.fbxFormat.Size = new System.Drawing.Size(61, 20);
             this.fbxFormat.TabIndex = 18;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(6, 256);
+            this.label4.Location = new System.Drawing.Point(6, 258);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(59, 13);
+            this.label4.Size = new System.Drawing.Size(59, 12);
             this.label4.TabIndex = 17;
             this.label4.Text = "FBXFormat";
             // 
@@ -369,7 +358,7 @@
             "7.5"});
             this.fbxVersion.Location = new System.Drawing.Point(77, 284);
             this.fbxVersion.Name = "fbxVersion";
-            this.fbxVersion.Size = new System.Drawing.Size(47, 21);
+            this.fbxVersion.Size = new System.Drawing.Size(47, 20);
             this.fbxVersion.TabIndex = 16;
             // 
             // label3
@@ -377,15 +366,15 @@
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(6, 287);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(62, 13);
+            this.label3.Size = new System.Drawing.Size(65, 12);
             this.label3.TabIndex = 15;
             this.label3.Text = "FBXVersion";
             // 
             // boneSize
             // 
-            this.boneSize.Location = new System.Drawing.Point(65, 190);
+            this.boneSize.Location = new System.Drawing.Point(65, 197);
             this.boneSize.Name = "boneSize";
-            this.boneSize.Size = new System.Drawing.Size(46, 20);
+            this.boneSize.Size = new System.Drawing.Size(46, 21);
             this.boneSize.TabIndex = 11;
             this.boneSize.Value = new decimal(new int[] {
             10,
@@ -396,9 +385,9 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(6, 192);
+            this.label2.Location = new System.Drawing.Point(6, 199);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(52, 13);
+            this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 10;
             this.label2.Text = "BoneSize";
             // 
@@ -407,9 +396,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, 90);
+            this.exportSkins.Location = new System.Drawing.Point(6, 83);
             this.exportSkins.Name = "exportSkins";
-            this.exportSkins.Size = new System.Drawing.Size(83, 17);
+            this.exportSkins.Size = new System.Drawing.Size(96, 16);
             this.exportSkins.TabIndex = 8;
             this.exportSkins.Text = "Export skins";
             this.exportSkins.UseVisualStyleBackColor = true;
@@ -417,9 +406,9 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(26, 42);
+            this.label1.Location = new System.Drawing.Point(26, 39);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(72, 13);
+            this.label1.Size = new System.Drawing.Size(95, 12);
             this.label1.TabIndex = 7;
             this.label1.Text = "FilterPrecision";
             // 
@@ -431,9 +420,9 @@
             0,
             0,
             131072});
-            this.filterPrecision.Location = new System.Drawing.Point(127, 40);
+            this.filterPrecision.Location = new System.Drawing.Point(127, 37);
             this.filterPrecision.Name = "filterPrecision";
-            this.filterPrecision.Size = new System.Drawing.Size(51, 20);
+            this.filterPrecision.Size = new System.Drawing.Size(51, 21);
             this.filterPrecision.TabIndex = 6;
             this.filterPrecision.Value = new decimal(new int[] {
             25,
@@ -444,9 +433,9 @@
             // castToBone
             // 
             this.castToBone.AutoSize = true;
-            this.castToBone.Location = new System.Drawing.Point(6, 161);
+            this.castToBone.Location = new System.Drawing.Point(6, 149);
             this.castToBone.Name = "castToBone";
-            this.castToBone.Size = new System.Drawing.Size(131, 17);
+            this.castToBone.Size = new System.Drawing.Size(156, 16);
             this.castToBone.TabIndex = 5;
             this.castToBone.Text = "All nodes cast to bone";
             this.castToBone.UseVisualStyleBackColor = true;
@@ -456,9 +445,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, 66);
+            this.exportAllNodes.Location = new System.Drawing.Point(6, 61);
             this.exportAllNodes.Name = "exportAllNodes";
-            this.exportAllNodes.Size = new System.Drawing.Size(101, 17);
+            this.exportAllNodes.Size = new System.Drawing.Size(120, 16);
             this.exportAllNodes.TabIndex = 4;
             this.exportAllNodes.Text = "Export all nodes";
             this.exportAllNodes.UseVisualStyleBackColor = true;
@@ -468,9 +457,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, 22);
+            this.eulerFilter.Location = new System.Drawing.Point(6, 20);
             this.eulerFilter.Name = "eulerFilter";
-            this.eulerFilter.Size = new System.Drawing.Size(72, 17);
+            this.eulerFilter.Size = new System.Drawing.Size(90, 16);
             this.eulerFilter.TabIndex = 3;
             this.eulerFilter.Text = "EulerFilter";
             this.eulerFilter.UseVisualStyleBackColor = true;
@@ -478,10 +467,10 @@
             // ExportOptions
             // 
             this.AcceptButton = this.OKbutton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.Cancel;
-            this.ClientSize = new System.Drawing.Size(477, 380);
+            this.ClientSize = new System.Drawing.Size(486, 384);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.Cancel);
@@ -540,7 +529,7 @@
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.CheckBox restoreExtensionName;
         private System.Windows.Forms.CheckBox openAfterExport;
-        private System.Windows.Forms.CheckBox pathIDAsImageName;
+        private System.Windows.Forms.CheckBox exportAllUvsAsDiffuseMaps;
-        private System.Windows.Forms.CheckBox pathIDAsDumpName;
+        private System.Windows.Forms.ToolTip exportUvsTooltip;
     }
 }