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

bofeng-song · 2024-09-20T02:17:24Z

Re: #
cocos/cocos-test-projects#887

Changelog

Continuous Integration

This pull request:

needs automatic test cases check.

Manual trigger with @cocos-robot run test cases afterward.
does not change any runtime related code or build configuration

If any reviewer thinks the CI checks are needed, please uncheck this option, then close and reopen the issue.

Compatibility Check

This pull request:

changes public API, and have ensured backward compatibility with deprecated features.
affects platform compatibility, e.g. system version, browser version, platform sdk version, platform toolchain, language version, hardware compatibility etc.
affects file structure of the build package or build configuration which requires user project upgrade.
introduces breaking changes, please list all changes, affected features and the scope of violation.

github-actions · 2024-09-20T02:25:53Z

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -51436,9 +51436,10 @@
                 frames: ArrayLike<number>;
                 frameVertices: Array<ArrayLike<number>>;
                 constructor(frameCount: number);
                 getPropertyId(): number;
-                setFrame(frameIndex: number, time: number, vertices: ArrayLike<number>): void;
+                setFrame(frameIndex: number, time: number, vertices: [
+                ]): void;
                 apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, blend: MixBlend, direction: MixDirection): void;
             }
             export class EventTimeline implements Timeline {
                 frames: ArrayLike<number>;

dumganhar · 2024-09-20T07:03:46Z

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

+
+private:
+    std::vector<std::shared_ptr<Timeline>> _vecTimelines;
+    spine::Vector<Timeline*> _spineVecTimelines;


Why need to use two different containers at the same time?

spine::Animation's constructor requires spine::Vector<Timeline*>, we need to change from std::vector to spine::Vector

dumganhar · 2024-09-20T07:04:49Z

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

+ * Spine Runtimes License Agreement
+ * Last updated January 1, 2020. Replaces all prior versions.
+ *
+ * Copyright (c) 2013-2020, Esoteric Software LLC


This is a new file we created, it's not a file in spine runtime , so I think we need to use our license.

dumganhar · 2024-09-20T07:05:12Z

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

@@ -0,0 +1,18 @@
+
+#include "SpineAnimationState.h"


Missing licenese.

dumganhar · 2024-09-20T07:05:16Z

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

@@ -0,0 +1,21 @@
+#pragma once


Missing licenese.

dumganhar · 2024-09-20T07:06:25Z

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"


Use '../' for include path is not a good way.

dumganhar · 2024-09-23T02:58:40Z

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;


item->release();

dumganhar · 2024-09-23T03:14:00Z

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

+}
+
+TrackEntry* SpineAnimationState::addAnimation(size_t trackIndex, std::shared_ptr<Animation> animation, bool loop, float delay) {
+    _vecAnimations.push_back(animation);


Use emplace_back instead.

dumganhar · 2024-09-24T01:41:09Z

cocos/spine/skeleton-cache.ts

@@ -449,7 +450,6 @@ class SkeletonCache {
                animationCache = new AnimationCache(spData);
                animationCache._privateMode = this._privateMode;
            }
-            animationCache.init(skeletonInfo, animationName);


Why doesn't need to call init method now?

It will be called outer this block

dumganhar · 2024-09-24T05:55:16Z

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

+#include <spine/AnimationState.h>
+#include "spine/Animation.h"
+#include<vector>
+#include<memory>


Add a space before <

dumganhar · 2024-09-24T05:56:51Z

native/cocos/editor-support/spine/TranslateTimeline.h

@@ -53,6 +53,7 @@ class SP_API TranslateTimeline : public CurveTimeline {
    virtual void apply(Skeleton& skeleton, float lastTime, float time, Vector<Event*>* pEvents, float alpha, MixBlend blend, MixDirection direction);

    virtual int getPropertyId();
+    inline void setBoneIndex(int inValue) {_boneIndex = inValue;}


Don't modify source code in spine-runtime.

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

fa73743

bofeng-song requested review from minggo and dumganhar September 20, 2024 02:17

bofeng-song added 3 commits September 20, 2024 10:42

refine

8768952

refine

7a051b8

refine

8c532a4

dumganhar reviewed Sep 20, 2024

View reviewed changes

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

@@ -0,0 +1,21 @@

#pragma once

Copy link

Contributor

dumganhar Sep 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing licenese.

dumganhar reviewed Sep 20, 2024

View reviewed changes

refine

efe5467

minggo approved these changes Sep 20, 2024

View reviewed changes

dumganhar reviewed Sep 23, 2024

View reviewed changes

bofeng-song added 4 commits September 23, 2024 14:21

refine

9a0b427

refine

be6db1b

refine

194cc0c

refine

d7f452c

dumganhar reviewed Sep 24, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

bofeng-song commented Sep 20, 2024 •

edited

Loading

github-actions bot commented Sep 20, 2024 •

edited

Loading

dumganhar Sep 20, 2024

bofeng-song Sep 20, 2024

dumganhar Sep 20, 2024

dumganhar Sep 20, 2024

dumganhar Sep 20, 2024

dumganhar Sep 20, 2024

dumganhar Sep 23, 2024

dumganhar Sep 23, 2024

dumganhar Sep 24, 2024

bofeng-song Sep 24, 2024

dumganhar Sep 24, 2024

dumganhar Sep 24, 2024 •

edited

Loading

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

Are you sure you want to change the base?

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

Conversation

bofeng-song commented Sep 20, 2024 • edited Loading

Changelog

Continuous Integration

Compatibility Check

github-actions bot commented Sep 20, 2024 • edited Loading

Interface Check Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dumganhar Sep 24, 2024 • edited Loading

Choose a reason for hiding this comment

bofeng-song commented Sep 20, 2024 •

edited

Loading

github-actions bot commented Sep 20, 2024 •

edited

Loading

dumganhar Sep 24, 2024 •

edited

Loading