update enum

2022-06-16 17:45:54 +08:00
parent ded2dcd54e
commit 2fe57a1c5d
16 changed files with 527 additions and 469 deletions
--- a/AssetStudio/AssetsManager.cs
+++ b/AssetStudio/AssetsManager.cs
@@ -156,7 +156,7 @@ namespace AssetStudio
                {
                    var assetsFile = new SerializedFile(reader, this);
                    assetsFile.originalPath = originalPath;
-                    if (!string.IsNullOrEmpty(unityVersion) && assetsFile.header.m_Version < SerializedFileFormatVersion.kUnknown_7)
+                    if (!string.IsNullOrEmpty(unityVersion) && assetsFile.header.m_Version < SerializedFileFormatVersion.Unknown_7)
                    {
                        assetsFile.SetVersion(unityVersion);
                    }
--- a/AssetStudio/BuildTarget.cs
+++ b/AssetStudio/BuildTarget.cs
@@ -8,7 +8,8 @@ namespace AssetStudio
    public enum BuildTarget
    {
        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,
@@ -48,6 +51,8 @@ namespace AssetStudio
        GameCoreXboxSeries,
        GameCoreXboxOne,
        PS5,
+        EmbeddedLinux,
+        QNX,
        UnknownPlatform = 9999
    }
 }
--- a/AssetStudio/BundleFile.cs
+++ b/AssetStudio/BundleFile.cs
@@ -1,9 +1,36 @@
 using K4os.Compression.LZ4;
+using System;
 using System.IO;
 using System.Linq;

 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
@@ -15,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
@@ -77,7 +104,6 @@ namespace AssetStudio

        private void ReadHeaderAndBlocksInfo(EndianBinaryReader reader)
        {
-            var isCompressed = m_Header.signature == "UnityWeb";
            if (m_Header.version >= 4)
            {
                var hash = reader.ReadBytes(16);
@@ -94,7 +120,6 @@ namespace AssetStudio
                {
                    compressedSize = reader.ReadUInt32(),
                    uncompressedSize = reader.ReadUInt32(),
-                    flags = (ushort)(isCompressed ? 1 : 0)
                };
                if (i == levelCount - 1)
                {
@@ -131,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))
                    {
@@ -194,7 +220,7 @@ namespace AssetStudio
            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();
@@ -208,28 +234,28 @@ namespace AssetStudio
            {
                reader.AlignStream(16);
            }
-            var start = reader.Position;
-            if ((m_Header.flags & 0x80) != 0) //kArchiveBlocksInfoAtTheEnd
+            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
            {
                blocksInfoBytes = reader.ReadBytes((int)m_Header.compressedBlocksInfoSize);
            }
            MemoryStream blocksInfoUncompresseddStream;
            var uncompressedSize = m_Header.uncompressedBlocksInfoSize;
-            switch (m_Header.flags & 0x3F) //kArchiveCompressionTypeMask
+            var compressionType = (CompressionType)(m_Header.flags & ArchiveFlags.CompressionTypeMask);
+            switch (compressionType)
            {
-                default: //None
+                case CompressionType.None:
                    {
                        blocksInfoUncompresseddStream = new MemoryStream(blocksInfoBytes);
                        break;
                    }
-                case 1: //LZMA
+                case CompressionType.Lzma:
                    {
                        blocksInfoUncompresseddStream = new MemoryStream((int)(uncompressedSize));
                        using (var blocksInfoCompressedStream = new MemoryStream(blocksInfoBytes))
@@ -239,8 +265,8 @@ namespace AssetStudio
                        blocksInfoUncompresseddStream.Position = 0;
                        break;
                    }
-                case 2: //LZ4
-                case 3: //LZ4HC
+                case CompressionType.Lz4:
+                case CompressionType.Lz4HC:
                    {
                        var uncompressedBytes = new byte[uncompressedSize];
                        var numWrite = LZ4Codec.Decode(blocksInfoBytes, uncompressedBytes);
@@ -251,6 +277,8 @@ namespace AssetStudio
                        blocksInfoUncompresseddStream = new MemoryStream(uncompressedBytes);
                        break;
                    }
+                default:
+                    throw new IOException($"Unsupported compression type {compressionType}");
            }
            using (var blocksInfoReader = new EndianBinaryReader(blocksInfoUncompresseddStream))
            {
@@ -263,7 +291,7 @@ namespace AssetStudio
                    {
                        uncompressedSize = blocksInfoReader.ReadUInt32(),
                        compressedSize = blocksInfoReader.ReadUInt32(),
-                        flags = blocksInfoReader.ReadUInt16()
+                        flags = (StorageBlockFlags)blocksInfoReader.ReadUInt16()
                    };
                }

@@ -280,30 +308,31 @@ namespace AssetStudio
                    };
                }
            }
-            //https://issuetracker.unity3d.com/issues/files-within-assetbundles-do-not-start-on-aligned-boundaries-breaking-patching-on-nintendo-switch
-            var blockSize = m_BlocksInfo.Sum(x => x.compressedSize);
-            var padding = reader.BaseStream.Length - start - m_Header.compressedBlocksInfoSize - blockSize;
-            reader.Position += padding;
+            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 3: //LZ4HC
+                    case CompressionType.Lz4:
+                    case CompressionType.Lz4HC:
                        {
                            var compressedSize = (int)blockInfo.compressedSize;
                            var compressedBytes = BigArrayPool<byte>.Shared.Rent(compressedSize);
@@ -320,6 +349,8 @@ namespace AssetStudio
                            BigArrayPool<byte>.Shared.Return(uncompressedBytes);
                            break;
                        }
+                    default:
+                        throw new IOException($"Unsupported compression type {compressionType}");
                }
            }
            blocksStream.Position = 0;
--- a/AssetStudio/Classes/AnimationClip.cs
+++ b/AssetStudio/Classes/AnimationClip.cs
@@ -909,9 +909,9 @@ namespace AssetStudio

    public enum AnimationType
    {
-        kLegacy = 1,
-        kGeneric = 2,
-        kHumanoid = 3
+        Legacy = 1,
+        Generic = 2,
+        Humanoid = 3
    };

    public sealed class AnimationClip : NamedObject
@@ -945,7 +945,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
--- a/AssetStudio/Classes/AudioClip.cs
+++ b/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;

@@ -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();
@@ -92,34 +92,51 @@ namespace AssetStudio
        }
    }

-    public enum AudioType
+    public enum FMODSoundType
    {
-        UNKNOWN,
-        ACC,
-        AIFF,
+        UNKNOWN = 0,
+        ACC = 1,
+        AIFF = 2,
+        ASF = 3,
+        AT3 = 4,
+        CDDA = 5,
+        DLS = 6,
+        FLAC = 7,
+        FSB = 8,
+        GCADPCM = 9,
        IT = 10,
+        MIDI = 11,
        MOD = 12,
-        MPEG,
-        OGGVORBIS,
+        MPEG = 13,
+        OGGVORBIS = 14,
+        PLAYLIST = 15,
+        RAW = 16,
        S3M = 17,
+        SF2 = 18,
+        USER = 19,
        WAV = 20,
-        XM,
-        XMA,
-        VAG,
-        AUDIOQUEUE
+        XM = 21,
+        XMA = 22,
+        VAG = 23,
+        AUDIOQUEUE = 24,
+        XWMA = 25,
+        BCWAV = 26,
+        AT9 = 27,
+        VORBIS = 28,
+        MEDIA_FOUNDATION = 29
    }

    public enum AudioCompressionFormat
    {
-        PCM,
-        Vorbis,
-        ADPCM,
-        MP3,
-        VAG,
-        HEVAG,
-        XMA,
-        AAC,
-        GCADPCM,
-        ATRAC9
+        PCM = 0,
+        Vorbis = 1,
+        ADPCM = 2,
+        MP3 = 3,
+        PSMVAG = 4,
+        HEVAG = 5,
+        XMA = 6,
+        AAC = 7,
+        GCADPCM = 8,
+        ATRAC9 = 9
    }
 }
--- a/AssetStudio/Classes/Mesh.cs
+++ b/AssetStudio/Classes/Mesh.cs
@@ -396,14 +396,14 @@ namespace AssetStudio
        }
    }

-    public enum GfxPrimitiveType : int
+    public enum GfxPrimitiveType
    {
-        kPrimitiveTriangles = 0,
-        kPrimitiveTriangleStrip = 1,
-        kPrimitiveQuads = 2,
-        kPrimitiveLines = 3,
-        kPrimitiveLineStrip = 4,
-        kPrimitivePoints = 5,
+        Triangles = 0,
+        TriangleStrip = 1,
+        Quads = 2,
+        Lines = 3,
+        LineStrip = 4,
+        Points = 5
    };

    public class SubMesh
@@ -1060,7 +1060,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)
                    {
@@ -1069,7 +1069,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;
@@ -1100,7 +1100,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)
                    {
@@ -1193,44 +1193,44 @@ namespace AssetStudio
    {
        public enum VertexChannelFormat
        {
-            kChannelFormatFloat,
-            kChannelFormatFloat16,
-            kChannelFormatColor,
-            kChannelFormatByte,
-            kChannelFormatUInt32
+            Float,
+            Float16,
+            Color,
+            Byte,
+            UInt32
        }

        public enum VertexFormat2017
        {
-            kVertexFormatFloat,
-            kVertexFormatFloat16,
-            kVertexFormatColor,
-            kVertexFormatUNorm8,
-            kVertexFormatSNorm8,
-            kVertexFormatUNorm16,
-            kVertexFormatSNorm16,
-            kVertexFormatUInt8,
-            kVertexFormatSInt8,
-            kVertexFormatUInt16,
-            kVertexFormatSInt16,
-            kVertexFormatUInt32,
-            kVertexFormatSInt32
+            Float,
+            Float16,
+            Color,
+            UNorm8,
+            SNorm8,
+            UNorm16,
+            SNorm16,
+            UInt8,
+            SInt8,
+            UInt16,
+            SInt16,
+            UInt32,
+            SInt32
        }

        public enum VertexFormat
        {
-            kVertexFormatFloat,
-            kVertexFormatFloat16,
-            kVertexFormatUNorm8,
-            kVertexFormatSNorm8,
-            kVertexFormatUNorm16,
-            kVertexFormatSNorm16,
-            kVertexFormatUInt8,
-            kVertexFormatSInt8,
-            kVertexFormatUInt16,
-            kVertexFormatSInt16,
-            kVertexFormatUInt32,
-            kVertexFormatSInt32
+            Float,
+            Float16,
+            UNorm8,
+            SNorm8,
+            UNorm16,
+            SNorm16,
+            UInt8,
+            SInt8,
+            UInt16,
+            SInt16,
+            UInt32,
+            SInt32
        }

        public static VertexFormat ToVertexFormat(int format, int[] version)
@@ -1239,16 +1239,16 @@ namespace AssetStudio
            {
                switch ((VertexChannelFormat)format)
                {
-                    case VertexChannelFormat.kChannelFormatFloat:
-                        return VertexFormat.kVertexFormatFloat;
-                    case VertexChannelFormat.kChannelFormatFloat16:
-                        return VertexFormat.kVertexFormatFloat16;
-                    case VertexChannelFormat.kChannelFormatColor: //in 4.x is size 4
-                        return VertexFormat.kVertexFormatUNorm8;
-                    case VertexChannelFormat.kChannelFormatByte:
-                        return VertexFormat.kVertexFormatUInt8;
-                    case VertexChannelFormat.kChannelFormatUInt32: //in 5.x
-                        return VertexFormat.kVertexFormatUInt32;
+                    case VertexChannelFormat.Float:
+                        return VertexFormat.Float;
+                    case VertexChannelFormat.Float16:
+                        return VertexFormat.Float16;
+                    case VertexChannelFormat.Color: //in 4.x is size 4
+                        return VertexFormat.UNorm8;
+                    case VertexChannelFormat.Byte:
+                        return VertexFormat.UInt8;
+                    case VertexChannelFormat.UInt32: //in 5.x
+                        return VertexFormat.UInt32;
                    default:
                        throw new ArgumentOutOfRangeException(nameof(format), format, null);
                }
@@ -1257,31 +1257,31 @@ namespace AssetStudio
            {
                switch ((VertexFormat2017)format)
                {
-                    case VertexFormat2017.kVertexFormatFloat:
-                        return VertexFormat.kVertexFormatFloat;
-                    case VertexFormat2017.kVertexFormatFloat16:
-                        return VertexFormat.kVertexFormatFloat16;
-                    case VertexFormat2017.kVertexFormatColor:
-                    case VertexFormat2017.kVertexFormatUNorm8:
-                        return VertexFormat.kVertexFormatUNorm8;
-                    case VertexFormat2017.kVertexFormatSNorm8:
-                        return VertexFormat.kVertexFormatSNorm8;
-                    case VertexFormat2017.kVertexFormatUNorm16:
-                        return VertexFormat.kVertexFormatUNorm16;
-                    case VertexFormat2017.kVertexFormatSNorm16:
-                        return VertexFormat.kVertexFormatSNorm16;
-                    case VertexFormat2017.kVertexFormatUInt8:
-                        return VertexFormat.kVertexFormatUInt8;
-                    case VertexFormat2017.kVertexFormatSInt8:
-                        return VertexFormat.kVertexFormatSInt8;
-                    case VertexFormat2017.kVertexFormatUInt16:
-                        return VertexFormat.kVertexFormatUInt16;
-                    case VertexFormat2017.kVertexFormatSInt16:
-                        return VertexFormat.kVertexFormatSInt16;
-                    case VertexFormat2017.kVertexFormatUInt32:
-                        return VertexFormat.kVertexFormatUInt32;
-                    case VertexFormat2017.kVertexFormatSInt32:
-                        return VertexFormat.kVertexFormatSInt32;
+                    case VertexFormat2017.Float:
+                        return VertexFormat.Float;
+                    case VertexFormat2017.Float16:
+                        return VertexFormat.Float16;
+                    case VertexFormat2017.Color:
+                    case VertexFormat2017.UNorm8:
+                        return VertexFormat.UNorm8;
+                    case VertexFormat2017.SNorm8:
+                        return VertexFormat.SNorm8;
+                    case VertexFormat2017.UNorm16:
+                        return VertexFormat.UNorm16;
+                    case VertexFormat2017.SNorm16:
+                        return VertexFormat.SNorm16;
+                    case VertexFormat2017.UInt8:
+                        return VertexFormat.UInt8;
+                    case VertexFormat2017.SInt8:
+                        return VertexFormat.SInt8;
+                    case VertexFormat2017.UInt16:
+                        return VertexFormat.UInt16;
+                    case VertexFormat2017.SInt16:
+                        return VertexFormat.SInt16;
+                    case VertexFormat2017.UInt32:
+                        return VertexFormat.UInt32;
+                    case VertexFormat2017.SInt32:
+                        return VertexFormat.SInt32;
                    default:
                        throw new ArgumentOutOfRangeException(nameof(format), format, null);
                }
@@ -1297,20 +1297,20 @@ namespace AssetStudio
        {
            switch (format)
            {
-                case VertexFormat.kVertexFormatFloat:
-                case VertexFormat.kVertexFormatUInt32:
-                case VertexFormat.kVertexFormatSInt32:
+                case VertexFormat.Float:
+                case VertexFormat.UInt32:
+                case VertexFormat.SInt32:
                    return 4u;
-                case VertexFormat.kVertexFormatFloat16:
-                case VertexFormat.kVertexFormatUNorm16:
-                case VertexFormat.kVertexFormatSNorm16:
-                case VertexFormat.kVertexFormatUInt16:
-                case VertexFormat.kVertexFormatSInt16:
+                case VertexFormat.Float16:
+                case VertexFormat.UNorm16:
+                case VertexFormat.SNorm16:
+                case VertexFormat.UInt16:
+                case VertexFormat.SInt16:
                    return 2u;
-                case VertexFormat.kVertexFormatUNorm8:
-                case VertexFormat.kVertexFormatSNorm8:
-                case VertexFormat.kVertexFormatUInt8:
-                case VertexFormat.kVertexFormatSInt8:
+                case VertexFormat.UNorm8:
+                case VertexFormat.SNorm8:
+                case VertexFormat.UInt8:
+                case VertexFormat.SInt8:
                    return 1u;
                default:
                    throw new ArgumentOutOfRangeException(nameof(format), format, null);
@@ -1319,7 +1319,7 @@ namespace AssetStudio

        public static bool IsIntFormat(VertexFormat format)
        {
-            return format >= VertexFormat.kVertexFormatUInt8;
+            return format >= VertexFormat.UInt8;
        }

        public static float[] BytesToFloatArray(byte[] inputBytes, VertexFormat format)
@@ -1331,22 +1331,22 @@ namespace AssetStudio
            {
                switch (format)
                {
-                    case VertexFormat.kVertexFormatFloat:
+                    case VertexFormat.Float:
                        result[i] = BitConverter.ToSingle(inputBytes, i * 4);
                        break;
-                    case VertexFormat.kVertexFormatFloat16:
+                    case VertexFormat.Float16:
                        result[i] = Half.ToHalf(inputBytes, i * 2);
                        break;
-                    case VertexFormat.kVertexFormatUNorm8:
+                    case VertexFormat.UNorm8:
                        result[i] = inputBytes[i] / 255f;
                        break;
-                    case VertexFormat.kVertexFormatSNorm8:
+                    case VertexFormat.SNorm8:
                        result[i] = Math.Max((sbyte)inputBytes[i] / 127f, -1f);
                        break;
-                    case VertexFormat.kVertexFormatUNorm16:
+                    case VertexFormat.UNorm16:
                        result[i] = BitConverter.ToUInt16(inputBytes, i * 2) / 65535f;
                        break;
-                    case VertexFormat.kVertexFormatSNorm16:
+                    case VertexFormat.SNorm16:
                        result[i] = Math.Max(BitConverter.ToInt16(inputBytes, i * 2) / 32767f, -1f);
                        break;
                }
@@ -1363,16 +1363,16 @@ namespace AssetStudio
            {
                switch (format)
                {
-                    case VertexFormat.kVertexFormatUInt8:
-                    case VertexFormat.kVertexFormatSInt8:
+                    case VertexFormat.UInt8:
+                    case VertexFormat.SInt8:
                        result[i] = inputBytes[i];
                        break;
-                    case VertexFormat.kVertexFormatUInt16:
-                    case VertexFormat.kVertexFormatSInt16:
+                    case VertexFormat.UInt16:
+                    case VertexFormat.SInt16:
                        result[i] = BitConverter.ToInt16(inputBytes, i * 2);
                        break;
-                    case VertexFormat.kVertexFormatUInt32:
-                    case VertexFormat.kVertexFormatSInt32:
+                    case VertexFormat.UInt32:
+                    case VertexFormat.SInt32:
                        result[i] = BitConverter.ToInt32(inputBytes, i * 4);
                        break;
                }
--- a/AssetStudio/Classes/PPtr.cs
+++ b/AssetStudio/Classes/PPtr.cs
@@ -13,7 +13,7 @@ namespace AssetStudio
        public PPtr(ObjectReader reader)
        {
            m_FileID = reader.ReadInt32();
-            m_PathID = reader.m_Version < SerializedFileFormatVersion.kUnknown_14 ? reader.ReadInt32() : reader.ReadInt64();
+            m_PathID = reader.m_Version < SerializedFileFormatVersion.Unknown_14 ? reader.ReadInt32() : reader.ReadInt64();
            assetsFile = reader.assetsFile;
        }

--- a/AssetStudio/Classes/Shader.cs
+++ b/AssetStudio/Classes/Shader.cs
@@ -56,15 +56,14 @@ namespace AssetStudio
    }
    public enum TextureDimension
    {
-        kTexDimUnknown = -1,
-        kTexDimNone = 0,
-        kTexDimAny = 1,
-        kTexDim2D = 2,
-        kTexDim3D = 3,
-        kTexDimCUBE = 4,
-        kTexDim2DArray = 5,
-        kTexDimCubeArray = 6,
-        kTexDimForce32Bit = 2147483647
+        Unknown = -1,
+        None = 0,
+        Any = 1,
+        Tex2D = 2,
+        Tex3D = 3,
+        Cube = 4,
+        Tex2DArray = 5,
+        CubeArray = 6
    };

    public class SerializedTextureProperty
@@ -81,11 +80,12 @@ namespace AssetStudio

    public enum SerializedPropertyType
    {
-        kColor = 0,
-        kVector = 1,
-        kFloat = 2,
-        kRange = 3,
-        kTexture = 4
+        Color = 0,
+        Vector = 1,
+        Float = 2,
+        Range = 3,
+        Texture = 4,
+        Int = 5
    };

    public class SerializedProperty
@@ -195,11 +195,11 @@ namespace AssetStudio

    public enum FogMode
    {
-        kFogUnknown = -1,
-        kFogDisabled = 0,
-        kFogLinear = 1,
-        kFogExp = 2,
-        kFogExp2 = 3
+        Unknown = -1,
+        Disabled = 0,
+        Linear = 1,
+        Exp = 2,
+        Exp2 = 3
    };

    public class SerializedShaderState
@@ -453,38 +453,39 @@ namespace AssetStudio

    public enum ShaderGpuProgramType
    {
-        kShaderGpuProgramUnknown = 0,
-        kShaderGpuProgramGLLegacy = 1,
-        kShaderGpuProgramGLES31AEP = 2,
-        kShaderGpuProgramGLES31 = 3,
-        kShaderGpuProgramGLES3 = 4,
-        kShaderGpuProgramGLES = 5,
-        kShaderGpuProgramGLCore32 = 6,
-        kShaderGpuProgramGLCore41 = 7,
-        kShaderGpuProgramGLCore43 = 8,
-        kShaderGpuProgramDX9VertexSM20 = 9,
-        kShaderGpuProgramDX9VertexSM30 = 10,
-        kShaderGpuProgramDX9PixelSM20 = 11,
-        kShaderGpuProgramDX9PixelSM30 = 12,
-        kShaderGpuProgramDX10Level9Vertex = 13,
-        kShaderGpuProgramDX10Level9Pixel = 14,
-        kShaderGpuProgramDX11VertexSM40 = 15,
-        kShaderGpuProgramDX11VertexSM50 = 16,
-        kShaderGpuProgramDX11PixelSM40 = 17,
-        kShaderGpuProgramDX11PixelSM50 = 18,
-        kShaderGpuProgramDX11GeometrySM40 = 19,
-        kShaderGpuProgramDX11GeometrySM50 = 20,
-        kShaderGpuProgramDX11HullSM50 = 21,
-        kShaderGpuProgramDX11DomainSM50 = 22,
-        kShaderGpuProgramMetalVS = 23,
-        kShaderGpuProgramMetalFS = 24,
-        kShaderGpuProgramSPIRV = 25,
-        kShaderGpuProgramConsoleVS = 26,
-        kShaderGpuProgramConsoleFS = 27,
-        kShaderGpuProgramConsoleHS = 28,
-        kShaderGpuProgramConsoleDS = 29,
-        kShaderGpuProgramConsoleGS = 30,
-        kShaderGpuProgramRayTracing = 31,
+        Unknown = 0,
+        GLLegacy = 1,
+        GLES31AEP = 2,
+        GLES31 = 3,
+        GLES3 = 4,
+        GLES = 5,
+        GLCore32 = 6,
+        GLCore41 = 7,
+        GLCore43 = 8,
+        DX9VertexSM20 = 9,
+        DX9VertexSM30 = 10,
+        DX9PixelSM20 = 11,
+        DX9PixelSM30 = 12,
+        DX10Level9Vertex = 13,
+        DX10Level9Pixel = 14,
+        DX11VertexSM40 = 15,
+        DX11VertexSM50 = 16,
+        DX11PixelSM40 = 17,
+        DX11PixelSM50 = 18,
+        DX11GeometrySM40 = 19,
+        DX11GeometrySM50 = 20,
+        DX11HullSM50 = 21,
+        DX11DomainSM50 = 22,
+        MetalVS = 23,
+        MetalFS = 24,
+        SPIRV = 25,
+        ConsoleVS = 26,
+        ConsoleFS = 27,
+        ConsoleHS = 28,
+        ConsoleDS = 29,
+        ConsoleGS = 30,
+        RayTracing = 31,
+        PS5NGGC = 32
    };

    public class SerializedProgramParameters
@@ -713,9 +714,9 @@ namespace AssetStudio

    public enum PassType
    {
-        kPassTypeNormal = 0,
-        kPassTypeUse = 1,
-        kPassTypeGrab = 2
+        Normal = 0,
+        Use = 1,
+        Grab = 2
    };

    public class SerializedPass
@@ -922,32 +923,32 @@ namespace AssetStudio

    public enum ShaderCompilerPlatform
    {
-        kShaderCompPlatformNone = -1,
-        kShaderCompPlatformGL = 0,
-        kShaderCompPlatformD3D9 = 1,
-        kShaderCompPlatformXbox360 = 2,
-        kShaderCompPlatformPS3 = 3,
-        kShaderCompPlatformD3D11 = 4,
-        kShaderCompPlatformGLES20 = 5,
-        kShaderCompPlatformNaCl = 6,
-        kShaderCompPlatformFlash = 7,
-        kShaderCompPlatformD3D11_9x = 8,
-        kShaderCompPlatformGLES3Plus = 9,
-        kShaderCompPlatformPSP2 = 10,
-        kShaderCompPlatformPS4 = 11,
-        kShaderCompPlatformXboxOne = 12,
-        kShaderCompPlatformPSM = 13,
-        kShaderCompPlatformMetal = 14,
-        kShaderCompPlatformOpenGLCore = 15,
-        kShaderCompPlatformN3DS = 16,
-        kShaderCompPlatformWiiU = 17,
-        kShaderCompPlatformVulkan = 18,
-        kShaderCompPlatformSwitch = 19,
-        kShaderCompPlatformXboxOneD3D12 = 20,
-        kShaderCompPlatformGameCoreXboxOne = 21,
-        kShaderCompPlatformGameCoreScarlett = 22,
-        kShaderCompPlatformPS5 = 23,
-        kShaderCompPlatformPS5NGGC = 24,
+        None = -1,
+        GL = 0,
+        D3D9 = 1,
+        Xbox360 = 2,
+        PS3 = 3,
+        D3D11 = 4,
+        GLES20 = 5,
+        NaCl = 6,
+        Flash = 7,
+        D3D11_9x = 8,
+        GLES3Plus = 9,
+        PSP2 = 10,
+        PS4 = 11,
+        XboxOne = 12,
+        PSM = 13,
+        Metal = 14,
+        OpenGLCore = 15,
+        N3DS = 16,
+        WiiU = 17,
+        Vulkan = 18,
+        Switch = 19,
+        XboxOneD3D12 = 20,
+        GameCoreXboxOne = 21,
+        GameCoreScarlett = 22,
+        PS5 = 23,
+        PS5NGGC = 24
    };

    public class Shader : NamedObject
--- a/AssetStudio/Classes/Sprite.cs
+++ b/AssetStudio/Classes/Sprite.cs
@@ -18,23 +18,23 @@ namespace AssetStudio

    public enum SpritePackingRotation
    {
-        kSPRNone = 0,
-        kSPRFlipHorizontal = 1,
-        kSPRFlipVertical = 2,
-        kSPRRotate180 = 3,
-        kSPRRotate90 = 4
+        None = 0,
+        FlipHorizontal = 1,
+        FlipVertical = 2,
+        Rotate180 = 3,
+        Rotate90 = 4
    };

    public enum SpritePackingMode
    {
-        kSPMTight = 0,
-        kSPMRectangle
+        Tight = 0,
+        Rectangle
    };

    public enum SpriteMeshType
    {
-        kSpriteMeshTypeFullRect,
-        kSpriteMeshTypeTight
+        FullRect,
+        Tight
    };

    public class SpriteSettings
--- a/AssetStudio/Classes/Texture2D.cs
+++ b/AssetStudio/Classes/Texture2D.cs
@@ -151,8 +151,10 @@ namespace AssetStudio
        RGB24,
        RGBA32,
        ARGB32,
-        RGB565 = 7,
-        R16 = 9,
+        ARGBFloat,
+        RGB565,
+        BGR24,
+        R16,
        DXT1,
        DXT3,
        DXT5,
@@ -166,7 +168,8 @@ namespace AssetStudio
        RGBAFloat,
        YUY2,
        RGB9e5Float,
-        BC6H = 24,
+        RGBFloat,
+        BC6H,
        BC7,
        BC4,
        BC5,
--- a/AssetStudio/SerializedFile.cs
+++ b/AssetStudio/SerializedFile.cs
@@ -45,7 +45,7 @@ namespace AssetStudio
            header.m_Version = (SerializedFileFormatVersion)reader.ReadUInt32();
            header.m_DataOffset = reader.ReadUInt32();

-            if (header.m_Version >= SerializedFileFormatVersion.kUnknown_9)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_9)
            {
                header.m_Endianess = reader.ReadByte();
                header.m_Reserved = reader.ReadBytes(3);
@@ -57,7 +57,7 @@ namespace AssetStudio
                m_FileEndianess = reader.ReadByte();
            }

-            if (header.m_Version >= SerializedFileFormatVersion.kLargeFilesSupport)
+            if (header.m_Version >= SerializedFileFormatVersion.LargeFilesSupport)
            {
                header.m_MetadataSize = reader.ReadUInt32();
                header.m_FileSize = reader.ReadInt64();
@@ -70,12 +70,12 @@ namespace AssetStudio
            {
                reader.Endian = EndianType.LittleEndian;
            }
-            if (header.m_Version >= SerializedFileFormatVersion.kUnknown_7)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_7)
            {
                unityVersion = reader.ReadStringToNull();
                SetVersion(unityVersion);
            }
-            if (header.m_Version >= SerializedFileFormatVersion.kUnknown_8)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_8)
            {
                m_TargetPlatform = (BuildTarget)reader.ReadInt32();
                if (!Enum.IsDefined(typeof(BuildTarget), m_TargetPlatform))
@@ -83,7 +83,7 @@ namespace AssetStudio
                    m_TargetPlatform = BuildTarget.UnknownPlatform;
                }
            }
-            if (header.m_Version >= SerializedFileFormatVersion.kHasTypeTreeHashes)
+            if (header.m_Version >= SerializedFileFormatVersion.HasTypeTreeHashes)
            {
                m_EnableTypeTree = reader.ReadBoolean();
            }
@@ -96,7 +96,7 @@ namespace AssetStudio
                m_Types.Add(ReadSerializedType(false));
            }

-            if (header.m_Version >= SerializedFileFormatVersion.kUnknown_7 && header.m_Version < SerializedFileFormatVersion.kUnknown_14)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_7 && header.m_Version < SerializedFileFormatVersion.Unknown_14)
            {
                bigIDEnabled = reader.ReadInt32();
            }
@@ -113,7 +113,7 @@ namespace AssetStudio
                {
                    objectInfo.m_PathID = reader.ReadInt64();
                }
-                else if (header.m_Version < SerializedFileFormatVersion.kUnknown_14)
+                else if (header.m_Version < SerializedFileFormatVersion.Unknown_14)
                {
                    objectInfo.m_PathID = reader.ReadInt32();
                }
@@ -123,7 +123,7 @@ namespace AssetStudio
                    objectInfo.m_PathID = reader.ReadInt64();
                }

-                if (header.m_Version >= SerializedFileFormatVersion.kLargeFilesSupport)
+                if (header.m_Version >= SerializedFileFormatVersion.LargeFilesSupport)
                    objectInfo.byteStart = reader.ReadInt64();
                else
                    objectInfo.byteStart = reader.ReadUInt32();
@@ -131,7 +131,7 @@ namespace AssetStudio
                objectInfo.byteStart += header.m_DataOffset;
                objectInfo.byteSize = reader.ReadUInt32();
                objectInfo.typeID = reader.ReadInt32();
-                if (header.m_Version < SerializedFileFormatVersion.kRefactoredClassId)
+                if (header.m_Version < SerializedFileFormatVersion.RefactoredClassId)
                {
                    objectInfo.classID = reader.ReadUInt16();
                    objectInfo.serializedType = m_Types.Find(x => x.classID == objectInfo.typeID);
@@ -142,24 +142,24 @@ namespace AssetStudio
                    objectInfo.serializedType = type;
                    objectInfo.classID = type.classID;
                }
-                if (header.m_Version < SerializedFileFormatVersion.kHasScriptTypeIndex)
+                if (header.m_Version < SerializedFileFormatVersion.HasScriptTypeIndex)
                {
                    objectInfo.isDestroyed = reader.ReadUInt16();
                }
-                if (header.m_Version >= SerializedFileFormatVersion.kHasScriptTypeIndex && header.m_Version < SerializedFileFormatVersion.kRefactorTypeData)
+                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 == SerializedFileFormatVersion.kSupportsStrippedObject || header.m_Version == SerializedFileFormatVersion.kRefactoredClassId)
+                if (header.m_Version == SerializedFileFormatVersion.SupportsStrippedObject || header.m_Version == SerializedFileFormatVersion.RefactoredClassId)
                {
                    objectInfo.stripped = reader.ReadByte();
                }
                m_Objects.Add(objectInfo);
            }

-            if (header.m_Version >= SerializedFileFormatVersion.kHasScriptTypeIndex)
+            if (header.m_Version >= SerializedFileFormatVersion.HasScriptTypeIndex)
            {
                int scriptCount = reader.ReadInt32();
                m_ScriptTypes = new List<LocalSerializedObjectIdentifier>(scriptCount);
@@ -167,7 +167,7 @@ namespace AssetStudio
                {
                    var m_ScriptType = new LocalSerializedObjectIdentifier();
                    m_ScriptType.localSerializedFileIndex = reader.ReadInt32();
-                    if (header.m_Version < SerializedFileFormatVersion.kUnknown_14)
+                    if (header.m_Version < SerializedFileFormatVersion.Unknown_14)
                    {
                        m_ScriptType.localIdentifierInFile = reader.ReadInt32();
                    }
@@ -185,11 +185,11 @@ namespace AssetStudio
            for (int i = 0; i < externalsCount; i++)
            {
                var m_External = new FileIdentifier();
-                if (header.m_Version >= SerializedFileFormatVersion.kUnknown_6)
+                if (header.m_Version >= SerializedFileFormatVersion.Unknown_6)
                {
                    var tempEmpty = reader.ReadStringToNull();
                }
-                if (header.m_Version >= SerializedFileFormatVersion.kUnknown_5)
+                if (header.m_Version >= SerializedFileFormatVersion.Unknown_5)
                {
                    m_External.guid = new Guid(reader.ReadBytes(16));
                    m_External.type = reader.ReadInt32();
@@ -199,7 +199,7 @@ namespace AssetStudio
                m_Externals.Add(m_External);
            }

-            if (header.m_Version >= SerializedFileFormatVersion.kSupportsRefObject)
+            if (header.m_Version >= SerializedFileFormatVersion.SupportsRefObject)
            {
                int refTypesCount = reader.ReadInt32();
                m_RefTypes = new List<SerializedType>(refTypesCount);
@@ -209,7 +209,7 @@ namespace AssetStudio
                }
            }

-            if (header.m_Version >= SerializedFileFormatVersion.kUnknown_5)
+            if (header.m_Version >= SerializedFileFormatVersion.Unknown_5)
            {
                userInformation = reader.ReadStringToNull();
            }
@@ -235,23 +235,23 @@ namespace AssetStudio

            type.classID = reader.ReadInt32();

-            if (header.m_Version >= SerializedFileFormatVersion.kRefactoredClassId)
+            if (header.m_Version >= SerializedFileFormatVersion.RefactoredClassId)
            {
                type.m_IsStrippedType = reader.ReadBoolean();
            }

-            if (header.m_Version >= SerializedFileFormatVersion.kRefactorTypeData)
+            if (header.m_Version >= SerializedFileFormatVersion.RefactorTypeData)
            {
                type.m_ScriptTypeIndex = reader.ReadInt16();
            }

-            if (header.m_Version >= SerializedFileFormatVersion.kHasTypeTreeHashes)
+            if (header.m_Version >= SerializedFileFormatVersion.HasTypeTreeHashes)
            {
                if (isRefType && type.m_ScriptTypeIndex >= 0)
                {
                    type.m_ScriptID = reader.ReadBytes(16);
                }
-                else if ((header.m_Version < SerializedFileFormatVersion.kRefactoredClassId && type.classID < 0) || (header.m_Version >= SerializedFileFormatVersion.kRefactoredClassId && type.classID == 114))
+                else if ((header.m_Version < SerializedFileFormatVersion.RefactoredClassId && type.classID < 0) || (header.m_Version >= SerializedFileFormatVersion.RefactoredClassId && type.classID == 114))
                {
                    type.m_ScriptID = reader.ReadBytes(16);
                }
@@ -262,7 +262,7 @@ namespace AssetStudio
            {
                type.m_Type = new TypeTree();
                type.m_Type.m_Nodes = new List<TypeTreeNode>();
-                if (header.m_Version >= SerializedFileFormatVersion.kUnknown_12 || header.m_Version == SerializedFileFormatVersion.kUnknown_10)
+                if (header.m_Version >= SerializedFileFormatVersion.Unknown_12 || header.m_Version == SerializedFileFormatVersion.Unknown_10)
                {
                    TypeTreeBlobRead(type.m_Type);
                }
@@ -270,7 +270,7 @@ namespace AssetStudio
                {
                    ReadTypeTree(type.m_Type);
                }
-                if (header.m_Version >= SerializedFileFormatVersion.kStoresTypeDependencies)
+                if (header.m_Version >= SerializedFileFormatVersion.StoresTypeDependencies)
                {
                    if (isRefType)
                    {
@@ -296,17 +296,17 @@ namespace AssetStudio
            typeTreeNode.m_Type = reader.ReadStringToNull();
            typeTreeNode.m_Name = reader.ReadStringToNull();
            typeTreeNode.m_ByteSize = reader.ReadInt32();
-            if (header.m_Version == SerializedFileFormatVersion.kUnknown_2)
+            if (header.m_Version == SerializedFileFormatVersion.Unknown_2)
            {
                var variableCount = reader.ReadInt32();
            }
-            if (header.m_Version != SerializedFileFormatVersion.kUnknown_3)
+            if (header.m_Version != SerializedFileFormatVersion.Unknown_3)
            {
                typeTreeNode.m_Index = reader.ReadInt32();
            }
            typeTreeNode.m_TypeFlags = reader.ReadInt32();
            typeTreeNode.m_Version = reader.ReadInt32();
-            if (header.m_Version != SerializedFileFormatVersion.kUnknown_3)
+            if (header.m_Version != SerializedFileFormatVersion.Unknown_3)
            {
                typeTreeNode.m_MetaFlag = reader.ReadInt32();
            }
@@ -334,7 +334,7 @@ namespace AssetStudio
                typeTreeNode.m_ByteSize = reader.ReadInt32();
                typeTreeNode.m_Index = reader.ReadInt32();
                typeTreeNode.m_MetaFlag = reader.ReadInt32();
-                if (header.m_Version >= SerializedFileFormatVersion.kTypeTreeNodeWithTypeFlags)
+                if (header.m_Version >= SerializedFileFormatVersion.TypeTreeNodeWithTypeFlags)
                {
                    typeTreeNode.m_RefTypeHash = reader.ReadUInt64();
                }
--- a/AssetStudio/SerializedFileFormatVersion.cs
+++ b/AssetStudio/SerializedFileFormatVersion.cs
@@ -8,80 +8,80 @@ namespace AssetStudio
 {
    public enum SerializedFileFormatVersion
    {
-        kUnsupported = 1,
-        kUnknown_2 = 2,
-        kUnknown_3 = 3,
+        Unsupported = 1,
+        Unknown_2 = 2,
+        Unknown_3 = 3,
        /// <summary>
        /// 1.2.0 to 2.0.0
        /// </summary>
-        kUnknown_5 = 5,
+        Unknown_5 = 5,
        /// <summary>
        /// 2.1.0 to 2.6.1
        /// </summary>
-        kUnknown_6 = 6,
+        Unknown_6 = 6,
        /// <summary>
        /// 3.0.0b
        /// </summary>
-        kUnknown_7 = 7,
+        Unknown_7 = 7,
        /// <summary>
        /// 3.0.0 to 3.4.2
        /// </summary>
-        kUnknown_8 = 8,
+        Unknown_8 = 8,
        /// <summary>
        /// 3.5.0 to 4.7.2
        /// </summary>
-        kUnknown_9 = 9,
+        Unknown_9 = 9,
        /// <summary>
        /// 5.0.0aunk1
        /// </summary>
-        kUnknown_10 = 10,
+        Unknown_10 = 10,
        /// <summary>
        /// 5.0.0aunk2
        /// </summary>
-        kHasScriptTypeIndex = 11,
+        HasScriptTypeIndex = 11,
        /// <summary>
        /// 5.0.0aunk3
        /// </summary>
-        kUnknown_12 = 12,
+        Unknown_12 = 12,
        /// <summary>
        /// 5.0.0aunk4
        /// </summary>
-        kHasTypeTreeHashes = 13,
+        HasTypeTreeHashes = 13,
        /// <summary>
        /// 5.0.0unk
        /// </summary>
-        kUnknown_14 = 14,
+        Unknown_14 = 14,
        /// <summary>
        /// 5.0.1 to 5.4.0
        /// </summary>
-        kSupportsStrippedObject = 15,
+        SupportsStrippedObject = 15,
        /// <summary>
        /// 5.5.0a
        /// </summary>
-        kRefactoredClassId = 16,
+        RefactoredClassId = 16,
        /// <summary>
        /// 5.5.0unk to 2018.4
        /// </summary>
-        kRefactorTypeData = 17,
+        RefactorTypeData = 17,
        /// <summary>
        /// 2019.1a
        /// </summary>
-        kRefactorShareableTypeTreeData = 18,
+        RefactorShareableTypeTreeData = 18,
        /// <summary>
        /// 2019.1unk
        /// </summary>
-        kTypeTreeNodeWithTypeFlags = 19,
+        TypeTreeNodeWithTypeFlags = 19,
        /// <summary>
        /// 2019.2
        /// </summary>
-        kSupportsRefObject = 20,
+        SupportsRefObject = 20,
        /// <summary>
        /// 2019.3 to 2019.4
        /// </summary>
-        kStoresTypeDependencies = 21,
+        StoresTypeDependencies = 21,
        /// <summary>
        /// 2020.1 to x
        /// </summary>
-        kLargeFilesSupport = 22
+        LargeFilesSupport = 22
    }
 }