Skip to content

Commit b484eac

Browse files
pohkypohky
committed
fix cexporter warnings
1 parent aafe3a3 commit b484eac

File tree

13 files changed

+122
-127
lines changed

13 files changed

+122
-127
lines changed

‎FFXIVClientStructs/FFXIV/Client/Game/Event/GatheringPointEventHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Event;
44
[Inherits<GatheringEventHandler>]
55
[StructLayout(LayoutKind.Explicit, Size = 0x4A8)]
66
public unsafe partial struct GatheringPointEventHandler {
7-
[FieldOffset(0x475)] public bool QuickGatheringEnabled;
7+
[FieldOffset(0x4A5)] public bool QuickGatheringEnabled;
88
}

‎FFXIVClientStructs/FFXIV/Client/Game/Object/Aetheryte.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Object;
88
[Inherits<GameObject>]
99
[StructLayout(LayoutKind.Explicit, Size = 0x1A0)]
1010
public unsafe partial struct Aetheryte {
11-
[FieldOffset(0x1A0)] public AetheryteEventHandler* AetheryteEventHandler;
11+
[FieldOffset(0x190)] public AetheryteEventHandler* AetheryteEventHandler;
1212
}

‎FFXIVClientStructs/FFXIV/Client/Game/Object/GatheringPointObject.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Object;
66
[Inherits<GameObject>]
77
[StructLayout(LayoutKind.Explicit, Size = 0x1E0)]
88
public unsafe partial struct GatheringPointObject {
9-
[FieldOffset(0x1A0)] public GatheringPointObjectImplBase ObjectImplBase;
10-
[FieldOffset(0x1C0)] public GatheringPointObjectImpl ObjectImpl;
11-
[FieldOffset(0x1E0)] public GatheringPointObjectImplBase* Impl;
9+
[FieldOffset(0x190)] public GatheringPointObjectImplBase ObjectImplBase;
10+
[FieldOffset(0x1B0)] public GatheringPointObjectImpl ObjectImpl;
11+
[FieldOffset(0x1D0)] public GatheringPointObjectImplBase* Impl;
1212

1313
[GenerateInterop(isInherited: true)]
1414
[StructLayout(LayoutKind.Explicit, Size = 0x20)]

‎FFXIVClientStructs/FFXIV/Client/Game/Object/MJIObject.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Object;
88
[Inherits<GameObject>]
99
[StructLayout(LayoutKind.Explicit, Size = 0x230)]
1010
public unsafe partial struct MJIObject {
11-
[FieldOffset(0x1B8)] public Utf8String SgbPath;
12-
[FieldOffset(0x23C)] public uint EObjNameId;
11+
[FieldOffset(0x1A8)] public Utf8String SgbPath;
12+
[FieldOffset(0x22C)] public uint EObjNameId;
1313
}

‎FFXIVClientStructs/FFXIV/Client/Graphics/Render/Manager.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ public unsafe partial struct Manager {
99
[StaticAddress("48 8B 05 ?? ?? ?? ?? 48 8D 4D 80", 3, true)]
1010
public static partial Manager* Instance();
1111

12-
[FieldOffset(0x8), FixedSizeArray] internal FixedSizeArray69<View> _views;
13-
[FieldOffset(0x1A6A8)] public JobSystem ManagerJobSystem; // Client::Graphics::JobSystem<Client::Graphics::Render::Manager>
14-
[FieldOffset(0x1A768)] public PostBoneDeformerBaseUpdater PostBoneDeformerBaseUpdater; // Client::Graphics::Render::Updater<Client::Graphics::Render::PostBoneDeformerBase>
15-
[FieldOffset(0x227B8)] public ShaderManager ShaderManager;
16-
[FieldOffset(0x22990)] public ModelRenderer ModelRenderer;
17-
[FieldOffset(0x22D10)] public BGInstancingRenderer BGInstancingRenderer;
18-
[FieldOffset(0x43AF0)] public TerrainRenderer TerrainRenderer;
12+
[FieldOffset(0x8), FixedSizeArray] internal FixedSizeArray87<View> _views;
13+
[FieldOffset(0x87F8)] public JobSystem ManagerJobSystem; // Client::Graphics::JobSystem<Client::Graphics::Render::Manager>
14+
[FieldOffset(0x88B8)] public PostBoneDeformerBaseUpdater PostBoneDeformerBaseUpdater; // Client::Graphics::Render::Updater<Client::Graphics::Render::PostBoneDeformerBase>
15+
[FieldOffset(0x10908)] public ShaderManager ShaderManager;
16+
[FieldOffset(0x10AD8)] public ModelRenderer ModelRenderer;
17+
[FieldOffset(0x10F00)] public BGInstancingRenderer BGInstancingRenderer;
18+
[FieldOffset(0x31D40)] public TerrainRenderer TerrainRenderer;
1919
// [FieldOffset(0x47F20)] public UnknownRenderer UnknownRenderer; // 0x230 BGAmbient something?
20-
[FieldOffset(0x48150)] public WaterRenderer WaterRenderer;
21-
[FieldOffset(0x486A0)] public VerticalFogRenderer VerticalFogRenderer;
20+
[FieldOffset(0x363A0)] public WaterRenderer WaterRenderer;
21+
[FieldOffset(0x368F0)] public VerticalFogRenderer VerticalFogRenderer;
2222

2323
// [FieldOffset(0x487F8)] public UnknownRenderer1 UnknownRenderer1; // 0xE0
2424
// [FieldOffset(0x488E0)] public UnknownRenderer2 UnknownRenderer2; // 0x7A10 Grass?
@@ -32,7 +32,7 @@ public unsafe partial struct Manager {
3232
// [FieldOffset(0x50CF0)] public Unk1 Unk1; // 0x40
3333
// [FieldOffset(0x50D30)] public Unk2 Unk2; // 0x40
3434

35-
// TODO check and update for 7.0
35+
// TODO check and update for 7.2
3636
public enum RenderViews : uint {
3737
OmniShadow0 = 0,
3838
OmniShadow1,

‎FFXIVClientStructs/FFXIV/Client/Graphics/Render/SubView.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
namespace FFXIVClientStructs.FFXIV.Client.Graphics.Render;
55

66
// Client::Graphics::Render::SubView
7-
[StructLayout(LayoutKind.Explicit, Size = 0x60)]
7+
[StructLayout(LayoutKind.Explicit, Size = 0x18)]
88
public unsafe struct SubView {
9-
// TODO check and update for 7.0
9+
// TODO check and update for 7.2
1010
[FieldOffset(0x8)] public uint Flags;
11-
[FieldOffset(0x10)] public Rectangle ViewportRegion;
12-
[FieldOffset(0x20)] public Camera* Camera;
13-
[FieldOffset(0x28)] public Texture* RenderTarget_1;
14-
[FieldOffset(0x30)] public Texture* RenderTarget_2;
15-
[FieldOffset(0x38)] public Texture* RenderTarget_3;
16-
[FieldOffset(0x40)] public Texture* RenderTarget_4;
17-
[FieldOffset(0x48)] public uint RenderTargetUsedCount;
18-
[FieldOffset(0x58)] public Texture* DepthStencil;
11+
//[FieldOffset(0x10)] public Rectangle ViewportRegion;
12+
[FieldOffset(0x10)] public Camera* Camera;
13+
//[FieldOffset(0x28)] public Texture* RenderTarget_1;
14+
//[FieldOffset(0x30)] public Texture* RenderTarget_2;
15+
//[FieldOffset(0x38)] public Texture* RenderTarget_3;
16+
//[FieldOffset(0x40)] public Texture* RenderTarget_4;
17+
//[FieldOffset(0x48)] public uint RenderTargetUsedCount;
18+
//[FieldOffset(0x58)] public Texture* DepthStencil;
1919
}

‎FFXIVClientStructs/FFXIV/Client/Graphics/Render/View.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ namespace FFXIVClientStructs.FFXIV.Client.Graphics.Render;
66
[GenerateInterop]
77
[StructLayout(LayoutKind.Explicit, Size = 0x190)]
88
public unsafe partial struct View {
9+
// TODO check and update for 7.2
910
[FieldOffset(0x8)] public uint Flags;
10-
[FieldOffset(0x10)] public Rectangle CanvasRegion;
11-
[FieldOffset(0x20), FixedSizeArray] internal FixedSizeArray16<SubView> _subViews;
11+
//[FieldOffset(0x10)] public Rectangle CanvasRegion;
12+
[FieldOffset(0x10), FixedSizeArray] internal FixedSizeArray16<SubView> _subViews;
1213
}

‎FFXIVClientStructs/FFXIV/Client/Graphics/Scene/Human.cs

+37-37
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,37 @@ namespace FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
1515
[Inherits<CharacterBase>]
1616
[StructLayout(LayoutKind.Explicit, Size = 0xCD0)]
1717
public unsafe partial struct Human {
18-
[FieldOffset(0xA10)] public CustomizeData Customize;
19-
[FieldOffset(0xA2C)] public uint SlotNeedsUpdateBitfield;
20-
[FieldOffset(0xA30)] public EquipmentModelId Head;
21-
[FieldOffset(0xA38)] public EquipmentModelId Top;
22-
[FieldOffset(0xA40)] public EquipmentModelId Arms;
23-
[FieldOffset(0xA48)] public EquipmentModelId Legs;
24-
[FieldOffset(0xA50)] public EquipmentModelId Feet;
25-
[FieldOffset(0xA58)] public EquipmentModelId Ear;
26-
[FieldOffset(0xA60)] public EquipmentModelId Neck;
27-
[FieldOffset(0xA68)] public EquipmentModelId Wrist;
28-
[FieldOffset(0xA70)] public EquipmentModelId RFinger;
29-
[FieldOffset(0xA78)] public EquipmentModelId LFinger;
30-
[FieldOffset(0xA80)] public EquipmentModelId Glasses0;
31-
[FieldOffset(0xA88)] public EquipmentModelId Glasses1;
32-
[FieldOffset(0xA90)] public ushort RaceSexId; // cXXXX ID (0101, 0201, etc)
33-
[FieldOffset(0xA92)] public ushort HairId; // hXXXX
34-
[FieldOffset(0xA94)] public ushort FaceId; // fXXXX ID
35-
[FieldOffset(0xA96)] public ushort TailEarId; // tXXXX/zXXXX(viera)
36-
[FieldOffset(0xA98)] public ushort FurId;
18+
[FieldOffset(0xA20)] public CustomizeData Customize;
19+
[FieldOffset(0xA3C)] public uint SlotNeedsUpdateBitfield;
20+
[FieldOffset(0xA40)] public EquipmentModelId Head;
21+
[FieldOffset(0xA48)] public EquipmentModelId Top;
22+
[FieldOffset(0xA50)] public EquipmentModelId Arms;
23+
[FieldOffset(0xA58)] public EquipmentModelId Legs;
24+
[FieldOffset(0xA60)] public EquipmentModelId Feet;
25+
[FieldOffset(0xA68)] public EquipmentModelId Ear;
26+
[FieldOffset(0xA70)] public EquipmentModelId Neck;
27+
[FieldOffset(0xA78)] public EquipmentModelId Wrist;
28+
[FieldOffset(0xA80)] public EquipmentModelId RFinger;
29+
[FieldOffset(0xA88)] public EquipmentModelId LFinger;
30+
[FieldOffset(0xA90)] public EquipmentModelId Glasses0;
31+
[FieldOffset(0xA98)] public EquipmentModelId Glasses1;
32+
[FieldOffset(0xAA0)] public ushort RaceSexId; // cXXXX ID (0101, 0201, etc)
33+
[FieldOffset(0xAA2)] public ushort HairId; // hXXXX
34+
[FieldOffset(0xAA4)] public ushort FaceId; // fXXXX ID
35+
[FieldOffset(0xAA6)] public ushort TailEarId; // tXXXX/zXXXX(viera)
36+
[FieldOffset(0xAA8)] public ushort FurId;
3737

38-
[FieldOffset(0xAE8), CExportIgnore] private nint _slotDecalBase;
39-
[FieldOffset(0xAE8)] public TextureResourceHandle* HeadDecal;
40-
[FieldOffset(0xAF0)] public TextureResourceHandle* TopDecal;
41-
[FieldOffset(0xAF8)] public TextureResourceHandle* ArmsDecal;
42-
[FieldOffset(0xB00)] public TextureResourceHandle* LegsDecal;
43-
[FieldOffset(0xB08)] public TextureResourceHandle* FeetDecal;
44-
[FieldOffset(0xB10)] public TextureResourceHandle* EarDecal;
45-
[FieldOffset(0xB18)] public TextureResourceHandle* NeckDecal;
46-
[FieldOffset(0xB20)] public TextureResourceHandle* WristDecal;
47-
[FieldOffset(0xB28)] public TextureResourceHandle* RFingerDecal;
48-
[FieldOffset(0xB30)] public TextureResourceHandle* LFingerDecal;
38+
[FieldOffset(0xAF8), CExportIgnore] private nint _slotDecalBase;
39+
[FieldOffset(0xAF8)] public TextureResourceHandle* HeadDecal;
40+
[FieldOffset(0xB00)] public TextureResourceHandle* TopDecal;
41+
[FieldOffset(0xB08)] public TextureResourceHandle* ArmsDecal;
42+
[FieldOffset(0xB10)] public TextureResourceHandle* LegsDecal;
43+
[FieldOffset(0xB18)] public TextureResourceHandle* FeetDecal;
44+
[FieldOffset(0xB20)] public TextureResourceHandle* EarDecal;
45+
[FieldOffset(0xB28)] public TextureResourceHandle* NeckDecal;
46+
[FieldOffset(0xB30)] public TextureResourceHandle* WristDecal;
47+
[FieldOffset(0xB38)] public TextureResourceHandle* RFingerDecal;
48+
[FieldOffset(0xB40)] public TextureResourceHandle* LFingerDecal;
4949

5050

5151
public ref TextureResourceHandle* SlotDecal(int slot) {
@@ -57,20 +57,20 @@ public unsafe partial struct Human {
5757
public Span<Pointer<TextureResourceHandle>> SlotDecalsSpan
5858
=> new(Unsafe.AsPointer(ref _slotDecalBase), 10);
5959

60-
[FieldOffset(0xBE0)] public ConstantBuffer* CustomizeParameterCBuffer;
61-
[FieldOffset(0xBE8)] public ConstantBuffer* DecalColorCBuffer;
60+
[FieldOffset(0xBF0)] public ConstantBuffer* CustomizeParameterCBuffer;
61+
[FieldOffset(0xBF8)] public ConstantBuffer* DecalColorCBuffer;
6262

6363
public ConstantBufferPointer<CustomizeParameter> CustomizeParameterTypedCBuffer
6464
=> new(CustomizeParameterCBuffer);
6565
public ConstantBufferPointer<Vector4> DecalColorTypedCBuffer
6666
=> new(DecalColorCBuffer);
6767

68-
[FieldOffset(0xBF0)] public TextureResourceHandle* Decal;
69-
[FieldOffset(0xBF8)] public TextureResourceHandle* LegacyBodyDecal;
70-
[FieldOffset(0xC00)] public Texture* FreeCompanyCrest;
71-
[FieldOffset(0xC08)] public uint SlotFreeCompanyCrestBitfield; // & 0x001 for slot 0, up to & 0x200 for slot 9
68+
[FieldOffset(0xC00)] public TextureResourceHandle* Decal;
69+
[FieldOffset(0xC08)] public TextureResourceHandle* LegacyBodyDecal;
70+
[FieldOffset(0xC10)] public Texture* FreeCompanyCrest;
71+
[FieldOffset(0xC18)] public uint SlotFreeCompanyCrestBitfield; // & 0x001 for slot 0, up to & 0x200 for slot 9
7272

73-
[FieldOffset(0xC40)] public byte* ChangedEquipData;
73+
[FieldOffset(0xC50)] public byte* ChangedEquipData;
7474

7575
[MemberFunction("E8 ?? ?? ?? ?? 48 8B 8B ?? ?? ?? ?? 0F 57 FF")]
7676
public partial byte SetupVisor(ushort modelId, bool visorState);

‎FFXIVClientStructs/FFXIV/Client/Graphics/Scene/Monster.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ namespace FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
1010
[Inherits<CharacterBase>]
1111
[StructLayout(LayoutKind.Explicit, Size = 0xA50)]
1212
public unsafe partial struct Monster {
13-
[FieldOffset(0xA10)] public ushort ModelSetId;
14-
[FieldOffset(0xA12)] public ushort SecondaryId;
15-
[FieldOffset(0xA14)] public ushort Variant;
13+
[FieldOffset(0xA20)] public ushort ModelSetId;
14+
[FieldOffset(0xA22)] public ushort SecondaryId;
15+
[FieldOffset(0xA24)] public ushort Variant;
1616

17-
[FieldOffset(0xA20)] public TextureResourceHandle* Decal;
17+
[FieldOffset(0xA30)] public TextureResourceHandle* Decal;
1818

1919
// Expects at least 8 bytes of data.
2020
[MemberFunction("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 0F 57 C0 48 8D 4C 24 ??")]

‎FFXIVClientStructs/FFXIV/Client/Graphics/Scene/Weapon.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ namespace FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
1111
[Inherits<CharacterBase>]
1212
[StructLayout(LayoutKind.Explicit, Size = 0xA60)]
1313
public unsafe partial struct Weapon {
14-
[FieldOffset(0xA10)] public ushort ModelSetId;
15-
[FieldOffset(0xA12)] public ushort SecondaryId;
16-
[FieldOffset(0xA14)] public ushort Variant;
17-
[FieldOffset(0xA16)] public byte Stain0;
18-
[FieldOffset(0xA17)] public byte Stain1;
19-
[FieldOffset(0xA1A)] public byte MaterialId;
20-
[FieldOffset(0xA1B)] public byte DecalId;
21-
[FieldOffset(0xA1E)] public byte VfxId;
14+
[FieldOffset(0xA20)] public ushort ModelSetId;
15+
[FieldOffset(0xA22)] public ushort SecondaryId;
16+
[FieldOffset(0xA24)] public ushort Variant;
17+
[FieldOffset(0xA26)] public byte Stain0;
18+
[FieldOffset(0xA27)] public byte Stain1;
19+
[FieldOffset(0xA2A)] public byte MaterialId;
20+
[FieldOffset(0xA2B)] public byte DecalId;
21+
[FieldOffset(0xA2E)] public byte VfxId;
2222

23-
[FieldOffset(0xA28)] public TextureResourceHandle* Decal;
24-
[FieldOffset(0xA30)] public Texture* FreeCompanyCrest;
25-
[FieldOffset(0xA38)] public uint SlotFreeCompanyCrestBitfield; // Only relevant bit is & 0x1
26-
[FieldOffset(0xA40)] public ChangedWeaponData* ChangedData;
23+
[FieldOffset(0xA38)] public TextureResourceHandle* Decal;
24+
[FieldOffset(0xA40)] public Texture* FreeCompanyCrest;
25+
[FieldOffset(0xA48)] public uint SlotFreeCompanyCrestBitfield; // Only relevant bit is & 0x1
26+
[FieldOffset(0xA50)] public ChangedWeaponData* ChangedData;
2727

2828
[StructLayout(LayoutKind.Explicit, Size = 0x06)] // Size unknown
2929
public struct ChangedWeaponData {

0 commit comments

Comments
 (0)