From 76a830c86c49a8e3ef730c2a8864d3ec07173781 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Fri, 29 Aug 2025 15:27:40 +0200 Subject: [PATCH] [c] Remove track entry and animation state clear listener functions --- spine-c/src/extensions.cpp | 12 --------- spine-c/src/extensions.h | 4 --- .../spine_dart_bindings_generated.dart | 26 ------------------- spine-glfw/example/main.cpp | 19 +++++++------- 4 files changed, 10 insertions(+), 51 deletions(-) diff --git a/spine-c/src/extensions.cpp b/spine-c/src/extensions.cpp index 901a4f4f9..3cb76d63c 100644 --- a/spine-c/src/extensions.cpp +++ b/spine-c/src/extensions.cpp @@ -582,20 +582,8 @@ void spine_animation_state_set_listener(spine_animation_state state, spine_anima _state->setListener((AnimationStateListener) listener, user_data); } -void spine_animation_state_clear_listener(spine_animation_state state) { - if (!state) return; - AnimationState *_state = (AnimationState *) state; - _state->setListener((AnimationStateListener) nullptr, nullptr); -} - void spine_track_entry_set_listener(spine_track_entry entry, spine_animation_state_listener listener, void *user_data) { if (!entry) return; TrackEntry *_entry = (TrackEntry *) entry; _entry->setListener((AnimationStateListener) listener, user_data); -} - -void spine_track_entry_clear_listener(spine_track_entry entry) { - if (!entry) return; - TrackEntry *_entry = (TrackEntry *) entry; - _entry->setListener((AnimationStateListener) nullptr, nullptr); } \ No newline at end of file diff --git a/spine-c/src/extensions.h b/spine-c/src/extensions.h index 448969813..6d9fb5322 100644 --- a/spine-c/src/extensions.h +++ b/spine-c/src/extensions.h @@ -124,12 +124,8 @@ typedef void (*spine_animation_state_listener)(spine_animation_state state, spin SPINE_C_API void spine_animation_state_set_listener(spine_animation_state state, spine_animation_state_listener listener, void *user_data); -SPINE_C_API void spine_animation_state_clear_listener(spine_animation_state state); - SPINE_C_API void spine_track_entry_set_listener(spine_track_entry entry, spine_animation_state_listener listener, void *user_data); -SPINE_C_API void spine_track_entry_clear_listener(spine_track_entry entry); - #ifdef __cplusplus } #endif diff --git a/spine-flutter/lib/generated/spine_dart_bindings_generated.dart b/spine-flutter/lib/generated/spine_dart_bindings_generated.dart index 376d93c94..f32725d98 100644 --- a/spine-flutter/lib/generated/spine_dart_bindings_generated.dart +++ b/spine-flutter/lib/generated/spine_dart_bindings_generated.dart @@ -7857,19 +7857,6 @@ class SpineDartBindings { late final _spine_animation_state_set_listener = _spine_animation_state_set_listenerPtr .asFunction)>(); - void spine_animation_state_clear_listener( - spine_animation_state state, - ) { - return _spine_animation_state_clear_listener( - state, - ); - } - - late final _spine_animation_state_clear_listenerPtr = - _lookup>('spine_animation_state_clear_listener'); - late final _spine_animation_state_clear_listener = - _spine_animation_state_clear_listenerPtr.asFunction(); - void spine_track_entry_set_listener( spine_track_entry entry, spine_animation_state_listener listener, @@ -7889,19 +7876,6 @@ class SpineDartBindings { late final _spine_track_entry_set_listener = _spine_track_entry_set_listenerPtr .asFunction)>(); - void spine_track_entry_clear_listener( - spine_track_entry entry, - ) { - return _spine_track_entry_clear_listener( - entry, - ); - } - - late final _spine_track_entry_clear_listenerPtr = - _lookup>('spine_track_entry_clear_listener'); - late final _spine_track_entry_clear_listener = - _spine_track_entry_clear_listenerPtr.asFunction(); - spine_alpha_timeline spine_alpha_timeline_create( int frameCount, int bezierCount, diff --git a/spine-glfw/example/main.cpp b/spine-glfw/example/main.cpp index 20a70fec9..6dd37acfd 100644 --- a/spine-glfw/example/main.cpp +++ b/spine-glfw/example/main.cpp @@ -88,15 +88,16 @@ int main() { animationStateData.setDefaultMix(0.2f); AnimationState animationState(animationStateData); animationState.setAnimation(0, "portal", true); - animationState.addAnimation(0, "run", true, 0).setListener([](AnimationState *state, EventType type, TrackEntry *entry, Event *event, void *userData) { - SP_UNUSED(state); - SP_UNUSED(entry); - SP_UNUSED(event); - SP_UNUSED(userData); - if (type == EventType_Event) { - printf("Custom event fired: %s\n", event->getData().getName().buffer()); - } - }); + animationState.addAnimation(0, "run", true, 0) + .setListener([](AnimationState *state, EventType type, TrackEntry *entry, Event *event, void *userData) { + SP_UNUSED(state); + SP_UNUSED(entry); + SP_UNUSED(event); + SP_UNUSED(userData); + if (type == EventType_Event) { + printf("Custom event fired: %s\n", event->getData().getName().buffer()); + } + }); // Create the renderer and set the viewport size to match the window size. This sets up a // pixel perfect orthogonal projection for 2D rendering.