[Spine] Fix "Animation finished" condition (#7464)

D8H · web-flow · commit 187018cdd3ef · 2025-03-10T17:57:27.000+01:00
diff --git a/Extensions/Spine/spineruntimeobject-pixi-renderer.ts b/Extensions/Spine/spineruntimeobject-pixi-renderer.ts
@@ -193,7 +193,14 @@ namespace gdjs {
     }
 
     isAnimationComplete(): boolean {
-      return this._isAnimationComplete;
+      if (!isSpine(this._rendererObject)) {
+        return true;
+      }
+      const track = this._rendererObject.state.tracks[0];
+      if (!track) {
+        return true;
+      }
+      return this._isAnimationComplete && !track.loop;
     }
 
     getPointAttachmentPosition(
diff --git a/GDJS/tests/games/capabilities/capabilities.json b/GDJS/tests/games/capabilities/capabilities.json
@@ -5767,7 +5767,7 @@
                   "parameters": [
                     "PausedLabel",
                     "=",
-                    "\"Paused: \" + RedHero.AnimationTest::AnimationPaused() + \", \" + FemalWitch.AnimationTest::AnimationPaused() + \", \" + Spine.AnimationTest::AnimationPaused()"
+                    "\"Paused: \" + RedHero.AnimationTest::AnimationPaused() + \", \" + Spine.AnimationTest::AnimationPaused() + \", \" + FemalWitch.AnimationTest::AnimationPaused()"
                   ]
                 },
                 {
@@ -5777,7 +5777,7 @@
                   "parameters": [
                     "EndedLabel",
                     "=",
-                    "\"Ended: \" + RedHero.AnimationTest::AnimationFinished() + \", \" + FemalWitch.AnimationTest::AnimationFinished() + \", \" + Spine.AnimationTest::AnimationFinished()"
+                    "\"Ended: \" + RedHero.AnimationTest::AnimationFinished() + \", \" + Spine.AnimationTest::AnimationFinished() + \", \" + FemalWitch.AnimationTest::AnimationFinished()"
                   ]
                 }
               ]
@@ -18770,24 +18770,14 @@
               "events": [
                 {
                   "type": "BuiltinCommonInstructions::Standard",
-                  "conditions": [
-                    {
-                      "type": {
-                        "value": "AnimatableCapability::AnimatableBehavior::HasAnimationEnded"
-                      },
-                      "parameters": [
-                        "Object",
-                        "Animatable"
-                      ]
-                    }
-                  ],
+                  "conditions": [],
                   "actions": [
                     {
                       "type": {
                         "value": "SetReturnString"
                       },
                       "parameters": [
-                        "\"true\""
+                        "\"false\""
                       ]
                     }
                   ]
@@ -18797,7 +18787,6 @@
                   "conditions": [
                     {
                       "type": {
-                        "inverted": true,
                         "value": "AnimatableCapability::AnimatableBehavior::HasAnimationEnded"
                       },
                       "parameters": [
@@ -18812,7 +18801,7 @@
                         "value": "SetReturnString"
                       },
                       "parameters": [
-                        "\"false\""
+                        "\"true\""
                       ]
                     }
                   ]
@@ -18844,24 +18833,14 @@
               "events": [
                 {
                   "type": "BuiltinCommonInstructions::Standard",
-                  "conditions": [
-                    {
-                      "type": {
-                        "value": "AnimatableCapability::AnimatableBehavior::IsAnimationPaused"
-                      },
-                      "parameters": [
-                        "Object",
-                        "Animatable"
-                      ]
-                    }
-                  ],
+                  "conditions": [],
                   "actions": [
                     {
                       "type": {
                         "value": "SetReturnString"
                       },
                       "parameters": [
-                        "\"true\""
+                        "\"false\""
                       ]
                     }
                   ]
@@ -18871,7 +18850,6 @@
                   "conditions": [
                     {
                       "type": {
-                        "inverted": true,
                         "value": "AnimatableCapability::AnimatableBehavior::IsAnimationPaused"
                       },
                       "parameters": [
@@ -18886,7 +18864,7 @@
                         "value": "SetReturnString"
                       },
                       "parameters": [
-                        "\"false\""
+                        "\"true\""
                       ]
                     }
                   ]

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,14 @@ namespace gdjs {`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`isAnimationComplete(): boolean {`
`196`		`- return this._isAnimationComplete;`
	`196`	`+ if (!isSpine(this._rendererObject)) {`
	`197`	`+ return true;`
	`198`	`+ }`
	`199`	`+ const track = this._rendererObject.state.tracks[0];`
	`200`	`+ if (!track) {`
	`201`	`+ return true;`
	`202`	`+ }`
	`203`	`+ return this._isAnimationComplete && !track.loop;`
`197`	`204`	`}`
`198`	`205`
`199`	`206`	`getPointAttachmentPosition(`
Original file line number	Diff line number	Diff line change
`@@ -5767,7 +5767,7 @@`
`5767`	`5767`	`"parameters": [`
`5768`	`5768`	`"PausedLabel",`
`5769`	`5769`	`"=",`
`5770`		`- "\"Paused: \" + RedHero.AnimationTest::AnimationPaused() + \", \" + FemalWitch.AnimationTest::AnimationPaused() + \", \" + Spine.AnimationTest::AnimationPaused()"`
	`5770`	`+ "\"Paused: \" + RedHero.AnimationTest::AnimationPaused() + \", \" + Spine.AnimationTest::AnimationPaused() + \", \" + FemalWitch.AnimationTest::AnimationPaused()"`
`5771`	`5771`	`]`
`5772`	`5772`	`},`
`5773`	`5773`	`{`
`@@ -5777,7 +5777,7 @@`
`5777`	`5777`	`"parameters": [`
`5778`	`5778`	`"EndedLabel",`
`5779`	`5779`	`"=",`
`5780`		`- "\"Ended: \" + RedHero.AnimationTest::AnimationFinished() + \", \" + FemalWitch.AnimationTest::AnimationFinished() + \", \" + Spine.AnimationTest::AnimationFinished()"`
	`5780`	`+ "\"Ended: \" + RedHero.AnimationTest::AnimationFinished() + \", \" + Spine.AnimationTest::AnimationFinished() + \", \" + FemalWitch.AnimationTest::AnimationFinished()"`
`5781`	`5781`	`]`
`5782`	`5782`	`}`
`5783`	`5783`	`]`
`@@ -18770,24 +18770,14 @@`
`18770`	`18770`	`"events": [`
`18771`	`18771`	`{`
`18772`	`18772`	`"type": "BuiltinCommonInstructions::Standard",`
`18773`		`- "conditions": [`
`18774`		`- {`
`18775`		`- "type": {`
`18776`		`- "value": "AnimatableCapability::AnimatableBehavior::HasAnimationEnded"`
`18777`		`- },`
`18778`		`- "parameters": [`
`18779`		`- "Object",`
`18780`		`- "Animatable"`
`18781`		`- ]`
`18782`		`- }`
`18783`		`- ],`
	`18773`	`+ "conditions": [],`
`18784`	`18774`	`"actions": [`
`18785`	`18775`	`{`
`18786`	`18776`	`"type": {`
`18787`	`18777`	`"value": "SetReturnString"`
`18788`	`18778`	`},`
`18789`	`18779`	`"parameters": [`
`18790`		`- "\"true\""`
	`18780`	`+ "\"false\""`
`18791`	`18781`	`]`
`18792`	`18782`	`}`
`18793`	`18783`	`]`
`@@ -18797,7 +18787,6 @@`
`18797`	`18787`	`"conditions": [`
`18798`	`18788`	`{`
`18799`	`18789`	`"type": {`
`18800`		`- "inverted": true,`
`18801`	`18790`	`"value": "AnimatableCapability::AnimatableBehavior::HasAnimationEnded"`
`18802`	`18791`	`},`
`18803`	`18792`	`"parameters": [`
`@@ -18812,7 +18801,7 @@`
`18812`	`18801`	`"value": "SetReturnString"`
`18813`	`18802`	`},`
`18814`	`18803`	`"parameters": [`
`18815`		`- "\"false\""`
	`18804`	`+ "\"true\""`
`18816`	`18805`	`]`
`18817`	`18806`	`}`
`18818`	`18807`	`]`
`@@ -18844,24 +18833,14 @@`
`18844`	`18833`	`"events": [`
`18845`	`18834`	`{`
`18846`	`18835`	`"type": "BuiltinCommonInstructions::Standard",`
`18847`		`- "conditions": [`
`18848`		`- {`
`18849`		`- "type": {`
`18850`		`- "value": "AnimatableCapability::AnimatableBehavior::IsAnimationPaused"`
`18851`		`- },`
`18852`		`- "parameters": [`
`18853`		`- "Object",`
`18854`		`- "Animatable"`
`18855`		`- ]`
`18856`		`- }`
`18857`		`- ],`
	`18836`	`+ "conditions": [],`
`18858`	`18837`	`"actions": [`
`18859`	`18838`	`{`
`18860`	`18839`	`"type": {`
`18861`	`18840`	`"value": "SetReturnString"`
`18862`	`18841`	`},`
`18863`	`18842`	`"parameters": [`
`18864`		`- "\"true\""`
	`18843`	`+ "\"false\""`
`18865`	`18844`	`]`
`18866`	`18845`	`}`
`18867`	`18846`	`]`
`@@ -18871,7 +18850,6 @@`
`18871`	`18850`	`"conditions": [`
`18872`	`18851`	`{`
`18873`	`18852`	`"type": {`
`18874`		`- "inverted": true,`
`18875`	`18853`	`"value": "AnimatableCapability::AnimatableBehavior::IsAnimationPaused"`
`18876`	`18854`	`},`
`18877`	`18855`	`"parameters": [`
`@@ -18886,7 +18864,7 @@`
`18886`	`18864`	`"value": "SetReturnString"`
`18887`	`18865`	`},`
`18888`	`18866`	`"parameters": [`
`18889`		`- "\"false\""`
	`18867`	`+ "\"true\""`
`18890`	`18868`	`]`
`18891`	`18869`	`}`
`18892`	`18870`	`]`