Fix spine::Animation & spine::Timeline can not release normally

cocos/spine/lib/spine-core.d.ts

@@ -47,11 +47,11 @@
         duration: number;
         name: string;
         timelines: Array<Timeline>;
         apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
         hasTimeline(id: number): boolean;
     }
     interface Timeline {
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
         getPropertyId(): number;
     }
     enum MixBlend {
@@ -94,7 +94,7 @@
         getCurveType(frameIndex: number): number;
         setCurve(frameIndex: number, cx1: number, cy1: number, cx2: number, cy2: number): void;
         getCurvePercent(frameIndex: number, percent: number): number;
         abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class RotateTimeline extends CurveTimeline {
         static ENTRIES: number;
@@ -106,7 +106,7 @@
         constructor(frameCount: number);
         getPropertyId(): number;
         setFrame(frameIndex: number, time: number, degrees: number): void;
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class TranslateTimeline extends CurveTimeline {
         static readonly ENTRIES: number;
@@ -114,17 +114,17 @@
         constructor(frameCount: number);
         getPropertyId(): number;
         setFrame(frameIndex: number, time: number, x: number, y: number): void;
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class ScaleTimeline extends TranslateTimeline {
         constructor(frameCount: number);
         getPropertyId(): number;
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class ShearTimeline extends TranslateTimeline {
         constructor(frameCount: number);
         getPropertyId(): number;
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class ColorTimeline extends CurveTimeline {
         static ENTRIES: number;
@@ -135,7 +135,7 @@
         getSlotIndex(): number;
         setSlotIndex(inValue: number): void;
         setFrame(frameIndex: number, time: number, r: number, g: number, b: number, a: number): void;
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class TwoColorTimeline extends CurveTimeline {
         static readonly ENTRIES: number;
@@ -146,7 +146,7 @@
         getSlotIndex(): number;
         setSlotIndex(inValue: number): void;
         setFrame(frameIndex: number, time: number, r: number, g: number, b: number, a: number, r2: number, g2: number, b2: number): void;
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class AttachmentTimeline implements Timeline {
         slotIndex: number;
@@ -159,7 +159,7 @@
         setSlotIndex(inValue: number): void;
         getAttachmentNames(): Array<string>;
         setFrame(frameIndex: number, time: number, attachmentName: string): void;
         apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class DeformTimeline extends CurveTimeline {
         slotIndex: number;
@@ -168,7 +168,9 @@
         frameVertices: Array<ArrayLike<number>>;
         constructor(frameCount: number);
         getPropertyId(): number;
-        setFrame(frameIndex: number, time: number, vertices: ArrayLike<number>): void;
+        setSlotIndex(index: number);
+        setAttachment(attachment: Attachment);
+        setFrame(frameIndex: number, time: number, vertices: []): void;
         apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
     }
     class EventTimeline implements Timeline {
@@ -781,7 +783,7 @@
         MipMapNearestNearest = 9984,
         MipMapLinearNearest = 9985,
         MipMapNearestLinear = 9986,
         MipMapLinearLinear = 9987
     }
     enum TextureWrap {
         MirroredRepeat = 33648,

cocos/spine/lib/spine-define.ts

@@ -28,10 +28,21 @@ import spine from './spine-core.js';
 import { js } from '../../core';
 
 function resizeArray (array, newSize): Array<any> {
-    if (!array) return new Array(newSize);
-    if (newSize === array.length) return array;
-    if (newSize < array.length) return array.slice(0, newSize);
-    else return new Array(newSize);
+    if (!array) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return new Array(newSize);
+    }
+    if (newSize === array.length) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return array;
+    }
+    if (newSize < array.length) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return array.slice(0, newSize);
+    } else {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return new Array(newSize);
+    }
 }
 
 function overrideDefineArrayProp (prototype: any, getPropVector: any, name: string): void {
@@ -44,6 +55,7 @@ function overrideDefineArrayProp (prototype: any, getPropVector: any, name: stri
             array = resizeArray(array, count);
             for (let i = 0; i < count; i++) array[i] = vectors.get(i);
             this[_name] = array;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return array;
         },
     });
@@ -82,6 +94,7 @@ function overrideDefineArrayFunction (prototype: any, getPropVector: any, name:
             array = resizeArray(array, count);
             for (let i = 0; i < count; i++) array[i] = vectors.get(i);
             this[_name] = array;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return array;
         },
     });

native/CMakeLists.txt

@@ -2389,6 +2389,10 @@ if(USE_MIDDLEWARE)
                                      cocos/editor-support/spine-creator-support/SkeletonDataMgr.h
             NO_WERROR   NO_UBUILD    cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp
                                      cocos/editor-support/spine-creator-support/SkeletonRenderer.h
+            NO_WERROR                cocos/editor-support/spine-creator-support/SpineAnimation.cpp
+                                     cocos/editor-support/spine-creator-support/SpineAnimation.h
+            NO_WERROR                cocos/editor-support/spine-creator-support/SpineAnimationState.cpp
+                                     cocos/editor-support/spine-creator-support/SpineAnimationState.h
             NO_WERROR                cocos/editor-support/spine-creator-support/spine-cocos2dx.cpp
                                      cocos/editor-support/spine-creator-support/spine-cocos2dx.h
             NO_WERROR                cocos/editor-support/spine-creator-support/VertexEffectDelegate.cpp

native/cocos/bindings/manual/jsb_conversions_spec.cpp

@@ -1134,6 +1134,9 @@ bool sevalue_to_native(const se::Value &from, cc::IBArray *to, se::Object * /*ct
 
 // NOLINTNEXTLINE(readability-identifier-naming)
 bool sevalue_to_native(const se::Value &val, spine::String *obj, se::Object * /*unused*/) {
+    if (!val.isString()) {
+        return false;
+    }
     *obj = val.toString().data();
     return true;
 }

native/cocos/editor-support/spine-creator-support/SkeletonAnimation.cpp

@@ -28,6 +28,8 @@
  *****************************************************************************/
 
 #include "spine-creator-support/SkeletonAnimation.h"
+#include "SpineAnimationState.h"
+
 #include <algorithm>
 #include "base/DeferredReleasePool.h"
 #include "base/Log.h"
@@ -99,7 +101,7 @@ void SkeletonAnimation::initialize() {
     super::initialize();
 
     _ownsAnimationStateData = true;
-    _state = new (__FILE__, __LINE__) AnimationState(new (__FILE__, __LINE__) AnimationStateData(_skeleton->getData()));
+    _state = new (__FILE__, __LINE__) SpineAnimationState(new (__FILE__, __LINE__) AnimationStateData(_skeleton->getData()));
     _state->setRendererObject(this);
     _state->setListener(animationCallback);
 }
@@ -140,7 +142,7 @@ void SkeletonAnimation::setAnimationStateData(AnimationStateData *stateData) {
     }
 
     _ownsAnimationStateData = false;
-    _state = new (__FILE__, __LINE__) AnimationState(stateData);
+    _state = new (__FILE__, __LINE__) SpineAnimationState(stateData);
     _state->setRendererObject(this);
     _state->setListener(animationCallback);
 }

native/cocos/editor-support/spine-creator-support/SkeletonCacheMgr.cpp

@@ -47,6 +47,8 @@ SkeletonCache *SkeletonCacheMgr::buildSkeletonCache(const std::string &uuid) {
 void SkeletonCacheMgr::removeSkeletonCache(const std::string &uuid) {
     auto it = _caches.find(uuid);
     if (it != _caches.end()) {
+        auto *item = it->second;
+        delete item;
         _caches.erase(it);
     }
 }

native/cocos/editor-support/spine-creator-support/SpineAnimation.cpp

@@ -0,0 +1,23 @@
+
+#include "SpineAnimation.h"
+
+using namespace spine;
+
+spine::Vector<Timeline*>& convertAndUseVector(const std::vector<std::shared_ptr<Timeline>>& stdVec, spine::Vector<Timeline*>& _spineVecTimelines) {
+    for (const auto& element : stdVec) {
+        _spineVecTimelines.add(element.get());
+    }
+
+    return _spineVecTimelines;
+}
+
+SpineAnimation::SpineAnimation(const String& name, std::vector<std::shared_ptr<Timeline>> timelines, float duration) : Animation(name, convertAndUseVector(timelines, _spineVecTimelines), duration) {
+    _vecTimelines = timelines;
+}
+
+SpineAnimation::~SpineAnimation() {
+    _vecTimelines.clear();
+    _spineVecTimelines.clear();
+    auto& timelines = getTimelines();
+    timelines.clear();
+}

native/cocos/editor-support/spine-creator-support/SpineAnimation.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <spine/Animation.h>
+#include <vector>
+#include <memory>
+
+namespace spine {
+
+class SpineAnimation : public Animation {
+public:
+    SpineAnimation(const String &name, std::vector<std::shared_ptr<Timeline>> timelines, float duration);
+
+    ~SpineAnimation();
+
+private:
+    std::vector<std::shared_ptr<Timeline>> _vecTimelines;
+    spine::Vector<Timeline*> _spineVecTimelines;
+};
+
+} // namespace spine

native/cocos/editor-support/spine-creator-support/SpineAnimationState.cpp

@@ -0,0 +1,20 @@
+
+#include "SpineAnimationState.h"
+
+using namespace spine; 
+
+SpineAnimationState::SpineAnimationState(AnimationStateData* data) : AnimationState(data) {
+
+}
+
+SpineAnimationState::~SpineAnimationState() {
+    _vecAnimations.clear();
+}
+
+TrackEntry* SpineAnimationState::addAnimation(size_t trackIndex, std::shared_ptr<Animation> animation, bool loop, float delay) {
+    _vecAnimations.push_back(animation);
+    return AnimationState::addAnimation(trackIndex, animation.get(), loop, delay);
+}
+
+
+

native/cocos/editor-support/spine-creator-support/SpineAnimationState.h

@@ -0,0 +1,53 @@
+/******************************************************************************
+ * Spine Runtimes License Agreement
+ * Last updated January 1, 2020. Replaces all prior versions.
+ *
+ * Copyright (c) 2013-2020, Esoteric Software LLC
+ *
+ * Integration of the Spine Runtimes into software or otherwise creating
+ * derivative works of the Spine Runtimes is permitted under the terms and
+ * conditions of Section 2 of the Spine Editor License Agreement:
+ * http://esotericsoftware.com/spine-editor-license
+ *
+ * Otherwise, it is permitted to integrate the Spine Runtimes into software
+ * or otherwise create derivative works of the Spine Runtimes (collectively,
+ * "Products"), provided that each user of the Products must obtain their own
+ * Spine Editor license and redistribution of the Products in any form must
+ * include this license and copyright notice.
+ *
+ * THE SPINE RUNTIMES ARE PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES,
+ * BUSINESS INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#pragma once
+
+#include <spine/AnimationState.h>
+#include "spine/Animation.h"
+#include<vector>
+#include<memory>
+
+namespace spine {
+
+
+class SP_API SpineAnimationState : public AnimationState {
+
+public:
+    explicit SpineAnimationState(AnimationStateData* data);
+
+    ~SpineAnimationState();
+
+    TrackEntry* addAnimation(size_t trackIndex, std::shared_ptr<Animation> animation, bool loop, float delay);
+
+private:
+    std::vector<std::shared_ptr<Animation>> _vecAnimations;
+};
+} // namespace spine
+

native/cocos/editor-support/spine-creator-support/spine-cocos2dx.h

@@ -35,6 +35,8 @@
 #include "spine-creator-support/SkeletonCacheMgr.h"
 #include "spine-creator-support/SkeletonDataMgr.h"
 #include "spine-creator-support/SkeletonRenderer.h"
+#include "spine-creator-support/SpineAnimation.h"
+#include "spine-creator-support/SpineAnimationState.h"
 #include "spine/spine.h"
 
 namespace spine {

native/cocos/editor-support/spine-wasm/SpineAnimationState.cpp

@@ -0,0 +1,18 @@
+
+#include "SpineAnimationState.h"
+
+using namespace spine;
+
+SpineAnimationState::SpineAnimationState(AnimationStateData* data) : AnimationState(data) {
+}
+
+SpineAnimationState::~SpineAnimationState() {
+    _mapAnimations.clear();
+}
+
+TrackEntry* SpineAnimationState::addAnimation(size_t trackIndex, Animation* animation, bool loop, float delay) {
+    if (_mapAnimations.count(animation) == 0) {
+        _mapAnimations[animation] = std::shared_ptr<Animation>(animation);
+    }
+    return AnimationState::addAnimation(trackIndex, animation, loop, delay);
+}

native/cocos/editor-support/spine-wasm/SpineAnimationState.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <spine/AnimationState.h>
+#include <map>
+#include <memory>
+#include "spine/Animation.h"
+
+namespace spine {
+
+class SP_API SpineAnimationState : public AnimationState {
+public:
+    explicit SpineAnimationState(AnimationStateData* data);
+
+    ~SpineAnimationState();
+
+    TrackEntry* addAnimation(size_t trackIndex, Animation* animation, bool loop, float delay);
+
+private:
+    std::map<Animation*, std::shared_ptr<Animation>> _mapAnimations;
+};
+} // namespace spine

native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp

@@ -5,6 +5,7 @@
 #include "spine-mesh-data.h"
 #include "spine-wasm.h"
 #include "util-function.h"
+#include "../spine-creator-support/SpineAnimationState.h"
 
 SlotMesh globalMesh(nullptr, nullptr, 0, 0);
 
@@ -57,7 +58,7 @@ Skeleton *SpineSkeletonInstance::initSkeleton(SkeletonData *data) {
     _skeletonData = data;
     _skeleton = new Skeleton(_skeletonData);
     _animStateData = new AnimationStateData(_skeletonData);
-    _animState = new AnimationState(_animStateData);
+    _animState = new SpineAnimationState(_animStateData);
     _clipper = new SkeletonClipping();
     _skeleton->setToSetupPose();
     _skeleton->updateWorldTransform();