From f020c2ceba5b6dbf606ad2f00602163a3ea8094c Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 11 Jul 2019 14:29:42 +0200 Subject: [PATCH] [cpp] Closes #1404, add define SPINE_USE_STD_FUNCTION. When set, the animation state callback can be a std::function. --- spine-cpp/spine-cpp/include/spine/AnimationState.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/spine-cpp/include/spine/AnimationState.h index f2d3e9d57..51fb24a45 100644 --- a/spine-cpp/spine-cpp/include/spine/AnimationState.h +++ b/spine-cpp/spine-cpp/include/spine/AnimationState.h @@ -37,6 +37,10 @@ #include #include +#ifdef SPINE_USE_STD_FUNCTION +#include +#endif + namespace spine { enum EventType { EventType_Start, @@ -55,9 +59,13 @@ namespace spine { class AnimationStateData; class Skeleton; class RotateTimeline; - - typedef void (*AnimationStateListener) (AnimationState* state, EventType type, TrackEntry* entry, Event* event); +#ifdef SPINE_USE_STD_FUNCTION + typedef std::function AnimationStateListener; +#else + typedef void (*AnimationStateListener) (AnimationState* state, EventType type, TrackEntry* entry, Event* event); +#endif + /// Abstract class to inherit from to create a callback object class SP_API AnimationStateListenerObject { public: