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
Basic example
Manual Loading
diff --git a/spine-ts/package-lock.json b/spine-ts/package-lock.json
index a41a5636b..824e1c14c 100644
--- a/spine-ts/package-lock.json
+++ b/spine-ts/package-lock.json
@@ -14,7 +14,7 @@
"spine-phaser",
"spine-player",
"spine-threejs",
- "spine-pixi",
+ "spine-pixi-v7",
"spine-pixi-v8",
"spine-canvaskit",
"spine-webgl"
@@ -74,8 +74,8 @@
"resolved": "spine-phaser",
"link": true
},
- "node_modules/@esotericsoftware/spine-pixi": {
- "resolved": "spine-pixi",
+ "node_modules/@esotericsoftware/spine-pixi-v7": {
+ "resolved": "spine-pixi-v7",
"link": true
},
"node_modules/@esotericsoftware/spine-pixi-v8": {
@@ -3167,6 +3167,23 @@
"spine-pixi": {
"name": "@esotericsoftware/spine-pixi",
"version": "4.2.62",
+ "extraneous": true,
+ "license": "LicenseRef-LICENSE",
+ "dependencies": {
+ "@esotericsoftware/spine-core": "4.2.62"
+ },
+ "peerDependencies": {
+ "@pixi/assets": "^7.2.4",
+ "@pixi/core": "^7.2.4",
+ "@pixi/display": "^7.2.4",
+ "@pixi/graphics": "^7.2.4",
+ "@pixi/mesh": "^7.2.4",
+ "@pixi/text": "^7.2.4"
+ }
+ },
+ "spine-pixi-v7": {
+ "name": "@esotericsoftware/spine-pixi-v7",
+ "version": "4.2.62",
"license": "LicenseRef-LICENSE",
"dependencies": {
"@esotericsoftware/spine-core": "4.2.62"
diff --git a/spine-ts/package.json b/spine-ts/package.json
index 11fe88977..a9fec1ab9 100644
--- a/spine-ts/package.json
+++ b/spine-ts/package.json
@@ -8,8 +8,8 @@
],
"scripts": {
"prepublish": "npm run clean && npm run build",
- "clean": "npx rimraf spine-core/dist spine-canvas/dist spine-canvaskit/dist spine-webgl/dist spine-phaser/dist spine-player/dist spine-threejs/dist spine-pixi/dist spine-pixi-v8/dist",
- "build": "npm run clean && npm run build:modules && concurrently \"npm run build:core\" \"npm run build:canvas\" \"npm run build:canvaskit\" \"npm run build:webgl\" \"npm run build:phaser\" \"npm run build:player\" \"npm run build:threejs\" \"npm run build:pixi\" \"npm run build:pixi-v8\"",
+ "clean": "npx rimraf spine-core/dist spine-canvas/dist spine-canvaskit/dist spine-webgl/dist spine-phaser/dist spine-player/dist spine-threejs/dist spine-pixi-v7/dist spine-pixi-v8/dist",
+ "build": "npm run clean && npm run build:modules && concurrently \"npm run build:core\" \"npm run build:canvas\" \"npm run build:canvaskit\" \"npm run build:webgl\" \"npm run build:phaser\" \"npm run build:player\" \"npm run build:threejs\" \"npm run build:pixi-v7\" \"npm run build:pixi-v8\"",
"postbuild": "npm run minify",
"build:modules": "npx tsc -b -clean && npx tsc -b",
"build:core": "npx esbuild --bundle spine-core/src/index.ts --tsconfig=spine-core/tsconfig.json --sourcemap --outfile=spine-core/dist/iife/spine-core.js --format=iife --global-name=spine",
@@ -19,10 +19,10 @@
"build:player": "npx copyfiles -f spine-player/css/spine-player.css spine-player/dist/ && npx esbuild spine-player/dist/spine-player.css --minify --outfile=spine-player/dist/spine-player.min.css && npx esbuild --bundle spine-player/src/index.ts --tsconfig=spine-player/tsconfig.json --sourcemap --outfile=spine-player/dist/iife/spine-player.js --format=iife --global-name=spine",
"build:phaser": "npx esbuild --bundle spine-phaser/src/index.ts --tsconfig=spine-phaser/tsconfig.json --sourcemap --outfile=spine-phaser/dist/iife/spine-phaser.js --external:Phaser --alias:phaser=Phaser --format=iife --global-name=spine",
"build:threejs": "npx esbuild --bundle spine-threejs/src/index.ts --tsconfig=spine-threejs/tsconfig.json --sourcemap --outfile=spine-threejs/dist/iife/spine-threejs.js --external:three --format=iife --global-name=spine",
- "build:pixi": "npx esbuild --bundle spine-pixi/src/index.ts --tsconfig=spine-pixi/tsconfig.json --sourcemap --outfile=spine-pixi/dist/iife/spine-pixi.js --external:@pixi/* --format=iife --global-name=spine",
+ "build:pixi-v7": "npx esbuild --bundle spine-pixi-v7/src/index.ts --tsconfig=spine-pixi-v7/tsconfig.json --sourcemap --outfile=spine-pixi-v7/dist/iife/spine-pixi-v7.js --external:@pixi/* --format=iife --global-name=spine",
"build:pixi-v8": "npx esbuild --bundle spine-pixi-v8/src/index.ts --tsconfig=spine-pixi-v8/tsconfig.json --sourcemap --outfile=spine-pixi-v8/dist/iife/spine-pixi-v8.js --external:pixi.js --format=iife --global-name=spine",
- "minify": "npx esbuild --minify spine-core/dist/iife/spine-core.js --outfile=spine-core/dist/iife/spine-core.min.js && npx esbuild --minify spine-canvas/dist/iife/spine-canvas.js --outfile=spine-canvas/dist/iife/spine-canvas.min.js && npx esbuild --minify spine-canvaskit/dist/iife/spine-canvaskit.js --outfile=spine-canvaskit/dist/iife/spine-canvaskit.min.js && npx esbuild --minify spine-player/dist/iife/spine-player.js --outfile=spine-player/dist/iife/spine-player.min.js && npx esbuild --minify spine-phaser/dist/iife/spine-phaser.js --outfile=spine-phaser/dist/iife/spine-phaser.min.js && npx esbuild --minify spine-webgl/dist/iife/spine-webgl.js --outfile=spine-webgl/dist/iife/spine-webgl.min.js && npx esbuild --minify spine-threejs/dist/iife/spine-threejs.js --outfile=spine-threejs/dist/iife/spine-threejs.min.js && npx esbuild --minify spine-pixi/dist/iife/spine-pixi.js --outfile=spine-pixi/dist/iife/spine-pixi.min.js && npx esbuild --minify spine-pixi-v8/dist/iife/spine-pixi-v8.js --outfile=spine-pixi-v8/dist/iife/spine-pixi-v8.min.js",
- "dev": "concurrently \"npx live-server\" \"npm run dev:canvas\" \"npm run dev:canvaskit\" \"npm run dev:webgl\" \"npm run dev:phaser\" \"npm run dev:player\" \"npm run dev:threejs\" \"npm run dev:pixi\" \"npm run dev:pixi-v8\" \"npm run dev:modules\"",
+ "minify": "npx esbuild --minify spine-core/dist/iife/spine-core.js --outfile=spine-core/dist/iife/spine-core.min.js && npx esbuild --minify spine-canvas/dist/iife/spine-canvas.js --outfile=spine-canvas/dist/iife/spine-canvas.min.js && npx esbuild --minify spine-canvaskit/dist/iife/spine-canvaskit.js --outfile=spine-canvaskit/dist/iife/spine-canvaskit.min.js && npx esbuild --minify spine-player/dist/iife/spine-player.js --outfile=spine-player/dist/iife/spine-player.min.js && npx esbuild --minify spine-phaser/dist/iife/spine-phaser.js --outfile=spine-phaser/dist/iife/spine-phaser.min.js && npx esbuild --minify spine-webgl/dist/iife/spine-webgl.js --outfile=spine-webgl/dist/iife/spine-webgl.min.js && npx esbuild --minify spine-threejs/dist/iife/spine-threejs.js --outfile=spine-threejs/dist/iife/spine-threejs.min.js && npx esbuild --minify spine-pixi-v7/dist/iife/spine-pixi-v7.js --outfile=spine-pixi-v7/dist/iife/spine-pixi-v7.min.js && npx esbuild --minify spine-pixi-v8/dist/iife/spine-pixi-v8.js --outfile=spine-pixi-v8/dist/iife/spine-pixi-v8.min.js",
+ "dev": "concurrently \"npx live-server\" \"npm run dev:canvas\" \"npm run dev:canvaskit\" \"npm run dev:webgl\" \"npm run dev:phaser\" \"npm run dev:player\" \"npm run dev:threejs\" \"npm run dev:pixi-v7\" \"npm run dev:pixi-v8\" \"npm run dev:modules\"",
"dev:modules": "npm run build:modules -- --watch",
"dev:canvas": "npm run build:canvas -- --watch",
"dev:canvaskit": "npm run build:canvaskit -- --watch",
@@ -30,7 +30,7 @@
"dev:phaser": "npm run build:phaser -- --watch",
"dev:player": "npm run build:player -- --watch",
"dev:threejs": "npm run build:threejs -- --watch",
- "dev:pixi": "npm run build:pixi -- --watch",
+ "dev:pixi-v7": "npm run build:pixi-v7 -- --watch",
"dev:pixi-v8": "npm run build:pixi-v8 -- --watch"
},
"repository": {
@@ -58,7 +58,7 @@
"spine-phaser",
"spine-player",
"spine-threejs",
- "spine-pixi",
+ "spine-pixi-v7",
"spine-pixi-v8",
"spine-canvaskit",
"spine-webgl"
diff --git a/spine-ts/publish.sh b/spine-ts/publish.sh
index 75e005002..c0eea0892 100755
--- a/spine-ts/publish.sh
+++ b/spine-ts/publish.sh
@@ -16,7 +16,7 @@ sed -i '' "s/$currentVersion/$newVersion/" spine-canvas/package.json
sed -i '' "s/$currentVersion/$newVersion/" spine-canvaskit/package.json
sed -i '' "s/$currentVersion/$newVersion/" spine-core/package.json
sed -i '' "s/$currentVersion/$newVersion/" spine-phaser/package.json
-sed -i '' "s/$currentVersion/$newVersion/" spine-pixi/package.json
+sed -i '' "s/$currentVersion/$newVersion/" spine-pixi-v7/package.json
sed -i '' "s/$currentVersion/$newVersion/" spine-pixi-v8/package.json
sed -i '' "s/$currentVersion/$newVersion/" spine-player/package.json
sed -i '' "s/$currentVersion/$newVersion/" spine-threejs/package.json
diff --git a/spine-ts/spine-pixi/README.md b/spine-ts/spine-pixi-v7/README.md
similarity index 100%
rename from spine-ts/spine-pixi/README.md
rename to spine-ts/spine-pixi-v7/README.md
diff --git a/spine-ts/spine-pixi/example/assets/celestial-circus-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/celestial-circus-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/celestial-circus-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/celestial-circus-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/celestial-circus-pma.png b/spine-ts/spine-pixi-v7/example/assets/celestial-circus-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/celestial-circus-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/celestial-circus-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/celestial-circus-pro.json b/spine-ts/spine-pixi-v7/example/assets/celestial-circus-pro.json
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/celestial-circus-pro.json
rename to spine-ts/spine-pixi-v7/example/assets/celestial-circus-pro.json
diff --git a/spine-ts/spine-pixi/example/assets/celestial-circus-pro.skel b/spine-ts/spine-pixi-v7/example/assets/celestial-circus-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/celestial-circus-pro.skel
rename to spine-ts/spine-pixi-v7/example/assets/celestial-circus-pro.skel
diff --git a/spine-ts/spine-pixi/example/assets/celestial-circus.atlas b/spine-ts/spine-pixi-v7/example/assets/celestial-circus.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/celestial-circus.atlas
rename to spine-ts/spine-pixi-v7/example/assets/celestial-circus.atlas
diff --git a/spine-ts/spine-pixi/example/assets/celestial-circus.png b/spine-ts/spine-pixi-v7/example/assets/celestial-circus.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/celestial-circus.png
rename to spine-ts/spine-pixi-v7/example/assets/celestial-circus.png
diff --git a/spine-ts/spine-pixi/example/assets/cloud-pot-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/cloud-pot-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/cloud-pot-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/cloud-pot-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/cloud-pot-pma.png b/spine-ts/spine-pixi-v7/example/assets/cloud-pot-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/cloud-pot-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/cloud-pot-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/cloud-pot.json b/spine-ts/spine-pixi-v7/example/assets/cloud-pot.json
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/cloud-pot.json
rename to spine-ts/spine-pixi-v7/example/assets/cloud-pot.json
diff --git a/spine-ts/spine-pixi/example/assets/cloud-pot.skel b/spine-ts/spine-pixi-v7/example/assets/cloud-pot.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/cloud-pot.skel
rename to spine-ts/spine-pixi-v7/example/assets/cloud-pot.skel
diff --git a/spine-ts/spine-pixi/example/assets/coin-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/coin-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/coin-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/coin-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/coin-pma.png b/spine-ts/spine-pixi-v7/example/assets/coin-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/coin-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/coin-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/coin-pro.skel b/spine-ts/spine-pixi-v7/example/assets/coin-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/coin-pro.skel
rename to spine-ts/spine-pixi-v7/example/assets/coin-pro.skel
diff --git a/spine-ts/spine-pixi/example/assets/mix-and-match-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/mix-and-match-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/mix-and-match-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/mix-and-match-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/mix-and-match-pma.png b/spine-ts/spine-pixi-v7/example/assets/mix-and-match-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/mix-and-match-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/mix-and-match-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/mix-and-match-pro.skel b/spine-ts/spine-pixi-v7/example/assets/mix-and-match-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/mix-and-match-pro.skel
rename to spine-ts/spine-pixi-v7/example/assets/mix-and-match-pro.skel
diff --git a/spine-ts/spine-pixi/example/assets/raptor-jaw-tooth.png b/spine-ts/spine-pixi-v7/example/assets/raptor-jaw-tooth.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/raptor-jaw-tooth.png
rename to spine-ts/spine-pixi-v7/example/assets/raptor-jaw-tooth.png
diff --git a/spine-ts/spine-pixi/example/assets/raptor-pro.json b/spine-ts/spine-pixi-v7/example/assets/raptor-pro.json
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/raptor-pro.json
rename to spine-ts/spine-pixi-v7/example/assets/raptor-pro.json
diff --git a/spine-ts/spine-pixi/example/assets/raptor.atlas b/spine-ts/spine-pixi-v7/example/assets/raptor.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/raptor.atlas
rename to spine-ts/spine-pixi-v7/example/assets/raptor.atlas
diff --git a/spine-ts/spine-pixi/example/assets/raptor.png b/spine-ts/spine-pixi-v7/example/assets/raptor.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/raptor.png
rename to spine-ts/spine-pixi-v7/example/assets/raptor.png
diff --git a/spine-ts/spine-pixi/example/assets/sack-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/sack-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/sack-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/sack-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/sack-pma.png b/spine-ts/spine-pixi-v7/example/assets/sack-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/sack-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/sack-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/sack-pro.json b/spine-ts/spine-pixi-v7/example/assets/sack-pro.json
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/sack-pro.json
rename to spine-ts/spine-pixi-v7/example/assets/sack-pro.json
diff --git a/spine-ts/spine-pixi/example/assets/sack-pro.skel b/spine-ts/spine-pixi-v7/example/assets/sack-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/sack-pro.skel
rename to spine-ts/spine-pixi-v7/example/assets/sack-pro.skel
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pma.png b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pma_2.png b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_2.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pma_2.png
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_2.png
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pma_3.png b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_3.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pma_3.png
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_3.png
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pma_4.png b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_4.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pma_4.png
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_4.png
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pma_5.png b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_5.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pma_5.png
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pma_5.png
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pro.json b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pro.json
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pro.json
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pro.json
diff --git a/spine-ts/spine-pixi/example/assets/snowglobe-pro.skel b/spine-ts/spine-pixi-v7/example/assets/snowglobe-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/snowglobe-pro.skel
rename to spine-ts/spine-pixi-v7/example/assets/snowglobe-pro.skel
diff --git a/spine-ts/spine-pixi/example/assets/spineboy-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/spineboy-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/spineboy-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/spineboy-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/spineboy-pma.png b/spine-ts/spine-pixi-v7/example/assets/spineboy-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/spineboy-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/spineboy-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/spineboy-pro.json b/spine-ts/spine-pixi-v7/example/assets/spineboy-pro.json
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/spineboy-pro.json
rename to spine-ts/spine-pixi-v7/example/assets/spineboy-pro.json
diff --git a/spine-ts/spine-pixi/example/assets/spineboy-pro.skel b/spine-ts/spine-pixi-v7/example/assets/spineboy-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/spineboy-pro.skel
rename to spine-ts/spine-pixi-v7/example/assets/spineboy-pro.skel
diff --git a/spine-ts/spine-pixi/example/assets/spineboy.atlas b/spine-ts/spine-pixi-v7/example/assets/spineboy.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/spineboy.atlas
rename to spine-ts/spine-pixi-v7/example/assets/spineboy.atlas
diff --git a/spine-ts/spine-pixi/example/assets/spineboy.png b/spine-ts/spine-pixi-v7/example/assets/spineboy.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/spineboy.png
rename to spine-ts/spine-pixi-v7/example/assets/spineboy.png
diff --git a/spine-ts/spine-pixi/example/assets/stretchyman-pma.atlas b/spine-ts/spine-pixi-v7/example/assets/stretchyman-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/stretchyman-pma.atlas
rename to spine-ts/spine-pixi-v7/example/assets/stretchyman-pma.atlas
diff --git a/spine-ts/spine-pixi/example/assets/stretchyman-pma.png b/spine-ts/spine-pixi-v7/example/assets/stretchyman-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/stretchyman-pma.png
rename to spine-ts/spine-pixi-v7/example/assets/stretchyman-pma.png
diff --git a/spine-ts/spine-pixi/example/assets/stretchyman-pro.skel b/spine-ts/spine-pixi-v7/example/assets/stretchyman-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/assets/stretchyman-pro.skel
rename to spine-ts/spine-pixi-v7/example/assets/stretchyman-pro.skel
diff --git a/spine-ts/spine-pixi/example/control-bones-example.html b/spine-ts/spine-pixi-v7/example/control-bones-example.html
similarity index 98%
rename from spine-ts/spine-pixi/example/control-bones-example.html
rename to spine-ts/spine-pixi-v7/example/control-bones-example.html
index d1d4386ed..ce5625ed7 100644
--- a/spine-ts/spine-pixi/example/control-bones-example.html
+++ b/spine-ts/spine-pixi-v7/example/control-bones-example.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/events-example.html b/spine-ts/spine-pixi-v7/example/events-example.html
similarity index 98%
rename from spine-ts/spine-pixi/example/events-example.html
rename to spine-ts/spine-pixi-v7/example/events-example.html
index c9ac469e0..937b5af2f 100644
--- a/spine-ts/spine-pixi/example/events-example.html
+++ b/spine-ts/spine-pixi-v7/example/events-example.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/index.html b/spine-ts/spine-pixi-v7/example/index.html
similarity index 96%
rename from spine-ts/spine-pixi/example/index.html
rename to spine-ts/spine-pixi-v7/example/index.html
index 036b0acd8..06f6f0593 100644
--- a/spine-ts/spine-pixi/example/index.html
+++ b/spine-ts/spine-pixi-v7/example/index.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/manual-loading.html b/spine-ts/spine-pixi-v7/example/manual-loading.html
similarity index 97%
rename from spine-ts/spine-pixi/example/manual-loading.html
rename to spine-ts/spine-pixi-v7/example/manual-loading.html
index 9518d2191..a954ffabe 100644
--- a/spine-ts/spine-pixi/example/manual-loading.html
+++ b/spine-ts/spine-pixi-v7/example/manual-loading.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/mix-and-match-example.html b/spine-ts/spine-pixi-v7/example/mix-and-match-example.html
similarity index 97%
rename from spine-ts/spine-pixi/example/mix-and-match-example.html
rename to spine-ts/spine-pixi-v7/example/mix-and-match-example.html
index 8d7ccaa51..e74781116 100644
--- a/spine-ts/spine-pixi/example/mix-and-match-example.html
+++ b/spine-ts/spine-pixi-v7/example/mix-and-match-example.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/mouse-following.html b/spine-ts/spine-pixi-v7/example/mouse-following.html
similarity index 98%
rename from spine-ts/spine-pixi/example/mouse-following.html
rename to spine-ts/spine-pixi-v7/example/mouse-following.html
index d05e9f59d..f0c26dc30 100644
--- a/spine-ts/spine-pixi/example/mouse-following.html
+++ b/spine-ts/spine-pixi-v7/example/mouse-following.html
@@ -3,7 +3,7 @@
Spine Pixi Example
-
+
diff --git a/spine-ts/spine-pixi/example/physics.html b/spine-ts/spine-pixi-v7/example/physics.html
similarity index 96%
rename from spine-ts/spine-pixi/example/physics.html
rename to spine-ts/spine-pixi-v7/example/physics.html
index 5e28572e7..373899b73 100644
--- a/spine-ts/spine-pixi/example/physics.html
+++ b/spine-ts/spine-pixi-v7/example/physics.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/physics2.html b/spine-ts/spine-pixi-v7/example/physics2.html
similarity index 98%
rename from spine-ts/spine-pixi/example/physics2.html
rename to spine-ts/spine-pixi-v7/example/physics2.html
index 3e2149958..1139afc63 100644
--- a/spine-ts/spine-pixi/example/physics2.html
+++ b/spine-ts/spine-pixi-v7/example/physics2.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/physics3.html b/spine-ts/spine-pixi-v7/example/physics3.html
similarity index 96%
rename from spine-ts/spine-pixi/example/physics3.html
rename to spine-ts/spine-pixi-v7/example/physics3.html
index fd5a8f62b..39eb523a5 100644
--- a/spine-ts/spine-pixi/example/physics3.html
+++ b/spine-ts/spine-pixi-v7/example/physics3.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/physics4.html b/spine-ts/spine-pixi-v7/example/physics4.html
similarity index 96%
rename from spine-ts/spine-pixi/example/physics4.html
rename to spine-ts/spine-pixi-v7/example/physics4.html
index 506b8c7de..8e664a82b 100644
--- a/spine-ts/spine-pixi/example/physics4.html
+++ b/spine-ts/spine-pixi-v7/example/physics4.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/simple-input.html b/spine-ts/spine-pixi-v7/example/simple-input.html
similarity index 98%
rename from spine-ts/spine-pixi/example/simple-input.html
rename to spine-ts/spine-pixi-v7/example/simple-input.html
index fc0b9be22..c698f4ffa 100644
--- a/spine-ts/spine-pixi/example/simple-input.html
+++ b/spine-ts/spine-pixi-v7/example/simple-input.html
@@ -3,7 +3,7 @@
spine-pixi
-
+
diff --git a/spine-ts/spine-pixi/example/slot-objects.html b/spine-ts/spine-pixi-v7/example/slot-objects.html
similarity index 97%
rename from spine-ts/spine-pixi/example/slot-objects.html
rename to spine-ts/spine-pixi-v7/example/slot-objects.html
index 54829c892..b3242b874 100644
--- a/spine-ts/spine-pixi/example/slot-objects.html
+++ b/spine-ts/spine-pixi-v7/example/slot-objects.html
@@ -2,8 +2,8 @@
spine-pixi
-
-
+
+
diff --git a/spine-ts/spine-pixi/example/typescript/README.md b/spine-ts/spine-pixi-v7/example/typescript/README.md
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/README.md
rename to spine-ts/spine-pixi-v7/example/typescript/README.md
diff --git a/spine-ts/spine-pixi/example/typescript/assets/spineboy-pma.atlas b/spine-ts/spine-pixi-v7/example/typescript/assets/spineboy-pma.atlas
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/assets/spineboy-pma.atlas
rename to spine-ts/spine-pixi-v7/example/typescript/assets/spineboy-pma.atlas
diff --git a/spine-ts/spine-pixi/example/typescript/assets/spineboy-pma.png b/spine-ts/spine-pixi-v7/example/typescript/assets/spineboy-pma.png
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/assets/spineboy-pma.png
rename to spine-ts/spine-pixi-v7/example/typescript/assets/spineboy-pma.png
diff --git a/spine-ts/spine-pixi/example/typescript/assets/spineboy-pro.skel b/spine-ts/spine-pixi-v7/example/typescript/assets/spineboy-pro.skel
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/assets/spineboy-pro.skel
rename to spine-ts/spine-pixi-v7/example/typescript/assets/spineboy-pro.skel
diff --git a/spine-ts/spine-pixi/example/typescript/index.html b/spine-ts/spine-pixi-v7/example/typescript/index.html
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/index.html
rename to spine-ts/spine-pixi-v7/example/typescript/index.html
diff --git a/spine-ts/spine-pixi/example/typescript/index.ts b/spine-ts/spine-pixi-v7/example/typescript/index.ts
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/index.ts
rename to spine-ts/spine-pixi-v7/example/typescript/index.ts
diff --git a/spine-ts/spine-pixi/example/typescript/package-lock.json b/spine-ts/spine-pixi-v7/example/typescript/package-lock.json
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/package-lock.json
rename to spine-ts/spine-pixi-v7/example/typescript/package-lock.json
diff --git a/spine-ts/spine-pixi/example/typescript/package.json b/spine-ts/spine-pixi-v7/example/typescript/package.json
similarity index 100%
rename from spine-ts/spine-pixi/example/typescript/package.json
rename to spine-ts/spine-pixi-v7/example/typescript/package.json
diff --git a/spine-ts/spine-pixi/package.json b/spine-ts/spine-pixi-v7/package.json
similarity index 95%
rename from spine-ts/spine-pixi/package.json
rename to spine-ts/spine-pixi-v7/package.json
index d3cc69526..bf0803155 100644
--- a/spine-ts/spine-pixi/package.json
+++ b/spine-ts/spine-pixi-v7/package.json
@@ -1,5 +1,5 @@
{
- "name": "@esotericsoftware/spine-pixi",
+ "name": "@esotericsoftware/spine-pixi-v7",
"version": "4.2.62",
"description": "The official Spine Runtimes for the web PixiJS v7.",
"main": "dist/index.js",
diff --git a/spine-ts/spine-pixi/src/DarkSlotMesh.ts b/spine-ts/spine-pixi-v7/src/DarkSlotMesh.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/DarkSlotMesh.ts
rename to spine-ts/spine-pixi-v7/src/DarkSlotMesh.ts
diff --git a/spine-ts/spine-pixi/src/SlotMesh.ts b/spine-ts/spine-pixi-v7/src/SlotMesh.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/SlotMesh.ts
rename to spine-ts/spine-pixi-v7/src/SlotMesh.ts
diff --git a/spine-ts/spine-pixi/src/Spine.ts b/spine-ts/spine-pixi-v7/src/Spine.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/Spine.ts
rename to spine-ts/spine-pixi-v7/src/Spine.ts
diff --git a/spine-ts/spine-pixi/src/SpineDebugRenderer.ts b/spine-ts/spine-pixi-v7/src/SpineDebugRenderer.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/SpineDebugRenderer.ts
rename to spine-ts/spine-pixi-v7/src/SpineDebugRenderer.ts
diff --git a/spine-ts/spine-pixi/src/SpineTexture.ts b/spine-ts/spine-pixi-v7/src/SpineTexture.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/SpineTexture.ts
rename to spine-ts/spine-pixi-v7/src/SpineTexture.ts
diff --git a/spine-ts/spine-pixi/src/assets/atlasLoader.ts b/spine-ts/spine-pixi-v7/src/assets/atlasLoader.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/assets/atlasLoader.ts
rename to spine-ts/spine-pixi-v7/src/assets/atlasLoader.ts
diff --git a/spine-ts/spine-pixi/src/assets/skeletonLoader.ts b/spine-ts/spine-pixi-v7/src/assets/skeletonLoader.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/assets/skeletonLoader.ts
rename to spine-ts/spine-pixi-v7/src/assets/skeletonLoader.ts
diff --git a/spine-ts/spine-pixi/src/darkTintMesh/DarkTintBatchGeom.ts b/spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintBatchGeom.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/darkTintMesh/DarkTintBatchGeom.ts
rename to spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintBatchGeom.ts
diff --git a/spine-ts/spine-pixi/src/darkTintMesh/DarkTintGeom.ts b/spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintGeom.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/darkTintMesh/DarkTintGeom.ts
rename to spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintGeom.ts
diff --git a/spine-ts/spine-pixi/src/darkTintMesh/DarkTintMaterial.ts b/spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintMaterial.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/darkTintMesh/DarkTintMaterial.ts
rename to spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintMaterial.ts
diff --git a/spine-ts/spine-pixi/src/darkTintMesh/DarkTintMesh.ts b/spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintMesh.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/darkTintMesh/DarkTintMesh.ts
rename to spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintMesh.ts
diff --git a/spine-ts/spine-pixi/src/darkTintMesh/DarkTintRenderer.ts b/spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintRenderer.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/darkTintMesh/DarkTintRenderer.ts
rename to spine-ts/spine-pixi-v7/src/darkTintMesh/DarkTintRenderer.ts
diff --git a/spine-ts/spine-pixi/src/index.ts b/spine-ts/spine-pixi-v7/src/index.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/index.ts
rename to spine-ts/spine-pixi-v7/src/index.ts
diff --git a/spine-ts/spine-pixi/src/require-shim.ts b/spine-ts/spine-pixi-v7/src/require-shim.ts
similarity index 100%
rename from spine-ts/spine-pixi/src/require-shim.ts
rename to spine-ts/spine-pixi-v7/src/require-shim.ts
diff --git a/spine-ts/spine-pixi/tsconfig.json b/spine-ts/spine-pixi-v7/tsconfig.json
similarity index 100%
rename from spine-ts/spine-pixi/tsconfig.json
rename to spine-ts/spine-pixi-v7/tsconfig.json
diff --git a/spine-ts/tsconfig.json b/spine-ts/tsconfig.json
index b7d2af228..7fd88dfcc 100644
--- a/spine-ts/tsconfig.json
+++ b/spine-ts/tsconfig.json
@@ -23,7 +23,7 @@
"path": "./spine-threejs"
},
{
- "path": "./spine-pixi"
+ "path": "./spine-pixi-v7"
},
{
"path": "./spine-pixi-v8"
diff --git a/spine-ts/tsfmt.json b/spine-ts/tsfmt.json
index 990bb18ab..6b24a3b02 100644
--- a/spine-ts/tsfmt.json
+++ b/spine-ts/tsfmt.json
@@ -3,7 +3,7 @@
"indentSize": 4,
"tabSize": 4,
"indentStyle": 2,
- "newLineCharacter": "\r\n",
+ "newLineCharacter": "\n",
"convertTabsToSpaces": false,
"insertSpaceAfterCommaDelimiter": true,
"insertSpaceAfterSemicolonInForStatements": true,