diff --git a/spine-godot/build/build-templates-v4.sh b/spine-godot/build/build-templates-v4.sh index 7555867bc..0779eca59 100755 --- a/spine-godot/build/build-templates-v4.sh +++ b/spine-godot/build/build-templates-v4.sh @@ -122,7 +122,7 @@ elif [ "$platform" = "ios" ]; then cp libgodot.ios.template_release.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a cp libgodot.ios.template_debug.arm64.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a cp libgodot.ios.template_debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a - cp -r ~/VulkanSDK/1.3.275.0/MoltenVK/MoltenVK.xcframework ios_xcode/ + cp -r /Users/runner/VulkanSDK/1.3.275.0/macOS/lib/MoltenVK.xcframework ios_xcode/ rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}* rm -rf ios.zip pushd ios_xcode diff --git a/spine-godot/build/install-macos-vulkan-sdk.sh b/spine-godot/build/install-macos-vulkan-sdk.sh index 8c8a569d3..2877bb5eb 100755 --- a/spine-godot/build/install-macos-vulkan-sdk.sh +++ b/spine-godot/build/install-macos-vulkan-sdk.sh @@ -5,6 +5,6 @@ IFS=$'\n\t' curl -L "https://sdk.lunarg.com/sdk/download/1.3.275.0/mac/vulkansdk-macos-1.3.275.0.dmg" -o /tmp/vulkan-sdk.dmg hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \ - --accept-licenses --default-answer --confirm-command install + --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.ios # hdiutil detach /Volumes/vulkan-sdk rm -f /tmp/vulkan-sdk.dmg \ No newline at end of file diff --git a/spine-ts/package-lock.json b/spine-ts/package-lock.json index 1eefe4910..b85cebec6 100644 --- a/spine-ts/package-lock.json +++ b/spine-ts/package-lock.json @@ -1,12 +1,12 @@ { "name": "@esotericsoftware/spine-ts", - "version": "4.2.96", + "version": "4.2.98", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@esotericsoftware/spine-ts", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "workspaces": [ "spine-core", @@ -33,9 +33,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", - "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", + "version": "7.28.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz", + "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==", "dev": true, "license": "MIT", "engines": { @@ -2219,18 +2219,18 @@ }, "spine-canvas": { "name": "@esotericsoftware/spine-canvas", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" } }, "spine-canvaskit": { "name": "@esotericsoftware/spine-canvaskit", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96", + "@esotericsoftware/spine-core": "4.2.98", "canvaskit-wasm": "0.39.1" }, "devDependencies": { @@ -2240,17 +2240,17 @@ }, "spine-core": { "name": "@esotericsoftware/spine-core", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE" }, "spine-phaser-v3": { "name": "@esotericsoftware/spine-phaser-v3", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-canvas": "4.2.96", - "@esotericsoftware/spine-core": "4.2.96", - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-canvas": "4.2.98", + "@esotericsoftware/spine-core": "4.2.98", + "@esotericsoftware/spine-webgl": "4.2.98" }, "devDependencies": { "phaser": "^3.60.0" @@ -2274,12 +2274,12 @@ }, "spine-phaser-v4": { "name": "@esotericsoftware/spine-phaser-v4", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-canvas": "4.2.96", - "@esotericsoftware/spine-core": "4.2.96", - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-canvas": "4.2.98", + "@esotericsoftware/spine-core": "4.2.98", + "@esotericsoftware/spine-webgl": "4.2.98" }, "devDependencies": { "phaser": "^4.0.0-rc.1" @@ -2290,10 +2290,10 @@ }, "spine-pixi-v7": { "name": "@esotericsoftware/spine-pixi-v7", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" }, "peerDependencies": { "@pixi/assets": "^7.2.4", @@ -2307,10 +2307,10 @@ }, "spine-pixi-v8": { "name": "@esotericsoftware/spine-pixi-v8", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" }, "peerDependencies": { "pixi.js": "^8.12.0" @@ -2318,18 +2318,18 @@ }, "spine-player": { "name": "@esotericsoftware/spine-player", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-webgl": "4.2.98" } }, "spine-threejs": { "name": "@esotericsoftware/spine-threejs", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" }, "devDependencies": { "@types/three": "0.162.0" @@ -2340,18 +2340,18 @@ }, "spine-webcomponents": { "name": "@esotericsoftware/spine-webcomponents", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-webgl": "4.2.98" } }, "spine-webgl": { "name": "@esotericsoftware/spine-webgl", - "version": "4.2.96", + "version": "4.2.98", "license": "LicenseRef-LICENSE", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" } } } diff --git a/spine-ts/package.json b/spine-ts/package.json index 0bc7c7919..8dd3d8624 100644 --- a/spine-ts/package.json +++ b/spine-ts/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-ts", - "version": "4.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the web.", "type": "module", "files": [ diff --git a/spine-ts/spine-canvas/package.json b/spine-ts/spine-canvas/package.json index fdadf17d9..d2431997f 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.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,6 +31,6 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" } } \ No newline at end of file diff --git a/spine-ts/spine-canvaskit/package.json b/spine-ts/spine-canvaskit/package.json index ef3714ebf..dc91eb855 100644 --- a/spine-ts/spine-canvaskit/package.json +++ b/spine-ts/spine-canvaskit/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-canvaskit", - "version": "4.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for CanvasKit for NodeJS", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96", + "@esotericsoftware/spine-core": "4.2.98", "canvaskit-wasm": "0.39.1" }, "devDependencies": { diff --git a/spine-ts/spine-core/package.json b/spine-ts/spine-core/package.json index 70c021df6..4f7cee36c 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.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/spine-ts/spine-phaser-v3/package.json b/spine-ts/spine-phaser-v3/package.json index 4fc8102ba..6791f7f37 100644 --- a/spine-ts/spine-phaser-v3/package.json +++ b/spine-ts/spine-phaser-v3/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-phaser-v3", - "version": "4.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the Phaser v3.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,9 +31,9 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-canvas": "4.2.96", - "@esotericsoftware/spine-core": "4.2.96", - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-canvas": "4.2.98", + "@esotericsoftware/spine-core": "4.2.98", + "@esotericsoftware/spine-webgl": "4.2.98" }, "devDependencies": { "phaser": "^3.60.0" diff --git a/spine-ts/spine-phaser-v4/package.json b/spine-ts/spine-phaser-v4/package.json index aa0516831..1dad13cb9 100644 --- a/spine-ts/spine-phaser-v4/package.json +++ b/spine-ts/spine-phaser-v4/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-phaser-v4", - "version": "4.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the Phaser v4.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,9 +31,9 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-canvas": "4.2.96", - "@esotericsoftware/spine-core": "4.2.96", - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-canvas": "4.2.98", + "@esotericsoftware/spine-core": "4.2.98", + "@esotericsoftware/spine-webgl": "4.2.98" }, "devDependencies": { "phaser": "^4.0.0-rc.1" diff --git a/spine-ts/spine-phaser-v4/src/SpineGameObject.ts b/spine-ts/spine-phaser-v4/src/SpineGameObject.ts index cb99e6817..2e0af84fe 100644 --- a/spine-ts/spine-phaser-v4/src/SpineGameObject.ts +++ b/spine-ts/spine-phaser-v4/src/SpineGameObject.ts @@ -364,7 +364,7 @@ export class SpineGameObject extends DepthMixin( if (newType) { // Ensure framebuffer is properly set up. if (drawingContext.renderer.renderNodes.currentBatchDrawingContext !== drawingContext) { - drawingContext.use(); + drawingContext.renderer.renderNodes.finishBatch(); drawingContext.beginDraw(); } @@ -379,7 +379,8 @@ export class SpineGameObject extends DepthMixin( let transform = Phaser.GameObjects.GetCalcMatrix( src, camera, - parentMatrix + parentMatrix, + !drawingContext.useCanvas, ).calc; let a = transform.a, b = transform.b, diff --git a/spine-ts/spine-pixi-v7/package.json b/spine-ts/spine-pixi-v7/package.json index bd9a51c1a..b840dff27 100644 --- a/spine-ts/spine-pixi-v7/package.json +++ b/spine-ts/spine-pixi-v7/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-pixi-v7", - "version": "4.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the web PixiJS v7.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" }, "peerDependencies": { "@pixi/core": "^7.2.4", diff --git a/spine-ts/spine-pixi-v8/package.json b/spine-ts/spine-pixi-v8/package.json index 073497244..03ec19699 100644 --- a/spine-ts/spine-pixi-v8/package.json +++ b/spine-ts/spine-pixi-v8/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-pixi-v8", - "version": "4.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for PixiJS v8.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" }, "peerDependencies": { "pixi.js": "^8.12.0" diff --git a/spine-ts/spine-player/package.json b/spine-ts/spine-player/package.json index d04c44ce3..a35573b2a 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.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,6 +31,6 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-webgl": "4.2.98" } } \ No newline at end of file diff --git a/spine-ts/spine-threejs/package.json b/spine-ts/spine-threejs/package.json index 073a3ad84..a3b871a31 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.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" }, "devDependencies": { "@types/three": "0.162.0" diff --git a/spine-ts/spine-webcomponents/package.json b/spine-ts/spine-webcomponents/package.json index 46ae47653..5199a6006 100644 --- a/spine-ts/spine-webcomponents/package.json +++ b/spine-ts/spine-webcomponents/package.json @@ -1,6 +1,6 @@ { "name": "@esotericsoftware/spine-webcomponents", - "version": "4.2.96", + "version": "4.2.98", "description": "The official Spine webcomponents.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,6 +31,6 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-webgl": "4.2.96" + "@esotericsoftware/spine-webgl": "4.2.98" } } \ No newline at end of file diff --git a/spine-ts/spine-webgl/package.json b/spine-ts/spine-webgl/package.json index 4a4703790..a0df95366 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.2.96", + "version": "4.2.98", "description": "The official Spine Runtimes for the web.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,6 +31,6 @@ }, "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "dependencies": { - "@esotericsoftware/spine-core": "4.2.96" + "@esotericsoftware/spine-core": "4.2.98" } } \ No newline at end of file