From e436d873fa4d671253cd2f864583a53849e4904d Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 16 Mar 2022 23:48:47 +0100 Subject: [PATCH 1/3] [ts][webgl] Fix drag-and-drop.js not setting animation. --- spine-ts/spine-webgl/example/drag-and-drop.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spine-ts/spine-webgl/example/drag-and-drop.js b/spine-ts/spine-webgl/example/drag-and-drop.js index f7b5eebea..9b38c8784 100644 --- a/spine-ts/spine-webgl/example/drag-and-drop.js +++ b/spine-ts/spine-webgl/example/drag-and-drop.js @@ -21,7 +21,7 @@ class App { // Setup listener for animation selection box let animationSelectBox = document.body.querySelector("#animations"); animationSelectBox.onchange = () => { - // this.animationState.setAnimation(0, animationSelectBox.value, true); + this.animationState.setAnimation(0, animationSelectBox.value, true); } // Setup listener for the PMA checkbox @@ -123,8 +123,7 @@ class App { option.selected = animation.name == animationName; animationSelectBox.appendChild(option); } - - // if (animationName) this.animationState.setAnimation(0, animationName, true); + this.animationState.setAnimation(0, animationName, true); // Center the skeleton in the viewport this.centerSkeleton(); From c14cef967f22240ae8cd627aa80a09c0bb68b87e Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Thu, 17 Mar 2022 00:07:46 +0100 Subject: [PATCH 2/3] [ts][threejs] Clipping not properly ended for all code paths. --- spine-ts/spine-threejs/src/SkeletonMesh.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/spine-ts/spine-threejs/src/SkeletonMesh.ts b/spine-ts/spine-threejs/src/SkeletonMesh.ts index f004315bb..46927fd2e 100644 --- a/spine-ts/spine-threejs/src/SkeletonMesh.ts +++ b/spine-ts/spine-threejs/src/SkeletonMesh.ts @@ -173,7 +173,10 @@ export class SkeletonMesh extends THREE.Object3D { for (let i = 0, n = drawOrder.length; i < n; i++) { let vertexSize = clipper.isClipping() ? 2 : SkeletonMesh.VERTEX_SIZE; let slot = drawOrder[i]; - if (!slot.bone.active) continue; + if (!slot.bone.active) { + clipper.clipEndWithSlot(slot); + continue; + } let attachment = slot.getAttachment(); let attachmentColor: Color = null; let texture: ThreeJsTexture = null; @@ -290,8 +293,10 @@ export class SkeletonMesh extends THREE.Object3D { finalIndicesLength = triangles.length; } - if (finalVerticesLength == 0 || finalIndicesLength == 0) + if (finalVerticesLength == 0 || finalIndicesLength == 0) { + clipper.clipEndWithSlot(slot); continue; + } // Start new batch if this one can't hold vertices/indices if (!batch.canBatch(finalVerticesLength, finalIndicesLength)) { From 4df4bcfb760a2fad81530ef8ac10cb25cfade9be Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Thu, 17 Mar 2022 00:09:41 +0100 Subject: [PATCH 3/3] [ts] 4.0.23 release. --- spine-ts/package-lock.json | 30 ++++++++++++++--------------- spine-ts/package.json | 2 +- spine-ts/spine-canvas/package.json | 4 ++-- spine-ts/spine-core/package.json | 2 +- spine-ts/spine-player/package.json | 4 ++-- spine-ts/spine-threejs/package.json | 4 ++-- spine-ts/spine-webgl/package.json | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/spine-ts/package-lock.json b/spine-ts/package-lock.json index d8eed17c1..9f52e01a0 100644 --- a/spine-ts/package-lock.json +++ b/spine-ts/package-lock.json @@ -1,12 +1,12 @@ { "name": "@esotericsoftware/spine-ts", - "version": "4.0.22", + "version": "4.0.23", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@esotericsoftware/spine-ts", - "version": "4.0.22", + "version": "4.0.23", "license": "LicenseRef-LICENSE", "workspaces": [ "spine-core", @@ -7951,41 +7951,41 @@ }, "spine-canvas": { "name": "@esotericsoftware/spine-canvas", - "version": "4.0.22", + "version": "4.0.23", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "^4.0.22" + "@esotericsoftware/spine-core": "^4.0.23" } }, "spine-core": { "name": "@esotericsoftware/spine-core", - "version": "4.0.22", + "version": "4.0.23", "license": "LicenseRef-LICENSE" }, "spine-player": { "name": "@esotericsoftware/spine-player", - "version": "4.0.22", + "version": "4.0.23", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-webgl": "^4.0.22" + "@esotericsoftware/spine-webgl": "^4.0.23" } }, "spine-threejs": { "name": "@esotericsoftware/spine-threejs", - "version": "4.0.22", + "version": "4.0.23", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "^4.0.22", + "@esotericsoftware/spine-core": "^4.0.23", "@types/three": "^0.133.1", "three": "^0.133.1" } }, "spine-webgl": { "name": "@esotericsoftware/spine-webgl", - "version": "4.0.22", + "version": "4.0.23", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "^4.0.22" + "@esotericsoftware/spine-core": "^4.0.23" } } }, @@ -7993,7 +7993,7 @@ "@esotericsoftware/spine-canvas": { "version": "file:spine-canvas", "requires": { - "@esotericsoftware/spine-core": "^4.0.22" + "@esotericsoftware/spine-core": "^4.0.23" } }, "@esotericsoftware/spine-core": { @@ -8002,13 +8002,13 @@ "@esotericsoftware/spine-player": { "version": "file:spine-player", "requires": { - "@esotericsoftware/spine-webgl": "^4.0.22" + "@esotericsoftware/spine-webgl": "^4.0.23" } }, "@esotericsoftware/spine-threejs": { "version": "file:spine-threejs", "requires": { - "@esotericsoftware/spine-core": "^4.0.22", + "@esotericsoftware/spine-core": "^4.0.23", "@types/three": "^0.133.1", "three": "^0.133.1" } @@ -8016,7 +8016,7 @@ "@esotericsoftware/spine-webgl": { "version": "file:spine-webgl", "requires": { - "@esotericsoftware/spine-core": "^4.0.22" + "@esotericsoftware/spine-core": "^4.0.23" } }, "@types/offscreencanvas": { diff --git a/spine-ts/package.json b/spine-ts/package.json index f48a3a576..ca152a5af 100644 --- a/spine-ts/package.json +++ b/spine-ts/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-ts", - "version": "4.0.22", + "version": "4.0.23", "description": "The official Spine Runtimes for the web.", "files": [ "README.md" diff --git a/spine-ts/spine-canvas/package.json b/spine-ts/spine-canvas/package.json index 257cb1e5b..55bec6035 100644 --- a/spine-ts/spine-canvas/package.json +++ b/spine-ts/spine-canvas/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-canvas", - "version": "4.0.22", + "version": "4.0.23", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -30,6 +30,6 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "^4.0.22" + "@esotericsoftware/spine-core": "^4.0.23" } } \ No newline at end of file diff --git a/spine-ts/spine-core/package.json b/spine-ts/spine-core/package.json index 6fe89b804..097d39042 100644 --- a/spine-ts/spine-core/package.json +++ b/spine-ts/spine-core/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-core", - "version": "4.0.22", + "version": "4.0.23", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/spine-ts/spine-player/package.json b/spine-ts/spine-player/package.json index b3b588297..efd384e34 100644 --- a/spine-ts/spine-player/package.json +++ b/spine-ts/spine-player/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-player", - "version": "4.0.22", + "version": "4.0.23", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -30,6 +30,6 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-webgl": "^4.0.22" + "@esotericsoftware/spine-webgl": "^4.0.23" } } \ No newline at end of file diff --git a/spine-ts/spine-threejs/package.json b/spine-ts/spine-threejs/package.json index 57b12d96b..cbc7387d5 100644 --- a/spine-ts/spine-threejs/package.json +++ b/spine-ts/spine-threejs/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-threejs", - "version": "4.0.22", + "version": "4.0.23", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -32,6 +32,6 @@ "dependencies": { "@types/three": "^0.133.1", "three": "^0.133.1", - "@esotericsoftware/spine-core": "^4.0.22" + "@esotericsoftware/spine-core": "^4.0.23" } } \ No newline at end of file diff --git a/spine-ts/spine-webgl/package.json b/spine-ts/spine-webgl/package.json index fb548d9af..7cee493b8 100644 --- a/spine-ts/spine-webgl/package.json +++ b/spine-ts/spine-webgl/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-webgl", - "version": "4.0.22", + "version": "4.0.23", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -30,6 +30,6 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "^4.0.22" + "@esotericsoftware/spine-core": "^4.0.23" } } \ No newline at end of file