diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 48447849..3c02dcb6 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 6353da97..366eada0 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 40b690e9..69152cf6 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/FileFormats/GFBMDL/GFBMDL.cs b/Switch_FileFormatsMain/FileFormats/GFBMDL/GFBMDL.cs index 73168cf4..133e421c 100644 --- a/Switch_FileFormatsMain/FileFormats/GFBMDL/GFBMDL.cs +++ b/Switch_FileFormatsMain/FileFormats/GFBMDL/GFBMDL.cs @@ -147,6 +147,7 @@ namespace FirstPlugin public uint Version { get; set; } public float[] Boundings { get; set; } + public List ShaderNames = new List(); public List TextureMaps = new List(); public List MaterialNames = new List(); public List VertexBuffers = new List(); @@ -166,9 +167,9 @@ namespace FirstPlugin Version = reader.ReadUInt32(); Boundings = reader.ReadSingles(9); long TextureOffset = reader.ReadOffset(true, typeof(uint)); - long MaterialOffset = reader.ReadOffset(true, typeof(uint)); + long ShaderNameOffset = reader.ReadOffset(true, typeof(uint)); long Unknown1ffset = reader.ReadOffset(true, typeof(uint)); - long Unknown2Offset = reader.ReadOffset(true, typeof(uint)); + long MaterialNameOffset = reader.ReadOffset(true, typeof(uint)); long ShaderOffset = reader.ReadOffset(true, typeof(uint)); long VisGroupOffset = reader.ReadOffset(true, typeof(uint)); long VerteBufferOffset = reader.ReadOffset(true, typeof(uint)); @@ -181,9 +182,16 @@ namespace FirstPlugin TextureMaps = reader.ReadNameOffsets(Count, true, typeof(uint), true); } - if (MaterialOffset != 0) + if (ShaderNameOffset != 0) { - reader.SeekBegin(MaterialOffset); + reader.SeekBegin(ShaderNameOffset); + uint Count = reader.ReadUInt32(); + ShaderNames = reader.ReadNameOffsets(Count, true, typeof(uint)); + } + + if (MaterialNameOffset != 0) + { + reader.SeekBegin(MaterialNameOffset); uint Count = reader.ReadUInt32(); MaterialNames = reader.ReadNameOffsets(Count, true, typeof(uint)); } diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 7290d191..b751a3a3 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ