From 4a543e46c8d1344a5322358152a849d1ab5c64ab Mon Sep 17 00:00:00 2001 From: MeltyPlayer Date: Wed, 8 Nov 2023 07:31:11 -0600 Subject: [PATCH] Further cleaned up BMD texture entries by just subbing in BTI instead. --- .../Formats/JSystem/JSystem/src/Exporter/BmdGxTexture.cs | 1 - .../JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/Tex1.cs | 4 +++- .../JSystem/src/schema/j3dgraph/bmd/tex1/TextureEntry.cs | 5 ----- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/TextureEntry.cs diff --git a/FinModelUtility/Formats/JSystem/JSystem/src/Exporter/BmdGxTexture.cs b/FinModelUtility/Formats/JSystem/JSystem/src/Exporter/BmdGxTexture.cs index 20d62fe86..55cd74012 100644 --- a/FinModelUtility/Formats/JSystem/JSystem/src/Exporter/BmdGxTexture.cs +++ b/FinModelUtility/Formats/JSystem/JSystem/src/Exporter/BmdGxTexture.cs @@ -11,7 +11,6 @@ using gx; -using jsystem.schema.j3dgraph.bmd.tex1; using jsystem.schema.jutility.bti; using SixLabors.ImageSharp.PixelFormats; diff --git a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/Tex1.cs b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/Tex1.cs index 6612bd61c..4c0c76b75 100644 --- a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/Tex1.cs +++ b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/Tex1.cs @@ -1,5 +1,7 @@ using fin.schema.data; +using jsystem.schema.jutility.bti; + using schema.binary; using schema.binary.attributes; @@ -29,7 +31,7 @@ public partial class Tex1Data : IBinaryConvertible { [RSequenceLengthSource(nameof(textureCount_))] [RAtPosition(nameof(textureHeaderOffset_))] - public TextureEntry[] TextureHeaders; + public Bti[] TextureHeaders; [RAtPosition(nameof(stringTableOffset_))] public readonly StringTable StringTable = new(); diff --git a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/TextureEntry.cs b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/TextureEntry.cs deleted file mode 100644 index c6d55f72f..000000000 --- a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/tex1/TextureEntry.cs +++ /dev/null @@ -1,5 +0,0 @@ -using jsystem.schema.jutility.bti; - -namespace jsystem.schema.j3dgraph.bmd.tex1 { - public class TextureEntry : Bti { } -} \ No newline at end of file