Skip to content

Commit 1faa785

Browse files
authored
Merge pull request aers#6 from aers/main
merge upstream changes
2 parents 638cd3e + b5a0b13 commit 1faa785

File tree

3 files changed

+27111
-8010
lines changed

3 files changed

+27111
-8010
lines changed

FFXIVClientStructs/FFXIV/Component/GUI/AtkComponentHoldButton.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,28 @@ namespace FFXIVClientStructs.FFXIV.Component.GUI;
1313
[GenerateInterop]
1414
[Inherits<AtkComponentButton>]
1515
[StructLayout(LayoutKind.Explicit, Size = 0x120)]
16-
public partial struct AtkComponentHoldButton : ICreatable {
16+
public unsafe partial struct AtkComponentHoldButton : ICreatable {
17+
[FieldOffset(0xF0)] public AtkResNode* ProgressResNode;
18+
[FieldOffset(0xF8)] public AtkImageNode* ProgressImageNode;
19+
[FieldOffset(0x100)] public bool IsTargetReached;
20+
[FieldOffset(0x101)] public bool IsEventFired; // seems to be a safety mechanism to prevent multiple events from firing at the same time
21+
22+
[FieldOffset(0x104)] public float Duration;
23+
[FieldOffset(0x108)] public float DecreaseRate;
24+
[FieldOffset(0x10C)] public ProgressState Progress;
25+
1726
[MemberFunction("40 53 48 83 EC 20 48 8B D9 E8 ?? ?? ?? ?? 48 8D 05 ?? ?? ?? ?? C7 83 ?? ?? ?? ?? ?? ?? ?? ?? 48 89 03 33 C0 48 89 83 ?? ?? ?? ?? 48 89 83 ?? ?? ?? ?? 66 89 83 ?? ?? ?? ?? 48 89 83 ?? ?? ?? ??")]
1827
public partial void Ctor();
28+
29+
[GenerateInterop]
30+
[StructLayout(LayoutKind.Explicit, Size = 0x10)]
31+
public partial struct ProgressState {
32+
[FieldOffset(0x00)] public float StartValue;
33+
[FieldOffset(0x04)] public float TargetValue;
34+
[FieldOffset(0x08)] public float CurrentValue;
35+
[FieldOffset(0x0C)] public float EndValue;
36+
37+
[MemberFunction("F3 0F 10 05 ?? ?? ?? ?? 0F 2F C1 F3 0F 11 51")]
38+
public partial void StartProgress(float currentValue, float targetValue, float endValue);
39+
}
1940
}

0 commit comments

Comments
 (0)