From 6cc8809406ac13661fe27bbe4b57131b2e88f31f Mon Sep 17 00:00:00 2001 From: Davide Tantillo Date: Thu, 7 Nov 2024 14:49:36 +0100 Subject: [PATCH] [ts][pixi] Move pixi to pixi-v7 --- .gitignore | 2 +- spine-ts/README.md | 8 ++--- spine-ts/build.sh | 2 +- spine-ts/index.html | 28 +++++++++--------- spine-ts/package-lock.json | 23 ++++++++++++-- spine-ts/package.json | 14 ++++----- spine-ts/publish.sh | 2 +- .../{spine-pixi => spine-pixi-v7}/README.md | 0 .../example/assets/celestial-circus-pma.atlas | 0 .../example/assets/celestial-circus-pma.png | Bin .../example/assets/celestial-circus-pro.json | 0 .../example/assets/celestial-circus-pro.skel | Bin .../example/assets/celestial-circus.atlas | 0 .../example/assets/celestial-circus.png | Bin .../example/assets/cloud-pot-pma.atlas | 0 .../example/assets/cloud-pot-pma.png | Bin .../example/assets/cloud-pot.json | 0 .../example/assets/cloud-pot.skel | Bin .../example/assets/coin-pma.atlas | 0 .../example/assets/coin-pma.png | Bin .../example/assets/coin-pro.skel | Bin .../example/assets/mix-and-match-pma.atlas | 0 .../example/assets/mix-and-match-pma.png | Bin .../example/assets/mix-and-match-pro.skel | Bin .../example/assets/raptor-jaw-tooth.png | Bin .../example/assets/raptor-pro.json | 0 .../example/assets/raptor.atlas | 0 .../example/assets/raptor.png | Bin .../example/assets/sack-pma.atlas | 0 .../example/assets/sack-pma.png | Bin .../example/assets/sack-pro.json | 0 .../example/assets/sack-pro.skel | Bin .../example/assets/snowglobe-pma.atlas | 0 .../example/assets/snowglobe-pma.png | Bin .../example/assets/snowglobe-pma_2.png | Bin .../example/assets/snowglobe-pma_3.png | Bin .../example/assets/snowglobe-pma_4.png | Bin .../example/assets/snowglobe-pma_5.png | Bin .../example/assets/snowglobe-pro.json | 0 .../example/assets/snowglobe-pro.skel | Bin .../example/assets/spineboy-pma.atlas | 0 .../example/assets/spineboy-pma.png | Bin .../example/assets/spineboy-pro.json | 0 .../example/assets/spineboy-pro.skel | Bin .../example/assets/spineboy.atlas | 0 .../example/assets/spineboy.png | Bin .../example/assets/stretchyman-pma.atlas | 0 .../example/assets/stretchyman-pma.png | Bin .../example/assets/stretchyman-pro.skel | Bin .../example/control-bones-example.html | 2 +- .../example/events-example.html | 2 +- .../example/index.html | 2 +- .../example/manual-loading.html | 2 +- .../example/mix-and-match-example.html | 2 +- .../example/mouse-following.html | 2 +- .../example/physics.html | 2 +- .../example/physics2.html | 2 +- .../example/physics3.html | 2 +- .../example/physics4.html | 2 +- .../example/simple-input.html | 2 +- .../example/slot-objects.html | 4 +-- .../example/typescript/README.md | 0 .../typescript/assets/spineboy-pma.atlas | 0 .../typescript/assets/spineboy-pma.png | Bin .../typescript/assets/spineboy-pro.skel | Bin .../example/typescript/index.html | 0 .../example/typescript/index.ts | 0 .../example/typescript/package-lock.json | 0 .../example/typescript/package.json | 0 .../package.json | 2 +- .../src/DarkSlotMesh.ts | 0 .../src/SlotMesh.ts | 0 .../src/Spine.ts | 0 .../src/SpineDebugRenderer.ts | 0 .../src/SpineTexture.ts | 0 .../src/assets/atlasLoader.ts | 0 .../src/assets/skeletonLoader.ts | 0 .../src/darkTintMesh/DarkTintBatchGeom.ts | 0 .../src/darkTintMesh/DarkTintGeom.ts | 0 .../src/darkTintMesh/DarkTintMaterial.ts | 0 .../src/darkTintMesh/DarkTintMesh.ts | 0 .../src/darkTintMesh/DarkTintRenderer.ts | 0 .../src/index.ts | 0 .../src/require-shim.ts | 0 .../tsconfig.json | 0 spine-ts/tsconfig.json | 2 +- spine-ts/tsfmt.json | 2 +- 87 files changed, 64 insertions(+), 47 deletions(-) rename spine-ts/{spine-pixi => spine-pixi-v7}/README.md (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/celestial-circus-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/celestial-circus-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/celestial-circus-pro.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/celestial-circus-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/celestial-circus.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/celestial-circus.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/cloud-pot-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/cloud-pot-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/cloud-pot.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/cloud-pot.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/coin-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/coin-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/coin-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/mix-and-match-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/mix-and-match-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/mix-and-match-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/raptor-jaw-tooth.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/raptor-pro.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/raptor.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/raptor.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/sack-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/sack-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/sack-pro.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/sack-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pma_2.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pma_3.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pma_4.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pma_5.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pro.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/snowglobe-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/spineboy-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/spineboy-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/spineboy-pro.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/spineboy-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/spineboy.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/spineboy.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/stretchyman-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/stretchyman-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/assets/stretchyman-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/control-bones-example.html (98%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/events-example.html (98%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/index.html (96%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/manual-loading.html (97%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/mix-and-match-example.html (97%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/mouse-following.html (98%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/physics.html (96%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/physics2.html (98%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/physics3.html (96%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/physics4.html (96%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/simple-input.html (98%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/slot-objects.html (97%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/README.md (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/assets/spineboy-pma.atlas (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/assets/spineboy-pma.png (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/assets/spineboy-pro.skel (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/index.html (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/index.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/package-lock.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/example/typescript/package.json (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/package.json (95%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/DarkSlotMesh.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/SlotMesh.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/Spine.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/SpineDebugRenderer.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/SpineTexture.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/assets/atlasLoader.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/assets/skeletonLoader.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/darkTintMesh/DarkTintBatchGeom.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/darkTintMesh/DarkTintGeom.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/darkTintMesh/DarkTintMaterial.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/darkTintMesh/DarkTintMesh.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/darkTintMesh/DarkTintRenderer.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/index.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/src/require-shim.ts (100%) rename spine-ts/{spine-pixi => spine-pixi-v7}/tsconfig.json (100%) diff --git a/.gitignore b/.gitignore index 7acee1699..44fc44069 100644 --- a/.gitignore +++ b/.gitignore @@ -145,7 +145,7 @@ spine-ts/spine-canvas/dist spine-ts/spine-webgl/dist spine-ts/spine-player/dist spine-ts/spine-threejs/dist -spine-ts/spine-pixi/dist +spine-ts/spine-pixi-v7/dist spine-ts/spine-pixi-v8/dist spine-libgdx/gradle spine-libgdx/gradlew diff --git a/spine-ts/README.md b/spine-ts/README.md index 554ccd231..171b5336b 100644 --- a/spine-ts/README.md +++ b/spine-ts/README.md @@ -10,7 +10,7 @@ up into multiple modules: 1. `spine-threejs/`, a self-contained [THREE.JS](https://threejs.org/) backend, built on the core classes. 1. `spine-player/`, a self-contained player to easily display Spine animations on your website, built on the core classes and WebGL backend. 1. `spine-phaser/`, a [Phaser](https://phaser.io/) backend, built on the core classes. -1. `spine-pixi/`, a [PixiJS v7](https://pixijs.com/) backend, built on the core classes. +1. `spine-pixi-v7/`, a [PixiJS v7](https://pixijs.com/) backend, built on the core classes. 1. `spine-pixi-v8/`, a [PixiJS v8](https://pixijs.com/) backend, built on the core classes. In most cases, the `spine-player` module is best suited for your needs. Please refer to the [Spine Web Player documentation](https://esotericsoftware.com/spine-player) for more information. @@ -19,7 +19,7 @@ For documentation of the core API in `spine-core`, please refer to our [Spine Ru For documentation of `spine-phaser`, please refer to our [spine-phaser Guide](https://esotericsoftware.com/spine-phaser). -For documentation of `spine-pixi` and `spine-pixi-v8`, please refer to our [spine-pixi Guide](https://esotericsoftware.com/spine-pixi). +For documentation of `spine-pixi-v7` and `spine-pixi-v8`, please refer to our [spine-pixi Guide](https://esotericsoftware.com/spine-pixi). For documentation of `spine-canvaskit`, please refer to our [spine-canvaskit Guide](https://esotericsoftware.com/spine-canvaskit). @@ -79,7 +79,7 @@ You can include a module in your project via a ` // spine-pixi - + // spine-pixi-v8 @@ -101,7 +101,7 @@ npm install @esotericsoftware/spine-webgl npm install @esotericsoftware/spine-player npm install @esotericsoftware/spine-threejs npm install @esotericsoftware/spine-phaser -npm install @esotericsoftware/spine-pixi +npm install @esotericsoftware/spine-pixi-v7 npm install @esotericsoftware/spine-pixi-v8 ``` diff --git a/spine-ts/build.sh b/spine-ts/build.sh index 4ebdb1eec..e32508668 100755 --- a/spine-ts/build.sh +++ b/spine-ts/build.sh @@ -20,7 +20,7 @@ then spine-webgl/dist/iife/* \ spine-player/dist/iife/* \ spine-threejs/dist/iife/* \ - spine-pixi/dist/iife/* \ + spine-pixi-v7/dist/iife/* \ spine-pixi-v8/dist/iife/* \ spine-phaser/dist/iife/* \ spine-player/css/spine-player.css diff --git a/spine-ts/index.html b/spine-ts/index.html index 41dda9140..981f3f8c4 100644 --- a/spine-ts/index.html +++ b/spine-ts/index.html @@ -29,32 +29,32 @@
  • Physics
  • Micro Benchmark
  • -
  • Pixi
  • +
  • PixiJS v7
  • -
  • Pixi V8
  • +
  • PixiJS v8