From 452ae48da09bc0f38a863716c90c8f45be569386 Mon Sep 17 00:00:00 2001 From: Haselnussbomber Date: Sun, 14 Dec 2025 16:59:05 +0100 Subject: [PATCH] Update to ImAnim 1.0.0 --- external/cimanim/cimanim.cpp | 1 + external/cimanim/cimanim.h | 1 + imgui/Dalamud.Bindings.ImAnim/ImAnim.cs | 7 ++++++- imgui/Dalamud.Bindings.ImAnim/ImAnimNative.cs | 3 +++ lib/ImAnim | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/external/cimanim/cimanim.cpp b/external/cimanim/cimanim.cpp index 5d1ae7920..7db4512f9 100644 --- a/external/cimanim/cimanim.cpp +++ b/external/cimanim/cimanim.cpp @@ -26,6 +26,7 @@ CIMGUI_API void c_iam_get_custom_ease(iam_ease_fn* pOut, int slot) { *pOut = i // Debug UI CIMGUI_API void c_iam_show_unified_inspector(bool* p_open) { iam_show_unified_inspector(p_open); } +CIMGUI_API void c_iam_show_debug_timeline(ImGuiID instance_id) { iam_show_debug_timeline(instance_id); } // Performance Profiler CIMGUI_API void c_iam_profiler_enable(bool enable) { iam_profiler_enable(enable); } diff --git a/external/cimanim/cimanim.h b/external/cimanim/cimanim.h index 9cc9ba967..51f8d2f8f 100644 --- a/external/cimanim/cimanim.h +++ b/external/cimanim/cimanim.h @@ -32,6 +32,7 @@ CIMGUI_API void c_iam_get_custom_ease(iam_ease_fn* pOut, int slot); // Debug UI CIMGUI_API void c_iam_show_unified_inspector(bool* p_open); +CIMGUI_API void c_iam_show_debug_timeline(ImGuiID instance_id); // Performance Profiler CIMGUI_API void c_iam_profiler_enable(bool enable); diff --git a/imgui/Dalamud.Bindings.ImAnim/ImAnim.cs b/imgui/Dalamud.Bindings.ImAnim/ImAnim.cs index d9ee556e5..3e4753a28 100644 --- a/imgui/Dalamud.Bindings.ImAnim/ImAnim.cs +++ b/imgui/Dalamud.Bindings.ImAnim/ImAnim.cs @@ -9,7 +9,7 @@ namespace Dalamud.Bindings.ImAnim; public static unsafe class ImAnim { public delegate void ClipCallback(uint instId, void* userData); // iam_clip_callback - public delegate void MarkerCallback(uint instId, uint markerId, float markerTime, void* userData); // iam_marker_callback + public delegate void MarkerCallback(uint instId, uint markerId, float markerTime, void* userData); // iam_marker_callback public delegate float EaseFn(float t); // iam_ease_fn public delegate float FloatResolver(void* userData); // iam_float_resolver @@ -108,6 +108,11 @@ public static unsafe class ImAnim pOpen = open == 1; } + public static void ShowDebugTimeline(uint instanceId) + { + ImAnimNative.ShowDebugTimeline(instanceId); + } + // Performance Profiler public static void ProfilerEnable(bool enable) diff --git a/imgui/Dalamud.Bindings.ImAnim/ImAnimNative.cs b/imgui/Dalamud.Bindings.ImAnim/ImAnimNative.cs index 3d2c47b40..ac28829b6 100644 --- a/imgui/Dalamud.Bindings.ImAnim/ImAnimNative.cs +++ b/imgui/Dalamud.Bindings.ImAnim/ImAnimNative.cs @@ -60,6 +60,9 @@ public static unsafe partial class ImAnimNative [LibraryImport(LibName, EntryPoint = "c_iam_show_unified_inspector")] public static partial void ShowUnifiedInspector(byte* pOpen = null); + [LibraryImport(LibName, EntryPoint = "c_iam_show_debug_timeline")] + public static partial void ShowDebugTimeline(uint instance_id); + // Performance Profiler [LibraryImport(LibName, EntryPoint = "c_iam_profiler_enable")] diff --git a/lib/ImAnim b/lib/ImAnim index d889a81d4..6f5cacba0 160000 --- a/lib/ImAnim +++ b/lib/ImAnim @@ -1 +1 @@ -Subproject commit d889a81d46afa6acf8c568d7b417945715e4acc3 +Subproject commit 6f5cacba008374a47e44fdb89ce0d4fffd340e03