Merge remote-tracking branch 'upstream/main'

Author: AtmoOmen

FFXIVClientStructs/FFXIV/Client/Game/Character/Character.cs

@@ -31,6 +31,7 @@ public unsafe partial struct Character {
 
     // 0x1AA8: start of some substructure
     [FieldOffset(0x1B28)] public ModelContainer ModelContainer;
+    [FieldOffset(0x1B80)] public RepresentationContainer RepresentationContainer;
 
     /// <remarks> Instance ID of an Event NPC. Used by QuestEventHandler. Seen for Event NPCs that turn into Battle NPCs (during quests, for example.) </remarks>
     [FieldOffset(0x1BC0)] public uint EventNpcInstanceId;

FFXIVClientStructs/FFXIV/Client/Game/Character/RepresentationContainer.cs

@@ -0,0 +1,22 @@
+namespace FFXIVClientStructs.FFXIV.Client.Game.Character;
+
+// Client::Game::Character::RepresentationContainer
+//   Client::Game::Character::ContainerInterface
+[GenerateInterop]
+[Inherits<ContainerInterface>]
+[StructLayout(LayoutKind.Explicit, Size = 0x30)]
+public unsafe partial struct RepresentationContainer {
+    // not 100% on these
+    // 1 = Normal
+    // 2 = (Skips everything??)
+    // 3 = Blacklisted (using NameOverride)
+    // 4 = Alliance Member, Friend, in Custom Match or in Duel
+    // 5 = Cross-realm Party Member
+    [FieldOffset(0x10)] public byte NameType;
+
+    [FieldOffset(0x18)] public Utf8String* NameOverride; // "Unknown"
+    [FieldOffset(0x20)] public float UpdateTimer;
+    [FieldOffset(0x24)] private byte Unk24;
+    [FieldOffset(0x25)] private ushort Unk25; // some flags based on Status
+    [FieldOffset(0x28)] private byte Unk28; // some flags for Scheduler
+}

FFXIVClientStructs/FFXIV/Client/Game/Network/ActorCastPacket.cs

@@ -0,0 +1,16 @@
+namespace FFXIVClientStructs.FFXIV.Client.Game.Network;
+
+[GenerateInterop]
+[StructLayout(LayoutKind.Explicit, Size = 0x20)]
+public partial struct ActorCastPacket {
+    [FieldOffset(0x00)] public ushort SpellId;
+    [FieldOffset(0x02)] public byte ActionType;
+    [FieldOffset(0x03)] public byte OmenDelay; // The value gets divided by 10.0f
+    [FieldOffset(0x04)] public uint ActionId;
+    [FieldOffset(0x08)] public float CastTime;
+    [FieldOffset(0x0C)] public uint TargetEntityId;
+    [FieldOffset(0x10)] public ushort RotationInt; // Quantized Rotation
+    [FieldOffset(0x12)] public bool Interruptible;
+    [FieldOffset(0x14)] public uint BallistaEntityId;
+    [FieldOffset(0x18), FixedSizeArray] internal FixedSizeArray3<ushort> _positionInt; // Quantized Position
+}

FFXIVClientStructs/FFXIV/Client/Game/Object/EventObject.cs

@@ -8,6 +8,8 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Object;
 public partial struct EventObject {
     [FieldOffset(0x1A0), CExporterExcel("EObj")] public nint EObjRowPtr;
     [FieldOffset(0x1A8), CExporterExcel("ExportedSG")] public nint ExportedSGRowPtr;
+    [FieldOffset(0x1B2)] public ushort SharedTimelineState; // ActorControl category 0x199 (SetSharedTimelineState) sets this field
+    [FieldOffset(0x1B8)] public byte Flags;
 
     [MemberFunction("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 4D 85 F6 0F 84 ?? ?? ?? ?? 8B 44 24 70 BE ?? ?? ?? ??")]
     public partial void PlayAnimation(uint entityId, uint actionId, ulong unknown);

FFXIVClientStructs/FFXIV/Client/Game/WKS/WKSMissionModule.cs

@@ -20,8 +20,8 @@ public unsafe partial struct MissionState {
         /// <remarks> RowId of WKSMissionUnit sheet. </remarks>
         [FieldOffset(0x00)] public ushort MissionUnitRowId;
 
-        [FieldOffset(0x0C)] public ushort Score; // TODO: uint
-
+        [FieldOffset(0x0C), Obsolete("Use ScoreUInt", true)] public ushort Score;
+        [FieldOffset(0x0C)] public uint ScoreUInt; // TODO: change name back to Score...
         [FieldOffset(0x10)] public MissionRank Rank;
         [FieldOffset(0x14)] private byte Unk14; // bool? status?
 

FFXIVClientStructs/FFXIV/Client/Graphics/Kernel/Context.cs

@@ -0,0 +1,32 @@
+namespace FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
+
+/// <summary>
+/// Records rendering commands to be executed later by the <see cref="ImmediateContext"/>.
+/// </summary>
+/// <remarks>
+/// Threads have their own Context, accessed via <see cref="ThreadLocals.GraphicsKernelContext"/>.
+/// </remarks>
+[GenerateInterop]
+[StructLayout(LayoutKind.Explicit, Size = 0x2F78)]
+public unsafe partial struct Context {
+    [BitField<byte>(nameof(CurrentSubViewIndex), 28, 4)]
+    [FieldOffset(0x008)] private uint _flags;
+    [FieldOffset(0x00C)] public int ViewIndex;
+    [FieldOffset(0x010)] public void* CommandAllocationBase;
+
+    [FieldOffset(0x840)] public ulong CommandAllocationUsedSize;
+    [FieldOffset(0x848)] public ulong AllocationBase;
+    [FieldOffset(0x850)] public ulong AllocationUsedSize;
+
+    [MemberFunction("4C 8B D1 4C 8D 42 0F")]
+    public partial void* AllocateCommand(ulong size);
+
+    [MemberFunction("4C 8B C9 4D 8D 50 0F")]
+    public partial void* AllocateSpecificCommand(RenderCommandType commandType, ulong size);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 8B 6E 6C")]
+    public partial void PushBackCommand(void* command);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 8D 56 38")]
+    public partial void SetRenderTargets(int renderTargetCount, Texture** renderTargetTextures, Texture* depthStencilTexture, short a4, short a5, short a6, short a7); // last params believed to be a rectangle
+}

FFXIVClientStructs/FFXIV/Client/Graphics/Kernel/Device.cs

@@ -1,3 +1,5 @@
+using FFXIVClientStructs.FFXIV.Common.Math;
+
 namespace FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 
 // Client::Graphics::Kernel::Device
@@ -10,7 +12,7 @@ public unsafe partial struct Device {
     [StaticAddress("48 8B 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 80 7B 08 00", 3, isPointer: true)]
     public static partial Device* Instance();
 
-    [FieldOffset(0x8)] public void* ContextArray; // Client::Graphics::Kernel::Context array
+    [FieldOffset(0x8)] public void* ContextArray; // TODO: We have a struct for this now (breaking change)
     [FieldOffset(0x10)] public void* RenderThread; // Client::Graphics::Kernel::RenderThread
     [FieldOffset(0x28)] private CallbackManager* Unk28;
     [FieldOffset(0x30)] private CallbackManager* Unk30;
@@ -71,7 +73,7 @@ public unsafe partial struct Device {
     // Client::Graphics::Kernel::Device::CallbackManager
     [GenerateInterop]
     [StructLayout(LayoutKind.Explicit, Size = 0x40)]
-    public unsafe partial struct CallbackManager {
+    public partial struct CallbackManager {
         [FieldOffset(0x8)] public void* Lock; // CRITICAL_SECTION
 
         [FieldOffset(0x30)] public Entry* Entries;
@@ -89,7 +91,7 @@ public unsafe partial struct CallbackManager {
 
         // Unsure about the names of things inside CallbackManager though
         [StructLayout(LayoutKind.Explicit, Size = 0x10)]
-        public unsafe partial struct Entry {
+        public struct Entry {
             [FieldOffset(0x0)] public void* Function;
             [FieldOffset(0x8)] public void* Context;
         }
@@ -103,44 +105,68 @@ public unsafe struct RenderCommandBufferGroup {
     [FieldOffset(0x8), CExporterUnion("RenderCommand")] public RenderCommandSetTarget* SetTargetCommand;
     [FieldOffset(0x8), CExporterUnion("RenderCommand")] public RenderCommandViewport* ViewportCommand;
     [FieldOffset(0x8), CExporterUnion("RenderCommand")] public RenderCommandScissorsRect* ScissorsRectCommand;
-    [FieldOffset(0x8), CExporterUnion("RenderCommand")] public RenderCommandClearDepth* ClearDepthCommand;
+    [FieldOffset(0x8), CExporterUnion("RenderCommand"), Obsolete("Use ClearCommand.")] public RenderCommandClearDepth* ClearDepthCommand;
+    [FieldOffset(0x8), CExporterUnion("RenderCommand")] public RenderCommandClear* ClearCommand;
+}
+
+public enum RenderCommandType : int {
+    SetTarget = 0,
+    Viewport = 1,
+    MultiViewport = 2,
+    ScissorRect = 3,
+    Clear = 4,
 }
 
 [GenerateInterop]
 [StructLayout(LayoutKind.Explicit, Size = 0x40)]
 public unsafe partial struct RenderCommandSetTarget {
-    [FieldOffset(0x0)] public int SwitchType;
+    [FieldOffset(0x0)] public RenderCommandType Type;
     [FieldOffset(0x4)] public int RenderTargetCount;
-    [FieldOffset(0x8), FixedSizeArray] internal FixedSizeArray4<Pointer<Texture>> _renderTargets;
-    [FieldOffset(0x28)] public Texture* DepthBuffer;
+    [FieldOffset(0x8), FixedSizeArray] internal FixedSizeArray5<Pointer<Texture>> _renderTargets;
+    [FieldOffset(0x30)] public Texture* DepthBuffer;
     [FieldOffset(0x38)] private float Unk0;
     [FieldOffset(0x3C)] private float Unk1;
+
+    [FieldOffset(0x0), Obsolete("Use Type instead.")] public int SwitchType;
 }
 
-[GenerateInterop]
 [StructLayout(LayoutKind.Explicit, Size = 0x20)]
-public unsafe partial struct RenderCommandViewport {
-    [FieldOffset(0x0)] public int SwitchType;
-    [FieldOffset(0x04)] public int TopLeftY;
-    [FieldOffset(0x08)] public int TopLeftX;
-    [FieldOffset(0x0C)] public int BottomRightY;
-    [FieldOffset(0x10)] public int BottomRightX;
+public struct RenderCommandViewport {
+    [FieldOffset(0x0)] public RenderCommandType Type;
+    [FieldOffset(0x4)] public IntRectangle ViewportRect;
     [FieldOffset(0x14)] public float MinDepth;
     [FieldOffset(0x18)] public float MaxDepth;
+
+    [FieldOffset(0x0), Obsolete("Use Type instead.")] public int SwitchType;
+    [FieldOffset(0x04), Obsolete("Use ViewportRect.Left.")] public int TopLeftY;
+    [FieldOffset(0x08), Obsolete("Use ViewportRect.Top.")] public int TopLeftX;
+    [FieldOffset(0x0C), Obsolete("Use ViewportRect.Right.")] public int BottomRightY;
+    [FieldOffset(0x10), Obsolete("Use ViewportRect.Bottom.")] public int BottomRightX;
 }
 
 [GenerateInterop]
-[StructLayout(LayoutKind.Explicit, Size = 0x20)]
-public unsafe partial struct RenderCommandScissorsRect {
+[StructLayout(LayoutKind.Explicit, Size = 0x80)]
+public partial struct RenderCommandMultiViewport {
     [FieldOffset(0x0)] public int SwitchType;
-    [FieldOffset(0x4)] public int Left;
-    [FieldOffset(0x8)] public int Top;
-    [FieldOffset(0xC)] public int Right;
-    [FieldOffset(0x10)] public int Bottom;
+    [FieldOffset(0x4), FixedSizeArray] internal FixedSizeArray5<IntRectangle> _viewportRects;
+    [FieldOffset(0x54), FixedSizeArray] internal FixedSizeArray5<float> _minDepths;
+    [FieldOffset(0x68), FixedSizeArray] internal FixedSizeArray5<float> _maxDepths;
+    [FieldOffset(0x7C)] public uint ViewportCount;
 }
 
-[GenerateInterop]
-[StructLayout(LayoutKind.Explicit, Size = 0x40)]
+[StructLayout(LayoutKind.Explicit, Size = 0x20)]
+public struct RenderCommandScissorsRect {
+    [FieldOffset(0x0)] public RenderCommandType Type;
+    [FieldOffset(0x4)] public IntRectangle ScissorRect;
+
+    [FieldOffset(0x0), Obsolete("Use Type instead.")] public int SwitchType;
+    [FieldOffset(0x4), Obsolete("Use ScissorRect.Left.")] public int Left;
+    [FieldOffset(0x8), Obsolete("Use ScissorRect.Top.")] public int Top;
+    [FieldOffset(0xC), Obsolete("Use ScissorRect.Right.")] public int Right;
+    [FieldOffset(0x10), Obsolete("Use ScissorRect.Bottom.")] public int Bottom;
+}
+
+[StructLayout(LayoutKind.Explicit, Size = 0x40), Obsolete("Use RenderCommandClear.")]
 public unsafe partial struct RenderCommandClearDepth {
     [FieldOffset(0x0)] public int SwitchType;
     [FieldOffset(0x4)] public float ClearType;
@@ -158,3 +184,25 @@ public unsafe partial struct RenderCommandClearDepth {
     [FieldOffset(0x34)] public float MinZ;
     [FieldOffset(0x38)] public float MaxZ;
 }
+
+public enum ClearFlags : uint {
+    None = 0,
+    Color = 1 << 0,
+    Depth = 1 << 1,
+    Stencil = 1 << 2,
+}
+
+[StructLayout(LayoutKind.Explicit, Size = 0x38)]
+public unsafe struct RenderCommandClear {
+    [FieldOffset(0x0)] public RenderCommandType Type;
+    [FieldOffset(0x4)] public ClearFlags ClearFlags;
+    [FieldOffset(0x8)] public float ColorR;
+    [FieldOffset(0xC)] public float ColorG;
+    [FieldOffset(0x10)] public float ColorB;
+    [FieldOffset(0x14)] public float ColorA;
+    [FieldOffset(0x18)] public float ClearDepth;
+    [FieldOffset(0x1C)] public byte ClearStencil;
+    [FieldOffset(0x1D)] public byte StencilReference;
+    [FieldOffset(0x20)] public IntRectangle* ClearRectanglePtr; // optional, generally points at ClearRectangle if set
+    [FieldOffset(0x28)] public IntRectangle ClearRectangle;
+}

FFXIVClientStructs/FFXIV/Client/Graphics/Kernel/ImmediateContext.cs

@@ -1,3 +1,5 @@
+using FFXIVClientStructs.FFXIV.Common.Math;
+
 namespace FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 
 // Client::Graphics::Kernel::ImmediateContext
@@ -8,10 +10,86 @@ namespace FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 public unsafe partial struct ImmediateContext {
     // Offset 0 is ID3D11DeviceContext
 
-    // <remark>
-    // Reset and assigned each rendered frame from Device->SwapChain->BackBuffer
-    // </remark>
+    [FieldOffset(0x08)] public Rectangle CurrentScissorRect;
+
+    [Obsolete("Not necessarily the backbuffer, just the current primary render target. Prefer CurrentRenderTargets.")]
     [FieldOffset(0x28)] public Texture* BackBufferReference;
+    /// <summary>
+    /// The currently bound render targets.
+    /// </summary>
+    [FieldOffset(0x28)] internal FixedSizeArray5<Pointer<Texture>> _currentRenderTargets;
+    /// <summary>
+    /// The currently bound depth stencil buffer, if any.
+    /// </summary>
+    [FieldOffset(0x50)] public Texture* CurrentDepthStencilBuffer;
+
+    [FieldOffset(0xAC)] public uint CurrentDepthState; // The 5 bits of depth state in PackedDepthStencilDesc with the stencil fields masked out
+    [FieldOffset(0xB0)] public PackedDepthStencilDesc CurrentStencilState; // With the depth fields masked out
+    // 0xC8: InputLayoutDesc
+
+    [FieldOffset(0xD0)] public VertexShader* CurrentVertexShader;
+    [FieldOffset(0x1B8)] public PixelShader* CurrentPixelShader;
+
+    // Certain types of complex clearing needs to be done by manually drawing to the render targets & depth buffer.
+    [FieldOffset(0x700)] public VertexShader* ManualClearQuadVertexShader;
+    [FieldOffset(0x708)] public PixelShader* ManualClearQuadPixelShader;
+    // 0x710: ManualClearQuad???
+    // 0x718: ManualClearQuadInputLayoutDesc
+    [FieldOffset(0x730)] public GeometryShader* CurrentGeometryShader;
+    [FieldOffset(0xB20)] public HullShader* CurrentHullShader;
+
+    [FieldOffset(0xBE8), CExporterTypeForce("ID3D11DeviceContext*", true)] public void* D3D11DeviceContext;
+
+    [FieldOffset(0xF10)] public DomainShader* CurrentDomainShader;
+
+    [FieldOffset(0x17B3)] public byte BlendStateFlag; // Might be a bool to force creation of an underlying ID3D11BlendState*
+    [FieldOffset(0x17B4)] public PackedBlendStateDesc CurrentBlendState;
+    [FieldOffset(0x17B8), CExporterTypeForce("ID3D11DeviceContext*", true)] public void* D3D11DeviceContext_2;
+
+    //[FieldOffset(0x1D70)] public InputLayout* CurrentInputLayout;
+    [FieldOffset(0x17D8), CExporterTypeForce("D3D11_PRIMITIVE_TOPOLOGY", true)] public int CurrentPrimitiveTopology;
+
+    [MemberFunction("E8 ?? ?? ?? ?? 49 8D 47 58")]
+    public partial void SetBlendState(PackedBlendStateDesc blendState);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 41 8B 56 1C 48 8B CE")]
+    public partial void SetDepthStencilState(byte obfuscatedDepthState, PackedDepthStencilDesc stencilState);
+
+    // Along with the given packed rasterizer state, the following constant values are also used:
+    // FrontCounterClockwise = true
+    // DepthClipEnable = true
+    // DepthBiasClamp = 100.0f
+    // AntialiasedLineEnable = false
+    [MemberFunction("E8 ?? ?? ?? ?? 49 8B 46 20 48 8B CE")]
+    public partial void SetRasterizerState(PackedRasterizerStateDesc rasterizerState);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 4D 8B 46 68")]
+    public partial void SetVertexShader(VertexShader* vertexShader, void** constantBuffers);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 4D 8B 46 78")]
+    public partial void SetPixelShader(PixelShader* pixelShader, void** constantBuffers);
+
+    [MemberFunction("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 8B 57 7C")]
+    public partial void SetViewport(IntRectangle* viewportRectangle, float minDepth, float maxDepth);
+
+    [MemberFunction("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 48 8B D7 48 8B CB E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 48 83 7F")]
+    public partial void SetMultiViewports(uint viewportCount, IntRectangle* viewports, float* minDepths, float* maxDepths);
+
+    [MemberFunction("E9 ?? ?? ?? ?? 48 8B 4A 10")]
+    public partial void SetDefaultState();
+
+    [MemberFunction("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 48 83 7F ?? ?? 0F 84 ?? ?? ?? ?? 48 83 7F")]
+    public partial void DoClearCommandViaDraw(RenderCommandClear* clearCommand);
+
+    [MemberFunction("48 89 6C 24 ?? 56 48 83 EC 40 48 83 7A")] // inlined in some places
+    public partial void DoClearCommand(RenderCommandClear* clearCommand);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 48 8B 4B 30 FF 15")]
+    public partial void ProcessCommands(RenderCommandBufferGroup* renderCommands, uint renderCommandCount);
+
+    [MemberFunction("E8 ?? ?? ?? ?? 48 8B 7B 18 45 33 FF")]
+    public partial void PreprocessCommands(RenderCommandBufferGroup* renderCommands, uint renderCommandCount);
 
-    [FieldOffset(0xBE8)] public void* D3D11DeviceContext;
+    [MemberFunction("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 0F B6 83 ?? ?? ?? ?? 3C 01 73 70")]
+    public partial void ExecuteCommands();
 }