From e63b6b2f9a4ef8b248b9c6c85fbbd4cbbb990b1d Mon Sep 17 00:00:00 2001 From: MeltyPlayer Date: Fri, 12 Jan 2024 21:46:28 -0600 Subject: [PATCH] Updated version of Schema that's used. --- FinModelUtility/Fin/Fin/Fin.csproj | 2 +- FinModelUtility/Fin/Fin/src/data/Keyframes.cs | 13 +----------- .../Fin/Fin/src/io/FinDirectory.cs | 1 - .../Fin/src/model/AnimationTrackInterfaces.cs | 21 +++++-------------- .../Fin/src/model/OrientationInterfaces.cs | 9 ++++---- .../Fin/Fin/src/schema/color/Rgb24.cs | 10 ++++----- .../Fin/Fin/src/schema/color/Rgba32.cs | 8 +++---- .../Fin/Fin/src/schema/color/Rgba4f.cs | 8 +++---- .../data/AutoMagicUInt32SizedSection.cs | 8 +++---- .../data/AutoStringMagicJankSizedSection.cs | 8 +++---- .../data/AutoStringMagicUInt32SizedSection.cs | 8 +++---- .../src/schema/data/AutoUInt32SizedSection.cs | 4 ++-- .../PassThruStringMagicJankSizedSection.cs | 8 +++---- .../PassThruStringMagicUInt32SizedSection.cs | 8 +++---- .../SwitchMagicStringUInt32SizedSection.cs | 10 ++++----- .../src/schema/sequences/ConsecutiveLists2.cs | 4 ++-- FinModelUtility/Formats/Ast/Ast/Ast.csproj | 2 +- FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj | 2 +- .../Cmb/Cmb/src/schema/cmb/mats/Mats.cs | 2 +- .../Cmb/Cmb/src/schema/cmb/skl/Bone.cs | 6 +++--- .../Cmb/Cmb/src/schema/cmb/sklm/Mesh.cs | 2 +- .../Cmb/Cmb/src/schema/cmb/sklm/Sepd.cs | 4 ++-- .../Cmb/Cmb/src/schema/cmb/vatr/Vatr.cs | 2 +- .../Formats/Cmb/Cmb/src/schema/ctxb/Ctxb.cs | 2 +- FinModelUtility/Formats/Dat/Dat/Dat.csproj | 2 +- .../Formats/Dat/Dat/src/schema/DObj.cs | 4 ++-- .../Formats/Dat/Dat/src/schema/DatSubfile.cs | 10 ++++----- .../Formats/Dat/Dat/src/schema/JObj.cs | 4 ++-- .../Dat/Dat/src/schema/animation/AObj.cs | 2 +- .../Dat/Dat/src/schema/animation/FObj.cs | 2 +- .../Dat/Dat/src/schema/animation/FigaTree.cs | 4 ++-- .../Dat/src/schema/animation/FigaTreeTrack.cs | 8 +++---- .../Dat/src/schema/animation/MatAnimJoint.cs | 2 +- .../Dat/Dat/src/schema/material/MObj.cs | 4 ++-- .../Dat/src/schema/mesh/VertexDescriptor.cs | 6 +++--- .../Formats/F3dzex2/F3dzex2.csproj | 2 +- FinModelUtility/Formats/Glo/Glo/Glo.csproj | 2 +- .../Formats/Granny3d/Granny3d.csproj | 2 +- FinModelUtility/Formats/Gx/Gx.csproj | 2 +- .../Formats/JSystem/JSystem/JSystem.csproj | 2 +- .../src/schema/j3dgraph/bmd/drw1/Drw1.cs | 2 +- .../src/schema/j3dgraph/bmd/inf1/Inf1.cs | 2 +- .../src/schema/j3dgraph/bmd/jnt1/Jnt1.cs | 2 +- .../src/schema/j3dgraph/bmd/tex1/Tex1.cs | 2 +- .../JSystem/src/schema/jutility/bti/Bti.cs | 4 ++-- .../Formats/Level5/Level5/Level5.csproj | 2 +- FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj | 2 +- FinModelUtility/Formats/Mod/Mod/Mod.csproj | 2 +- .../Formats/Mod/Mod/src/schema/Mesh.cs | 2 +- .../Mod/Mod/src/schema/animation/Dca.cs | 2 +- .../Mod/Mod/src/schema/animation/Dck.cs | 2 +- .../Mod/src/schema/animation/DcxWrapper.cs | 6 +++--- .../Mod/Mod/src/schema/collision/Collision.cs | 2 +- .../Mod/Mod/src/schema/image/Texture.cs | 4 ++-- FinModelUtility/Formats/Modl/Modl/Modl.csproj | 2 +- .../Formats/Nitro/Nitro/Nitro.csproj | 2 +- .../Nitro/Nitro/src/schema/nsbmd/Object.cs | 6 +++--- .../Formats/Visceral/Visceral/Visceral.csproj | 2 +- .../Visceral/src/schema/str/NoopBlock.cs | 2 +- .../src/schema/str/content/ContentBlock.cs | 2 +- FinModelUtility/Formats/Xmod/Xmod.csproj | 2 +- .../Xmod/src/schema/TextReaderUtils.cs | 16 +++++++------- .../Formats/Xmod/src/schema/ped/Ped.cs | 6 +++--- .../Formats/Xmod/src/schema/xmod/Adjunct.cs | 4 ++-- .../Formats/Xmod/src/schema/xmod/Material.cs | 2 +- .../Formats/Xmod/src/schema/xmod/Packet.cs | 4 ++-- .../Formats/Xmod/src/schema/xmod/Primitive.cs | 4 ++-- .../Formats/Xmod/src/schema/xmod/TextureId.cs | 4 ++-- .../Formats/Xmod/src/schema/xmod/Xmod.cs | 12 +++++------ .../Games/BanjoKazooie/BanjoKazooie.csproj | 2 +- .../Games/HaloWarsTools/HaloWarsTools.csproj | 2 +- .../PaperMarioDirectorsCut.csproj | 2 +- .../SuperMario64/SuperMario64.csproj | 2 +- .../src/Scripts/geo/GeoCommands.cs | 20 +++++++++--------- .../src/schema/PresetMacroEntry.cs | 2 +- .../ModelPluginWrappers.csproj | 2 +- .../UniversalAssetTool.csproj | 2 +- 77 files changed, 164 insertions(+), 186 deletions(-) diff --git a/FinModelUtility/Fin/Fin/Fin.csproj b/FinModelUtility/Fin/Fin/Fin.csproj index ae4915e48..5212bd6e1 100644 --- a/FinModelUtility/Fin/Fin/Fin.csproj +++ b/FinModelUtility/Fin/Fin/Fin.csproj @@ -45,6 +45,6 @@ - + \ No newline at end of file diff --git a/FinModelUtility/Fin/Fin/src/data/Keyframes.cs b/FinModelUtility/Fin/Fin/src/data/Keyframes.cs index f214332f7..e70d225a1 100644 --- a/FinModelUtility/Fin/Fin/src/data/Keyframes.cs +++ b/FinModelUtility/Fin/Fin/src/data/Keyframes.cs @@ -4,21 +4,10 @@ using System.Runtime.CompilerServices; namespace fin.data { - public readonly struct Keyframe : IComparable> { - public int Frame { get; } - public T Value { get; } - - public Keyframe(int frame, T value) { - this.Frame = frame; - this.Value = value; - } - + public readonly record struct Keyframe(int Frame, T Value) : IComparable> { [MethodImpl(MethodImplOptions.AggressiveInlining)] public int CompareTo(Keyframe other) => this.Frame - other.Frame; - - public override string ToString() - => $"{{ Frame: {this.Frame}, Value: {this.Value} }}"; } public interface IReadOnlyKeyframes { diff --git a/FinModelUtility/Fin/Fin/src/io/FinDirectory.cs b/FinModelUtility/Fin/Fin/src/io/FinDirectory.cs index 71332838f..46a6beba6 100644 --- a/FinModelUtility/Fin/Fin/src/io/FinDirectory.cs +++ b/FinModelUtility/Fin/Fin/src/io/FinDirectory.cs @@ -5,7 +5,6 @@ using fin.data.stacks; using fin.util.asserts; -using fin.util.enumerables; namespace fin.io { public readonly struct FinDirectory : ISystemDirectory { diff --git a/FinModelUtility/Fin/Fin/src/model/AnimationTrackInterfaces.cs b/FinModelUtility/Fin/Fin/src/model/AnimationTrackInterfaces.cs index 8ecfe871b..302a441bc 100644 --- a/FinModelUtility/Fin/Fin/src/model/AnimationTrackInterfaces.cs +++ b/FinModelUtility/Fin/Fin/src/model/AnimationTrackInterfaces.cs @@ -5,12 +5,11 @@ using fin.math.interpolation; namespace fin.model { - public readonly struct ValueAndTangents { - public T IncomingValue { get; } - public T OutgoingValue { get; } - public float? IncomingTangent { get; } - public float? OutgoingTangent { get; } - + public readonly record struct ValueAndTangents( + T IncomingValue, + T OutgoingValue, + float? IncomingTangent, + float? OutgoingTangent) { public ValueAndTangents(T value) : this(value, null) { } public ValueAndTangents(T value, float? tangent) @@ -23,16 +22,6 @@ public ValueAndTangents(T value, value, incomingTangent, outgoingTangent) { } - - public ValueAndTangents(T incomingValue, - T outgoingValue, - float? incomingTangent, - float? outgoingTangent) { - this.IncomingValue = incomingValue; - this.OutgoingValue = outgoingValue; - this.IncomingTangent = incomingTangent; - this.OutgoingTangent = outgoingTangent; - } } diff --git a/FinModelUtility/Fin/Fin/src/model/OrientationInterfaces.cs b/FinModelUtility/Fin/Fin/src/model/OrientationInterfaces.cs index 6e9175f42..9a507b530 100644 --- a/FinModelUtility/Fin/Fin/src/model/OrientationInterfaces.cs +++ b/FinModelUtility/Fin/Fin/src/model/OrientationInterfaces.cs @@ -161,18 +161,19 @@ public interface IReadOnlyVector4 { float W { get; } } + public interface IVector4 : IReadOnlyVector4 { float IReadOnlyVector4.X => this.X; - float X { get; set; } + new float X { get; set; } float IReadOnlyVector4.Y => this.Y; - float Y { get; set; } + new float Y { get; set; } float IReadOnlyVector4.Z => this.Z; - float Z { get; set; } + new float Z { get; set; } float IReadOnlyVector4.W => this.W; - float W { get; set; } + new float W { get; set; } } diff --git a/FinModelUtility/Fin/Fin/src/schema/color/Rgb24.cs b/FinModelUtility/Fin/Fin/src/schema/color/Rgb24.cs index 73773f6b6..b859b8d87 100644 --- a/FinModelUtility/Fin/Fin/src/schema/color/Rgb24.cs +++ b/FinModelUtility/Fin/Fin/src/schema/color/Rgb24.cs @@ -10,19 +10,19 @@ public partial class Rgb24 : IColor, IBinaryConvertible { public byte Gb { get; set; } public byte Bb { get; set; } - [Ignore] + [Skip] public byte Ab => 255; - [Ignore] + [Skip] public float Rf => this.Rb / 255f; - [Ignore] + [Skip] public float Gf => this.Gb / 255f; - [Ignore] + [Skip] public float Bf => this.Bb / 255f; - [Ignore] + [Skip] public float Af => this.Ab / 255f; } } diff --git a/FinModelUtility/Fin/Fin/src/schema/color/Rgba32.cs b/FinModelUtility/Fin/Fin/src/schema/color/Rgba32.cs index 7795d3b6e..9fa9f19da 100644 --- a/FinModelUtility/Fin/Fin/src/schema/color/Rgba32.cs +++ b/FinModelUtility/Fin/Fin/src/schema/color/Rgba32.cs @@ -11,16 +11,16 @@ public partial struct Rgba32 : IColor, IBinaryConvertible { public byte Bb { get; private set; } public byte Ab { get; private set; } - [Ignore] + [Skip] public float Rf => this.Rb / 255f; - [Ignore] + [Skip] public float Gf => this.Gb / 255f; - [Ignore] + [Skip] public float Bf => this.Bb / 255f; - [Ignore] + [Skip] public float Af => this.Ab / 255f; } diff --git a/FinModelUtility/Fin/Fin/src/schema/color/Rgba4f.cs b/FinModelUtility/Fin/Fin/src/schema/color/Rgba4f.cs index e376fbee8..0b6d8a97e 100644 --- a/FinModelUtility/Fin/Fin/src/schema/color/Rgba4f.cs +++ b/FinModelUtility/Fin/Fin/src/schema/color/Rgba4f.cs @@ -11,16 +11,16 @@ public partial class Rgba4f : IColor, IBinaryConvertible { public float Bf { get; set; } public float Af { get; set; } - [Ignore] + [Skip] public byte Rb => (byte) (this.Rf * 255); - [Ignore] + [Skip] public byte Gb => (byte) (this.Gf * 255); - [Ignore] + [Skip] public byte Bb => (byte) (this.Bf * 255); - [Ignore] + [Skip] public byte Ab => (byte) (this.Af * 255); } } \ No newline at end of file diff --git a/FinModelUtility/Fin/Fin/src/schema/data/AutoMagicUInt32SizedSection.cs b/FinModelUtility/Fin/Fin/src/schema/data/AutoMagicUInt32SizedSection.cs index 27f277929..d11770d47 100644 --- a/FinModelUtility/Fin/Fin/src/schema/data/AutoMagicUInt32SizedSection.cs +++ b/FinModelUtility/Fin/Fin/src/schema/data/AutoMagicUInt32SizedSection.cs @@ -15,19 +15,19 @@ public AutoMagicUInt32SizedSection(ISwitchMagicConfig config, this.impl_ = new(config, data); } - [Ignore] + [Skip] public int TweakReadSize { get => this.impl_.TweakReadSize; set => this.impl_.TweakReadSize = value; } - [Ignore] + [Skip] public TMagic Magic => this.impl_.Magic; - [Ignore] + [Skip] public uint Size => this.impl_.Size; - [Ignore] + [Skip] public TData Data => this.impl_.Data; } } \ No newline at end of file diff --git a/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicJankSizedSection.cs b/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicJankSizedSection.cs index aa24750fd..bd4cb35d2 100644 --- a/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicJankSizedSection.cs +++ b/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicJankSizedSection.cs @@ -17,19 +17,19 @@ public AutoStringMagicJankSizedSection(string magic) { this.impl_ = new(magic, new T()); } - [Ignore] + [Skip] public int TweakReadSize { get => this.impl_.TweakReadSize; set => this.impl_.TweakReadSize = value; } - [Ignore] + [Skip] public string Magic => this.impl_.Magic; - [Ignore] + [Skip] public uint Size => this.impl_.Size; - [Ignore] + [Skip] public T Data => this.impl_.Data; } } \ No newline at end of file diff --git a/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicUInt32SizedSection.cs b/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicUInt32SizedSection.cs index 4438ac9c2..830a55d06 100644 --- a/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicUInt32SizedSection.cs +++ b/FinModelUtility/Fin/Fin/src/schema/data/AutoStringMagicUInt32SizedSection.cs @@ -17,19 +17,19 @@ public AutoStringMagicUInt32SizedSection(string magic) { this.impl_ = new(magic, new T()); } - [Ignore] + [Skip] public int TweakReadSize { get => this.impl_.TweakReadSize; set => this.impl_.TweakReadSize = value; } - [Ignore] + [Skip] public string Magic => this.impl_.Magic; - [Ignore] + [Skip] public uint Size => this.impl_.Size; - [Ignore] + [Skip] public T Data => this.impl_.Data; } } \ No newline at end of file diff --git a/FinModelUtility/Fin/Fin/src/schema/data/AutoUInt32SizedSection.cs b/FinModelUtility/Fin/Fin/src/schema/data/AutoUInt32SizedSection.cs index 97d44d070..11f42da1d 100644 --- a/FinModelUtility/Fin/Fin/src/schema/data/AutoUInt32SizedSection.cs +++ b/FinModelUtility/Fin/Fin/src/schema/data/AutoUInt32SizedSection.cs @@ -13,13 +13,13 @@ public partial class AutoUInt32SizedSection : ISizedSection where T : IBinaryConvertible, new() { private readonly PassThruUInt32SizedSection impl_; - [Ignore] + [Skip] public int TweakReadSize { get => this.impl_.TweakReadSize; set => this.impl_.TweakReadSize = value; } - [Ignore] + [Skip] public T Data => this.impl_.Data; public AutoUInt32SizedSection() { diff --git a/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicJankSizedSection.cs b/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicJankSizedSection.cs index 5ad50fa9e..fded01927 100644 --- a/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicJankSizedSection.cs +++ b/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicJankSizedSection.cs @@ -7,7 +7,7 @@ public partial class PassThruStringMagicJankSizedSection : IMagicSection where T : IBinaryConvertible { private string MagicAsserter_ => this.Magic; - [Ignore] + [Skip] public string Magic { get; set; } private readonly PassThruJankSizedSection impl_; @@ -17,16 +17,16 @@ public PassThruStringMagicJankSizedSection(string magic, T data) { this.impl_ = new PassThruJankSizedSection(data); } - [Ignore] + [Skip] public int TweakReadSize { get => this.impl_.TweakReadSize; set => this.impl_.TweakReadSize = value; } - [Ignore] + [Skip] public uint Size => this.impl_.Size; - [Ignore] + [Skip] public T Data { get => this.impl_.Data; set => this.impl_.Data = value; diff --git a/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicUInt32SizedSection.cs b/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicUInt32SizedSection.cs index 646db0700..0db95de1b 100644 --- a/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicUInt32SizedSection.cs +++ b/FinModelUtility/Fin/Fin/src/schema/data/PassThruStringMagicUInt32SizedSection.cs @@ -7,7 +7,7 @@ public partial class PassThruStringMagicUInt32SizedSection : IMagicSection where T : IBinaryConvertible { private string MagicAsserter_ => this.Magic; - [Ignore] + [Skip] public string Magic { get; set; } private readonly PassThruUInt32SizedSection impl_; @@ -17,16 +17,16 @@ public PassThruStringMagicUInt32SizedSection(string magic, T data) { this.impl_ = new PassThruUInt32SizedSection(data); } - [Ignore] + [Skip] public int TweakReadSize { get => this.impl_.TweakReadSize; set => this.impl_.TweakReadSize = value; } - [Ignore] + [Skip] public uint Size => this.impl_.Size; - [Ignore] + [Skip] public T Data { get => this.impl_.Data; set => this.impl_.Data = value; diff --git a/FinModelUtility/Fin/Fin/src/schema/data/SwitchMagicStringUInt32SizedSection.cs b/FinModelUtility/Fin/Fin/src/schema/data/SwitchMagicStringUInt32SizedSection.cs index 733c99a19..9b1cc378f 100644 --- a/FinModelUtility/Fin/Fin/src/schema/data/SwitchMagicStringUInt32SizedSection.cs +++ b/FinModelUtility/Fin/Fin/src/schema/data/SwitchMagicStringUInt32SizedSection.cs @@ -13,10 +13,10 @@ namespace fin.schema.data { [BinarySchema] public partial class SwitchMagicStringUInt32SizedSection : IMagicSection where T : IBinaryConvertible { - [Ignore] + [Skip] private readonly int magicLength_; - [Ignore] + [Skip] private readonly Func createTypeHandler_; private readonly PassThruStringMagicUInt32SizedSection impl_ = @@ -29,16 +29,16 @@ public SwitchMagicStringUInt32SizedSection( this.createTypeHandler_ = createTypeHandler; } - [Ignore] + [Skip] public int TweakReadSize { get => this.impl_.TweakReadSize; set => this.impl_.TweakReadSize = value; } - [Ignore] + [Skip] public string Magic => this.impl_.Magic; - [Ignore] + [Skip] public T Data => this.impl_.Data; public void Read(IBinaryReader br) { diff --git a/FinModelUtility/Fin/Fin/src/schema/sequences/ConsecutiveLists2.cs b/FinModelUtility/Fin/Fin/src/schema/sequences/ConsecutiveLists2.cs index 5e09b3f18..338f6a554 100644 --- a/FinModelUtility/Fin/Fin/src/schema/sequences/ConsecutiveLists2.cs +++ b/FinModelUtility/Fin/Fin/src/schema/sequences/ConsecutiveLists2.cs @@ -29,7 +29,7 @@ private ConsecutiveLists2(List list1, List list2) { public (T1, T2) GetDefault() => (new(), new()); - [Ignore] + [Skip] public int Count => this.list1_.Count; public void Clear() { @@ -54,7 +54,7 @@ public void ResizeInPlace(int newLength) { .ToList()); } - [Ignore] + [Skip] public (T1 First, T2 Second) this[int index] { get => (this.list1_[index], this.list2_[index]); set => (this.list1_[index], this.list2_[index]) = value; diff --git a/FinModelUtility/Formats/Ast/Ast/Ast.csproj b/FinModelUtility/Formats/Ast/Ast/Ast.csproj index 1a1d33086..c1b548953 100644 --- a/FinModelUtility/Formats/Ast/Ast/Ast.csproj +++ b/FinModelUtility/Formats/Ast/Ast/Ast.csproj @@ -12,6 +12,6 @@ - + diff --git a/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj b/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj index 9ebc1ba41..d4f995a9c 100644 --- a/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj +++ b/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj @@ -41,7 +41,7 @@ - + diff --git a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/mats/Mats.cs b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/mats/Mats.cs index b755ea927..e6ca2d772 100644 --- a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/mats/Mats.cs +++ b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/mats/Mats.cs @@ -9,7 +9,7 @@ public partial class Mats : IBinaryConvertible { [SequenceLengthSource(SchemaIntegerType.UINT32)] public Material[] Materials { get; set; } - [Ignore] + [Skip] private uint TotalCombinerCount_ => (uint) this.Materials .SelectMany(material => material.texEnvStagesIndices) diff --git a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/skl/Bone.cs b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/skl/Bone.cs index c7e9b9ba5..d4be2abcc 100644 --- a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/skl/Bone.cs +++ b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/skl/Bone.cs @@ -12,7 +12,7 @@ public partial class Bone : IBinaryConvertible { // versions > OoT3D anyway) private ushort flags; - [Ignore] + [Skip] public ushort id => (ushort) (this.flags & 0xFFF); // Get boneID // M-1: @@ -21,7 +21,7 @@ public partial class Bone : IBinaryConvertible { // Though I probably missed a few compressed files. It's most likely // these flags below: // IsSegmentScaleCompensate, IsCompressible, IsNeededRendering, HasSkinningMatrix - [Ignore] + [Skip] public bool hasSkinningMatrix => this.flags.GetBit(4); public short parentId; @@ -30,7 +30,7 @@ public partial class Bone : IBinaryConvertible { public Vector3f rotation { get; } = new(); public Vector3f translation { get; } = new(); - [Ignore] + [Skip] private bool HasUnk => CmbHeader.Version > Version.OCARINA_OF_TIME_3D; [Unknown] diff --git a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Mesh.cs b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Mesh.cs index 898ae1634..7e98765f0 100644 --- a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Mesh.cs +++ b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Mesh.cs @@ -10,7 +10,7 @@ public partial class Mesh : IBinaryConvertible { public byte materialIndex; public byte id; - [Ignore] + [Skip] private int unknownLength_ => CmbHeader.Version switch { Version.OCARINA_OF_TIME_3D => 0, Version.MAJORAS_MASK_3D => 0x8, diff --git a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Sepd.cs b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Sepd.cs index 8989e34b0..d04c63c29 100644 --- a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Sepd.cs +++ b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/sklm/Sepd.cs @@ -29,7 +29,7 @@ public partial class Sepd : IBinaryConvertible { public float[] meshCenter { get; } = new float[3]; public float[] positionOffset { get; } = new float[3]; - [Ignore] + [Skip] private bool hasMinAndMax_ => CmbHeader.Version.SupportsMinAndMaxInSepd(); // Min coordinate of the shape @@ -45,7 +45,7 @@ public partial class Sepd : IBinaryConvertible { public readonly VertexAttribute position = new(); public readonly VertexAttribute normal = new(); - [Ignore] + [Skip] private bool hasTangents_ => CmbHeader.Version.SupportsInSepd(); [RIfBoolean(nameof(hasTangents_))] diff --git a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/vatr/Vatr.cs b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/vatr/Vatr.cs index fbf42b086..23a4474cd 100644 --- a/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/vatr/Vatr.cs +++ b/FinModelUtility/Formats/Cmb/Cmb/src/schema/cmb/vatr/Vatr.cs @@ -15,7 +15,7 @@ public partial class Vatr : IBinaryConvertible { public readonly AttributeSlice position = new(); public readonly AttributeSlice normal = new(); - [Ignore] + [Skip] private bool hasTangent_ => CmbHeader.Version > Version.OCARINA_OF_TIME_3D; diff --git a/FinModelUtility/Formats/Cmb/Cmb/src/schema/ctxb/Ctxb.cs b/FinModelUtility/Formats/Cmb/Cmb/src/schema/ctxb/Ctxb.cs index 63252a993..2238f8101 100644 --- a/FinModelUtility/Formats/Cmb/Cmb/src/schema/ctxb/Ctxb.cs +++ b/FinModelUtility/Formats/Cmb/Cmb/src/schema/ctxb/Ctxb.cs @@ -63,7 +63,7 @@ public partial class CtxbTexEntry : IBinaryConvertible { private readonly uint padding_ = 0; - [Ignore] + [Skip] private bool includeExtraPadding_ => CmbHeader.Version >= Version.LUIGIS_MANSION_3D; diff --git a/FinModelUtility/Formats/Dat/Dat/Dat.csproj b/FinModelUtility/Formats/Dat/Dat/Dat.csproj index 079a455b4..99ac4a7e6 100644 --- a/FinModelUtility/Formats/Dat/Dat/Dat.csproj +++ b/FinModelUtility/Formats/Dat/Dat/Dat.csproj @@ -15,7 +15,7 @@ - + diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/DObj.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/DObj.cs index 391dc272c..a1a10c5d3 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/DObj.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/DObj.cs @@ -16,7 +16,7 @@ public partial class DObj : IDatLinkedListNode, IBinaryDeserializable { public uint FirstPObjOffset { get; set; } - [Ignore] + [Skip] public string? Name { get; set; } [RAtPositionOrNull(nameof(NextDObjOffset))] @@ -29,7 +29,7 @@ public partial class DObj : IDatLinkedListNode, IBinaryDeserializable { public PObj? FirstPObj { get; private set; } - [Ignore] + [Skip] public IEnumerable PObjs => this.FirstPObj.GetSelfAndSiblings(); } } \ No newline at end of file diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/DatSubfile.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/DatSubfile.cs index 4dfc62e62..85c4deb68 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/DatSubfile.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/DatSubfile.cs @@ -230,20 +230,20 @@ public partial class FileHeader : IBinaryConvertible { public uint Padding2 { get; set; } - [Ignore] + [Skip] public uint DataBlockOffset => 0x20; - [Ignore] + [Skip] public uint RelocationTableOffset => DataBlockOffset + DataBlockSize; - [Ignore] + [Skip] public uint RootNodeOffset => RelocationTableOffset + 4 * RelocationTableCount; - [Ignore] + [Skip] public uint ReferenceNodeOffset => RootNodeOffset + 8 * RootNodeCount; - [Ignore] + [Skip] public uint StringTableOffset => ReferenceNodeOffset + 8 * ReferenceNodeCount; } diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/JObj.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/JObj.cs index 7ad2fb83f..075858f7f 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/JObj.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/JObj.cs @@ -71,7 +71,7 @@ public partial class JObj : IDatTreeNode, IBinaryDeserializable { public uint UnknownPointer { get; set; } - [Ignore] + [Skip] public string? Name { get; set; } [RAtPositionOrNull(nameof(FirstChildBoneOffset))] @@ -88,7 +88,7 @@ public partial class JObj : IDatTreeNode, IBinaryDeserializable { public float[]? InverseBindMatrixValues { get; set; } - [Ignore] + [Skip] public IEnumerable DObjs => this.FirstDObj.GetSelfAndSiblings(); public override string? ToString() => this.Name; diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/AObj.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/AObj.cs index a288b1457..592e4767a 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/AObj.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/AObj.cs @@ -28,7 +28,7 @@ public partial class AObj : IBinaryDeserializable { [RAtPositionOrNull(nameof(FObjOffset))] public FObj? FirstFObj { get; set; } - [Ignore] + [Skip] public IEnumerable FObjs => this.FirstFObj.GetSelfAndSiblings(); } } \ No newline at end of file diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FObj.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FObj.cs index a3e45e46d..8d5a01404 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FObj.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FObj.cs @@ -57,7 +57,7 @@ public partial class FObj : IDatLinkedListNode, [RAtPositionOrNull(nameof(NextSiblingOffset))] public FObj? NextSibling { get; set; } - [Ignore] + [Skip] public LinkedList<(int frame, float incomingValue, float outgoingValue, float? incomingTangent, float? outgoingTangent)> Keyframes { get; } = new(); diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTree.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTree.cs index ca582ca55..b5754cc70 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTree.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTree.cs @@ -15,10 +15,10 @@ public partial class FigaTree : IDatNode, IBinaryDeserializable { public int TrackDataOffset { get; set; } - [Ignore] + [Skip] public LinkedList TrackCounts { get; } = new(); - [Ignore] + [Skip] public LinkedList> TrackNodes { get; } = new(); diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTreeTrack.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTreeTrack.cs index d5d606e36..1e48dd862 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTreeTrack.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/FigaTreeTrack.cs @@ -24,16 +24,16 @@ public partial class FigaTreeTrack : IDatKeyframes, IBinaryDeserializable { public uint DataOffset { get; set; } - [Ignore] + [Skip] public JointTrackType JointTrackType => (JointTrackType) this.TrackType; - [Ignore] + [Skip] public byte MatTrackType => this.TrackType; - [Ignore] + [Skip] public byte TexTrackType => this.TrackType; - [Ignore] + [Skip] public LinkedList<(int frame, float incomingValue, float outgoingValue, float? incomingTangent, float? outgoingTangent)> Keyframes { get; } = new(); diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/MatAnimJoint.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/MatAnimJoint.cs index 77796883a..980d77620 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/animation/MatAnimJoint.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/animation/MatAnimJoint.cs @@ -24,7 +24,7 @@ public partial class MatAnimJoint : IDatTreeNode, public MatAnim? FirstMatAnim { get; set; } - [Ignore] + [Skip] public IEnumerable MatAnims => this.FirstMatAnim.GetSelfAndSiblings(); } } \ No newline at end of file diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/material/MObj.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/material/MObj.cs index 20b3672f9..47f8faff6 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/material/MObj.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/material/MObj.cs @@ -51,7 +51,7 @@ public partial class MObj : IBinaryDeserializable { public uint PeDescOffset { get; set; } - [Ignore] + [Skip] public string? Name { get; set; } [RAtPositionOrNull(nameof(FirstTObjOffset))] @@ -63,7 +63,7 @@ public partial class MObj : IBinaryDeserializable { [RAtPositionOrNull(nameof(PeDescOffset))] public PeDesc? PeDesc { get; set; } - [Ignore] + [Skip] public IEnumerable<(uint, TObj)> TObjsAndOffsets { get { var tObjOffset = this.FirstTObjOffset; diff --git a/FinModelUtility/Formats/Dat/Dat/src/schema/mesh/VertexDescriptor.cs b/FinModelUtility/Formats/Dat/Dat/src/schema/mesh/VertexDescriptor.cs index cf4f06275..7b1835f43 100644 --- a/FinModelUtility/Formats/Dat/Dat/src/schema/mesh/VertexDescriptor.cs +++ b/FinModelUtility/Formats/Dat/Dat/src/schema/mesh/VertexDescriptor.cs @@ -24,7 +24,7 @@ public partial class VertexDescriptor : IBinaryConvertible { [IntegerFormat(SchemaIntegerType.UINT32)] public GxComponentCount ComponentCountType { get; set; } - [Ignore] + [Skip] public int ComponentCount => this.Attribute switch { GxAttribute.POS => this.ComponentCountType switch { GxComponentCount.POS_XY => 2, @@ -46,11 +46,11 @@ public partial class VertexDescriptor : IBinaryConvertible { [IntegerFormat(SchemaIntegerType.UINT32)] public uint RawComponentType { get; set; } - [Ignore] + [Skip] public GxComponentType AxesComponentType => (GxComponentType) this.RawComponentType; - [Ignore] + [Skip] public ColorComponentType ColorComponentType => (ColorComponentType) this.RawComponentType; diff --git a/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj b/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj index ce9f883e9..605bf2aeb 100644 --- a/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj +++ b/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj @@ -22,7 +22,7 @@ - + diff --git a/FinModelUtility/Formats/Glo/Glo/Glo.csproj b/FinModelUtility/Formats/Glo/Glo/Glo.csproj index 3f0995e05..bc0523c49 100644 --- a/FinModelUtility/Formats/Glo/Glo/Glo.csproj +++ b/FinModelUtility/Formats/Glo/Glo/Glo.csproj @@ -15,7 +15,7 @@ - + diff --git a/FinModelUtility/Formats/Granny3d/Granny3d.csproj b/FinModelUtility/Formats/Granny3d/Granny3d.csproj index 09aa96a05..28ee56112 100644 --- a/FinModelUtility/Formats/Granny3d/Granny3d.csproj +++ b/FinModelUtility/Formats/Granny3d/Granny3d.csproj @@ -12,7 +12,7 @@ - + diff --git a/FinModelUtility/Formats/Gx/Gx.csproj b/FinModelUtility/Formats/Gx/Gx.csproj index 8499f5815..dbcede301 100644 --- a/FinModelUtility/Formats/Gx/Gx.csproj +++ b/FinModelUtility/Formats/Gx/Gx.csproj @@ -13,7 +13,7 @@ - + diff --git a/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj b/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj index a1011496b..ea2dc9821 100644 --- a/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj +++ b/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj @@ -60,7 +60,7 @@ - + diff --git a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/drw1/Drw1.cs b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/drw1/Drw1.cs index d111bf4b9..e52d16d89 100644 --- a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/drw1/Drw1.cs +++ b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/drw1/Drw1.cs @@ -11,7 +11,7 @@ public partial class Drw1 : IBinaryConvertible { private readonly AutoStringMagicUInt32SizedSection impl_ = new("DRW1") { TweakReadSize = -8 }; - [Ignore] + [Skip] public Drw1Data Data => this.impl_.Data; } diff --git a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/inf1/Inf1.cs b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/inf1/Inf1.cs index f4bc7bc4d..c82869ed0 100644 --- a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/inf1/Inf1.cs +++ b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/inf1/Inf1.cs @@ -12,7 +12,7 @@ public partial class Inf1 : IBinaryConvertible { private readonly AutoStringMagicUInt32SizedSection impl_ = new("INF1") { TweakReadSize = -8 }; - [Ignore] + [Skip] public Inf1Data Data => this.impl_.Data; } diff --git a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/jnt1/Jnt1.cs b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/jnt1/Jnt1.cs index 6ea882a1d..96d03b682 100644 --- a/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/jnt1/Jnt1.cs +++ b/FinModelUtility/Formats/JSystem/JSystem/src/schema/j3dgraph/bmd/jnt1/Jnt1.cs @@ -11,7 +11,7 @@ public partial class Jnt1 : IBinaryConvertible { private readonly AutoStringMagicUInt32SizedSection impl_ = new("JNT1") { TweakReadSize = -8 }; - [Ignore] + [Skip] public Jnt1Data Data => this.impl_.Data; } 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 4c0c76b75..c9ba76597 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 @@ -12,7 +12,7 @@ public partial class Tex1 : IBinaryConvertible { private readonly AutoStringMagicUInt32SizedSection impl_ = new("TEX1") { TweakReadSize = -8 }; - [Ignore] + [Skip] public Tex1Data Data => this.impl_.Data; } diff --git a/FinModelUtility/Formats/JSystem/JSystem/src/schema/jutility/bti/Bti.cs b/FinModelUtility/Formats/JSystem/JSystem/src/schema/jutility/bti/Bti.cs index 0ec0b1b20..918c35366 100644 --- a/FinModelUtility/Formats/JSystem/JSystem/src/schema/jutility/bti/Bti.cs +++ b/FinModelUtility/Formats/JSystem/JSystem/src/schema/jutility/bti/Bti.cs @@ -80,7 +80,7 @@ public partial class Bti : IBinaryConvertible { [RSequenceLengthSource(nameof(CompressedBufferSize_))] public byte[] Data; - [Ignore] + [Skip] public Rgba32[] palette; [ReadLogic] @@ -180,7 +180,7 @@ public unsafe IImage ToBitmap() { throw new NotImplementedException(); } - [Ignore] + [Skip] private int CompressedBufferSize_ { get { int num1 = (int) this.Width + (8 - (int) this.Width % 8) % 8; diff --git a/FinModelUtility/Formats/Level5/Level5/Level5.csproj b/FinModelUtility/Formats/Level5/Level5/Level5.csproj index b6d383503..5ec281cac 100644 --- a/FinModelUtility/Formats/Level5/Level5/Level5.csproj +++ b/FinModelUtility/Formats/Level5/Level5/Level5.csproj @@ -13,6 +13,6 @@ - + diff --git a/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj b/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj index 0d3c87d06..88fd1ebc0 100644 --- a/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj +++ b/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj @@ -8,6 +8,6 @@ - + diff --git a/FinModelUtility/Formats/Mod/Mod/Mod.csproj b/FinModelUtility/Formats/Mod/Mod/Mod.csproj index 22c486daa..8f4b3f40f 100644 --- a/FinModelUtility/Formats/Mod/Mod/Mod.csproj +++ b/FinModelUtility/Formats/Mod/Mod/Mod.csproj @@ -58,7 +58,7 @@ - + diff --git a/FinModelUtility/Formats/Mod/Mod/src/schema/Mesh.cs b/FinModelUtility/Formats/Mod/Mod/src/schema/Mesh.cs index a7888cad5..0eef30ad5 100644 --- a/FinModelUtility/Formats/Mod/Mod/src/schema/Mesh.cs +++ b/FinModelUtility/Formats/Mod/Mod/src/schema/Mesh.cs @@ -15,7 +15,7 @@ public class DisplayListFlagsByteView { [BinarySchema] public partial class DisplayListFlags : IBinaryConvertible { - [Ignore] + [Skip] public DisplayListFlagsByteView byteView = new(); public uint intView { diff --git a/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dca.cs b/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dca.cs index 3cc86589d..f2433b1ba 100644 --- a/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dca.cs +++ b/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dca.cs @@ -34,7 +34,7 @@ public partial class DcaAnimationData : IDcxAnimationData { [RSequenceLengthSource(nameof(jointCount_))] public DcaJointData[] JointDataList { get; set; } - [Ignore] + [Skip] IDcxJointData[] IDcxAnimationData.JointDataList { get => this.JointDataList; set => this.JointDataList = value as DcaJointData[]; diff --git a/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dck.cs b/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dck.cs index 239bf8456..227d58081 100644 --- a/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dck.cs +++ b/FinModelUtility/Formats/Mod/Mod/src/schema/animation/Dck.cs @@ -37,7 +37,7 @@ public partial class DckAnimationData : IDcxAnimationData { [RSequenceLengthSource(nameof(jointCount_))] public DckJointData[] JointDataList { get; set; } - [Ignore] + [Skip] IDcxJointData[] IDcxAnimationData.JointDataList { get => this.JointDataList; set => this.JointDataList = value as DckJointData[]; diff --git a/FinModelUtility/Formats/Mod/Mod/src/schema/animation/DcxWrapper.cs b/FinModelUtility/Formats/Mod/Mod/src/schema/animation/DcxWrapper.cs index 1bc76b539..a6245d95a 100644 --- a/FinModelUtility/Formats/Mod/Mod/src/schema/animation/DcxWrapper.cs +++ b/FinModelUtility/Formats/Mod/Mod/src/schema/animation/DcxWrapper.cs @@ -13,19 +13,19 @@ public enum AnimationFormat : uint { public partial class DcxWrapper : IBinaryConvertible { public AnimationFormat AnimationFormat { get; set; } - [Ignore] + [Skip] private bool IsDca => this.AnimationFormat == AnimationFormat.DCA; [RIfBoolean(nameof(IsDca))] public Dca? Dca { get; set; } - [Ignore] + [Skip] private bool IsDck => this.AnimationFormat == AnimationFormat.DCK; [RIfBoolean(nameof(IsDck))] public Dck? Dck { get; set; } - [Ignore] + [Skip] public IDcx Dcx => IsDca ? Dca! : IsDck ? Dck! : diff --git a/FinModelUtility/Formats/Mod/Mod/src/schema/collision/Collision.cs b/FinModelUtility/Formats/Mod/Mod/src/schema/collision/Collision.cs index 79b9c720f..434c4bdef 100644 --- a/FinModelUtility/Formats/Mod/Mod/src/schema/collision/Collision.cs +++ b/FinModelUtility/Formats/Mod/Mod/src/schema/collision/Collision.cs @@ -88,7 +88,7 @@ public partial class CollGrid : IBinaryConvertible { [SequenceLengthSource(SchemaIntegerType.UINT32)] public readonly List groups = new(); - [Ignore] + [Skip] private uint gridSize_ => this.gridX * this.gridY; [Unknown] diff --git a/FinModelUtility/Formats/Mod/Mod/src/schema/image/Texture.cs b/FinModelUtility/Formats/Mod/Mod/src/schema/image/Texture.cs index e6e64ce05..5e230767a 100644 --- a/FinModelUtility/Formats/Mod/Mod/src/schema/image/Texture.cs +++ b/FinModelUtility/Formats/Mod/Mod/src/schema/image/Texture.cs @@ -20,10 +20,10 @@ public enum TextureFormat : uint { RGBA32 = 7, } - [Ignore] + [Skip] public int index; - [Ignore] + [Skip] public string Name => "texture" + this.index + "_" + this.format; public ushort width = 0; diff --git a/FinModelUtility/Formats/Modl/Modl/Modl.csproj b/FinModelUtility/Formats/Modl/Modl/Modl.csproj index 49a1d9ff4..51c9a9607 100644 --- a/FinModelUtility/Formats/Modl/Modl/Modl.csproj +++ b/FinModelUtility/Formats/Modl/Modl/Modl.csproj @@ -16,7 +16,7 @@ - + diff --git a/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj b/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj index ef7ac8b07..afc140eef 100644 --- a/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj +++ b/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj @@ -8,7 +8,7 @@ - + diff --git a/FinModelUtility/Formats/Nitro/Nitro/src/schema/nsbmd/Object.cs b/FinModelUtility/Formats/Nitro/Nitro/src/schema/nsbmd/Object.cs index 3e904f72c..f51b0faea 100644 --- a/FinModelUtility/Formats/Nitro/Nitro/src/schema/nsbmd/Object.cs +++ b/FinModelUtility/Formats/Nitro/Nitro/src/schema/nsbmd/Object.cs @@ -52,15 +52,15 @@ public void ReadRotation_(IBinaryReader br) { public Vector3f? Scale { get; set; } - [Ignore] + [Skip] public Matrix3x3f? Rotation { get; set; } - [Ignore] + [Skip] public bool HasTranslation => !this.Flags.CheckFlag(ObjectFlags.NO_TRANSLATION); - [Ignore] + [Skip] public bool HasScale => !this.Flags.CheckFlag(ObjectFlags.NO_SCALE); } diff --git a/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj b/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj index 15a498b07..6ce221a56 100644 --- a/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj +++ b/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj @@ -14,7 +14,7 @@ - + diff --git a/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/NoopBlock.cs b/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/NoopBlock.cs index 89f0c41fd..8b7033ede 100644 --- a/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/NoopBlock.cs +++ b/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/NoopBlock.cs @@ -9,7 +9,7 @@ public NoopBlock(BlockType type) { this.Type = type; } - [Ignore] + [Skip] public BlockType Type { get; } } } diff --git a/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/content/ContentBlock.cs b/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/content/ContentBlock.cs index 4c29b865e..0957fe910 100644 --- a/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/content/ContentBlock.cs +++ b/FinModelUtility/Formats/Visceral/Visceral/src/schema/str/content/ContentBlock.cs @@ -15,7 +15,7 @@ public partial class ContentBlock : IBlock { ContentType.CompressedData => new RefPackCompressedData(), }); - [Ignore] + [Skip] public BlockType Type => BlockType.Content; public override string ToString() => this.Impl.ToString(); diff --git a/FinModelUtility/Formats/Xmod/Xmod.csproj b/FinModelUtility/Formats/Xmod/Xmod.csproj index d98c6a21f..81f78361b 100644 --- a/FinModelUtility/Formats/Xmod/Xmod.csproj +++ b/FinModelUtility/Formats/Xmod/Xmod.csproj @@ -10,7 +10,7 @@ - + diff --git a/FinModelUtility/Formats/Xmod/src/schema/TextReaderUtils.cs b/FinModelUtility/Formats/Xmod/src/schema/TextReaderUtils.cs index 848ccc1df..796fb147a 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/TextReaderUtils.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/TextReaderUtils.cs @@ -11,10 +11,10 @@ public static class TextReaderUtils { public static string[] QUOTE = { "\"" }; public static string ReadKeyValue(ITextReader tr, string prefix) { - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); tr.AssertString(prefix); tr.AssertChar(':'); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); return tr.ReadLine(); } @@ -26,12 +26,12 @@ public static TNumber ReadKeyValueNumber( public static T ReadKeyValueInstance(ITextReader tr, string prefix) where T : ITextDeserializable, new() { - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); tr.AssertString(prefix); tr.AssertChar(':'); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); var instance = tr.ReadNew(); - tr.IgnoreOnceIfPresent(TextReaderConstants.NEWLINE_STRINGS); + tr.SkipOnceIfPresent(TextReaderConstants.NEWLINE_STRINGS); return instance; } @@ -54,11 +54,11 @@ public static T[] ReadInstances(ITextReader tr, where T : ITextDeserializable, new() { var values = new T[count]; for (var i = 0; i < count; ++i) { - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); tr.AssertString(prefix); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); values[i] = tr.ReadNew(); - tr.IgnoreOnceIfPresent(TextReaderConstants.NEWLINE_STRINGS); + tr.SkipOnceIfPresent(TextReaderConstants.NEWLINE_STRINGS); } return values; diff --git a/FinModelUtility/Formats/Xmod/src/schema/ped/Ped.cs b/FinModelUtility/Formats/Xmod/src/schema/ped/Ped.cs index eb66f3590..9dc773ef1 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/ped/Ped.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/ped/Ped.cs @@ -9,17 +9,17 @@ public class Ped : ITextDeserializable { public void Read(ITextReader tr) { SkelName = TextReaderUtils.ReadKeyValue(tr, "skel").Trim(); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); tr.AssertString("lod 0 {"); XmodName = tr.ReadUpToAndPastTerminator(TextReaderUtils.CLOSING_BRACE) .Trim(); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.AnimMap = new Dictionary(); tr.AssertString("anim {"); while (true) { - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); if (tr.Matches(out _, "}")) { break; } diff --git a/FinModelUtility/Formats/Xmod/src/schema/xmod/Adjunct.cs b/FinModelUtility/Formats/Xmod/src/schema/xmod/Adjunct.cs index 0b94d3d2c..81f28b3b3 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/xmod/Adjunct.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/xmod/Adjunct.cs @@ -13,7 +13,7 @@ public class Adjunct : ITextDeserializable { public int MatrixIndex { get; set; } public void Read(ITextReader tr) { - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); tr.AssertString("adj"); var indices = tr.ReadInt32s(TextReaderConstants.WHITESPACE_STRINGS, TextReaderConstants.NEWLINE_STRINGS); @@ -29,7 +29,7 @@ public void Read(ITextReader tr) { MatrixIndex = indices[5]; - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); } } } diff --git a/FinModelUtility/Formats/Xmod/src/schema/xmod/Material.cs b/FinModelUtility/Formats/Xmod/src/schema/xmod/Material.cs index c2ba0a346..6e3b804f3 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/xmod/Material.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/xmod/Material.cs @@ -27,7 +27,7 @@ public void Read(ITextReader tr) { //TextReaderUtils.ReadKeyValueNumber(tr, "attributes"); tr.ReadUpToAndPastTerminator(TextReaderUtils.CLOSING_BRACE); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); } } } \ No newline at end of file diff --git a/FinModelUtility/Formats/Xmod/src/schema/xmod/Packet.cs b/FinModelUtility/Formats/Xmod/src/schema/xmod/Packet.cs index a1d740247..22b0e6acc 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/xmod/Packet.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/xmod/Packet.cs @@ -15,7 +15,7 @@ public void Read(ITextReader tr) { var numMatrices = tr.ReadInt32(); tr.ReadUpToAndPastTerminator(TextReaderUtils.OPEN_BRACE); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Adjuncts = tr.ReadNews(numAdjuncts); this.Primitives = tr.ReadNews(numPrimitives); @@ -25,7 +25,7 @@ public void Read(ITextReader tr) { TextReaderConstants.NEWLINE_STRINGS); tr.ReadUpToAndPastTerminator(TextReaderUtils.CLOSING_BRACE); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); } } } \ No newline at end of file diff --git a/FinModelUtility/Formats/Xmod/src/schema/xmod/Primitive.cs b/FinModelUtility/Formats/Xmod/src/schema/xmod/Primitive.cs index d4a543485..577e3167f 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/xmod/Primitive.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/xmod/Primitive.cs @@ -13,7 +13,7 @@ public class Primitive : ITextDeserializable { public IReadOnlyList VertexIndices { get; set; } public void Read(ITextReader tr) { - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Type = tr.ReadString(3) switch { "stp" => PrimitiveType.TRIANGLE_STRIP, @@ -23,7 +23,7 @@ public void Read(ITextReader tr) { this.VertexIndices = tr.ReadInt32s(TextReaderConstants.WHITESPACE_STRINGS, TextReaderConstants.NEWLINE_STRINGS); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); } } } diff --git a/FinModelUtility/Formats/Xmod/src/schema/xmod/TextureId.cs b/FinModelUtility/Formats/Xmod/src/schema/xmod/TextureId.cs index 36a805c6b..cddb4bde8 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/xmod/TextureId.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/xmod/TextureId.cs @@ -7,9 +7,9 @@ public class TextureId : ITextDeserializable { public string Name { get; set; } public void Read(ITextReader tr) { - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Index = tr.ReadInt32(); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); tr.AssertChar('"'); this.Name = tr.ReadUpToAndPastTerminator(TextReaderUtils.QUOTE); } diff --git a/FinModelUtility/Formats/Xmod/src/schema/xmod/Xmod.cs b/FinModelUtility/Formats/Xmod/src/schema/xmod/Xmod.cs index 615e0ac99..fc0f2a6cf 100644 --- a/FinModelUtility/Formats/Xmod/src/schema/xmod/Xmod.cs +++ b/FinModelUtility/Formats/Xmod/src/schema/xmod/Xmod.cs @@ -29,23 +29,23 @@ public void Read(ITextReader tr) { var numMatrices = TextReaderUtils.ReadKeyValueNumber(tr, "matrices"); var numReskins = TextReaderUtils.ReadKeyValueNumber(tr, "reskins"); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Positions = TextReaderUtils.ReadInstances(tr, "v", numVertices); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Normals = TextReaderUtils.ReadInstances(tr, "n", numNormals); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Colors = TextReaderUtils.ReadInstances(tr, "c", numColors); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Uv1s = TextReaderUtils.ReadInstances(tr, "t1", numUv1s); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); var uv2s = TextReaderUtils.ReadInstances(tr, "t2", numUv2s); - tr.IgnoreManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); + tr.SkipManyIfPresent(TextReaderConstants.WHITESPACE_STRINGS); this.Materials = tr.ReadNews(numMaterials); diff --git a/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj b/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj index ac8200c83..e5b8ffcf0 100644 --- a/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj +++ b/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj @@ -14,7 +14,7 @@ - + diff --git a/FinModelUtility/Games/HaloWarsTools/HaloWarsTools.csproj b/FinModelUtility/Games/HaloWarsTools/HaloWarsTools.csproj index b830bfcc4..ed32b4214 100644 --- a/FinModelUtility/Games/HaloWarsTools/HaloWarsTools.csproj +++ b/FinModelUtility/Games/HaloWarsTools/HaloWarsTools.csproj @@ -21,7 +21,7 @@ - + diff --git a/FinModelUtility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj b/FinModelUtility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj index e9fc90e39..06ca34bf0 100644 --- a/FinModelUtility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj +++ b/FinModelUtility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj @@ -8,7 +8,7 @@ - + diff --git a/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj b/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj index 9153d6937..10d50f091 100644 --- a/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj +++ b/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj @@ -66,6 +66,6 @@ - + \ No newline at end of file diff --git a/FinModelUtility/Games/SuperMario64/SuperMario64/src/Scripts/geo/GeoCommands.cs b/FinModelUtility/Games/SuperMario64/SuperMario64/src/Scripts/geo/GeoCommands.cs index f252d5f35..e23370dde 100644 --- a/FinModelUtility/Games/SuperMario64/SuperMario64/src/Scripts/geo/GeoCommands.cs +++ b/FinModelUtility/Games/SuperMario64/SuperMario64/src/Scripts/geo/GeoCommands.cs @@ -73,7 +73,7 @@ public partial class GeoBranchAndStoreCommand : IGeoCommand, IBinaryDeserializab public uint GeoCommandSegmentedAddress { get; set; } - [Ignore] + [Skip] public IGeoCommandList? GeoCommandList { get; set; } } @@ -96,7 +96,7 @@ public partial class GeoBranchCommand : IGeoCommand, IBinaryDeserializable { public uint GeoCommandSegmentedAddress { get; set; } - [Ignore] + [Skip] public IGeoCommandList? GeoCommandList { get; set; } } @@ -246,13 +246,13 @@ public partial class GeoTranslationCommand : IGeoCommand, IBinaryDeserializable /// public byte Params { get; set; } - [Ignore] + [Skip] public GeoDrawingLayer DrawingLayer => GeoUtils.GetDrawingLayerFromParams(Params); public Vector3s Translation => new(); - [Ignore] + [Skip] public bool HasDisplayList => GeoUtils.IsDisplayListAndDrawingLayerEnabled(Params); @@ -269,13 +269,13 @@ public partial class GeoRotationCommand : IGeoCommand, IBinaryDeserializable { /// public byte Params { get; set; } - [Ignore] + [Skip] public GeoDrawingLayer DrawingLayer => GeoUtils.GetDrawingLayerFromParams(Params); public Vector3s Rotation => new(); - [Ignore] + [Skip] public bool HasDisplayList => GeoUtils.IsDisplayListAndDrawingLayerEnabled(Params); @@ -304,13 +304,13 @@ public partial class GeoBillboardCommand : IGeoCommand, IBinaryDeserializable { /// public byte Params { get; set; } - [Ignore] + [Skip] public GeoDrawingLayer DrawingLayer => GeoUtils.GetDrawingLayerFromParams(Params); public Vector3s Translation => new(); - [Ignore] + [Skip] public bool HasDisplayList => GeoUtils.IsDisplayListAndDrawingLayerEnabled(Params); @@ -397,7 +397,7 @@ public partial class GeoScaleCommand : IGeoCommand, IBinaryDeserializable { /// public byte Params { get; set; } - [Ignore] + [Skip] public GeoDrawingLayer DrawingLayer => GeoUtils.GetDrawingLayerFromParams(Params); @@ -405,7 +405,7 @@ public GeoDrawingLayer DrawingLayer public uint Scale { get; set; } - [Ignore] + [Skip] public bool HasDisplayList => GeoUtils.IsDisplayListAndDrawingLayerEnabled(Params); diff --git a/FinModelUtility/Games/SuperMario64/SuperMario64/src/schema/PresetMacroEntry.cs b/FinModelUtility/Games/SuperMario64/SuperMario64/src/schema/PresetMacroEntry.cs index d537e8f70..17b0ef894 100644 --- a/FinModelUtility/Games/SuperMario64/SuperMario64/src/schema/PresetMacroEntry.cs +++ b/FinModelUtility/Games/SuperMario64/SuperMario64/src/schema/PresetMacroEntry.cs @@ -7,7 +7,7 @@ namespace sm64.schema { [Endianness(SchemaConstants.SM64_ENDIANNESS)] [BinarySchema] public partial class PresetMacroEntry : IBinaryConvertible { - [Ignore] + [Skip] public ushort PresetId { get; set; } public uint Behavior { get; set; } diff --git a/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj b/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj index a8db21759..e1b68a881 100644 --- a/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj +++ b/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj @@ -18,7 +18,7 @@ - + diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj index a5e324679..4e3dc956e 100644 --- a/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj +++ b/FinModelUtility/UniversalAssetTool/UniversalAssetTool/UniversalAssetTool.csproj @@ -29,7 +29,7 @@ - +