fix setSkin invalidation on cached mode.

cocos · Jul 13, 2023 · d9b2781 · d9b2781
1 parent b225804
commit d9b2781
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 31 deletions.
diff --git a/cocos/spine/skeleton-cache.ts b/cocos/spine/skeleton-cache.ts
@@ -214,7 +214,6 @@ export class AnimationCache {
             boneInfo.worldY = bone.worldY;
             boneInfosArray.push(boneInfo);
         });
-
         this.frames[index] = {
             model: modelData,
             boneInfos: boneInfosArray,
@@ -235,14 +234,9 @@ export class AnimationCache {
                 // If pre animation not finished, play it to the end.
                 preAnimationCache.updateToFrame(0);
             }
-        }
-
-        const skeleton = skeletonInfo?.skeleton;
+        } 
         const listener = skeletonInfo?.listener;
-        const state = skeletonInfo?.state;
-
-        const animation = skeleton?.data.findAnimation(this._animationName!);
-        state?.setAnimationWith(0, animation!, false);
+        this._instance.setAnimation(0, this._animationName!, false);
         this.bind(listener!);
 
         // record cur animation cache
@@ -336,6 +330,18 @@ class SkeletonCache {
         this._skeletonCache = {};
     }
 
+    public invalidAnimationCache (uuid: string) {
+        const skeletonInfo = this._skeletonCache[uuid];
+        const skeleton = skeletonInfo && skeletonInfo.skeleton;
+        if (!skeleton) return;
+
+        const animationsCache = skeletonInfo.animationsCache;
+        for (const aniKey in animationsCache) {
+            const animationCache = animationsCache[aniKey];
+            animationCache.invalidAllFrame();
+        }
+    }
+
     public removeSkeleton (uuid: string) {
         const skeletonInfo = this._skeletonCache[uuid];
         if (!skeletonInfo) return;
@@ -381,23 +387,30 @@ class SkeletonCache {
         return animCache;
     }
 
-    public initAnimationCache (data: SkeletonData, animationName: string) {
-        const uuid = data.uuid;
-        const poolKey = `${uuid}#${animationName}`;
+    public initAnimationCache (uuid: string, data: SkeletonData,  animationName: string) {
         const spData = data.getRuntimeData();
-
-        let animCache = this._animationPool[poolKey];
-        if (animCache) {
-            delete this._animationPool[poolKey];
-        } else {
-            animCache = new AnimationCache(spData!);
-            this._animationPool[poolKey] = animCache;
-        }
-
+        if(!spData) return null;
         const skeletonInfo = this._skeletonCache[uuid];
-        animCache.init(skeletonInfo, animationName);
-        animCache.setAnimation(animationName);
-        return animCache;
+        const skeleton = skeletonInfo && skeletonInfo.skeleton;
+        if (!skeleton) return null;
+        const animationsCache = skeletonInfo.animationsCache;
+        let animationCache = animationsCache[animationName];
+        if (!animationCache) {
+            // If cache exist in pool, then just use it.
+            const poolKey = `${uuid}#${animationName}`;
+            animationCache = this._animationPool[poolKey];
+            if (animationCache) {
+                delete this._animationPool[poolKey];
+            } else {
+                animationCache = new AnimationCache(spData);
+                animationCache._privateMode = this._privateMode;
+            }
+            animationCache.init(skeletonInfo, animationName);
+            animationsCache[animationName] = animationCache;
+        }
+        animationCache.init(skeletonInfo, animationName);
+        animationCache.setAnimation(animationName);
+        return animationCache;
     }
 
     public destroyCachedAnimations (uuid?: string) {

diff --git a/cocos/spine/skeleton.ts b/cocos/spine/skeleton.ts
@@ -716,14 +716,15 @@ export class Skeleton extends UIRenderer {
                 this._skeletonCache = SkeletonCache.sharedCache;
             } else if (this._cacheMode === AnimationCacheMode.PRIVATE_CACHE) {
                 this._skeletonCache = new SkeletonCache();
+                this._skeletonCache.enablePrivateMode();
             }
         }
 
         if (this.isAnimationCached()) {
             if (this.debugBones || this.debugSlots) {
                 warn('Debug bones or slots is invalid in cached mode');
             }
-            const skeletonInfo = this._skeletonCache!.getSkeletonCache((this.skeletonData as any)._uuid, skeletonData);
+            const skeletonInfo = this._skeletonCache!.getSkeletonCache((this.skeletonData as any).uuid, skeletonData);
             this._skeleton = skeletonInfo.skeleton;
         } else {
             this._skeleton = this._instance.initSkeleton(skeletonData);
@@ -761,7 +762,7 @@ export class Skeleton extends UIRenderer {
             if (!this._skeletonCache) return null;
             let cache = this._skeletonCache.getAnimationCache(this._skeletonData!.uuid, name);
             if (!cache) {
-                cache = this._skeletonCache.initAnimationCache(this._skeletonData!, name);
+                cache = this._skeletonCache.initAnimationCache(this.skeletonData!.uuid, this._skeletonData!, name);
             }
             if (cache) {
                 this._animationName = name;
@@ -854,15 +855,14 @@ export class Skeleton extends UIRenderer {
      *
      * @param skinName @en The name of skin. @zh 皮肤名称。
      */
-    public setSkin (name: string) {
-        this._skinName = name;
+    public setSkin (name: string) {        
         if (this.isAnimationCached()) {
             if (this._animCache) {
                 this._animCache.setSkin(name);
+                this.invalidAnimationCache(); 
             }
-        } else {
-            this._instance.setSkin(name);
         }
+        this._instance.setSkin(name);
     }
 
     /**
@@ -882,7 +882,7 @@ export class Skeleton extends UIRenderer {
                     if (frameCache && frameCache.isInvalid()) {
                         frameCache.updateToFrame(0);
                         const frames = frameCache.frames;
-                        this._curFrame = frames[frames.length - 1];
+                        this._curFrame = frames[1];
                     }
                     return;
                 }
@@ -933,7 +933,6 @@ export class Skeleton extends UIRenderer {
                 this._playCount = 0;
                 this._isAniComplete = true;
                 this._emitCacheCompleteEvent();
-                return;
             }
             this._accTime = 0;
             frameIdx = 0;
@@ -1223,6 +1222,20 @@ export class Skeleton extends UIRenderer {
         }
     }
 
+    /**
+     * @en
+     * Invalidates the animation cache, which is then recomputed on each frame.
+     * @zh
+     * 使动画缓存失效，之后会在每帧重新计算。
+     * @method invalidAnimationCache
+     */
+        public invalidAnimationCache () {
+            if (!this.isAnimationCached()) return;
+            if (this._skeletonCache) {
+                this._skeletonCache.invalidAnimationCache(this._skeletonData!.uuid);
+            }
+        }
+
     /**
      * @en
      * Finds a bone by name.