Browse Source

[ts] Closes #2207, updates threejs to latest.

Mario Zechner 2 years ago
parent
commit
c19194ac7d

+ 32 - 16
spine-ts/package-lock.json

@@ -53,9 +53,17 @@
       "dev": true
     },
     "node_modules/@types/three": {
-      "version": "0.140.0",
-      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.140.0.tgz",
-      "integrity": "sha512-YPJLSIY6uKUOp1k6BZYDq5GtEIdhfeK04UCbc9IPAVbdn/RNjkfrbnyd7smrsNkJhc0IFASLpd3AAYgwqgXKVQ=="
+      "version": "0.146.0",
+      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.146.0.tgz",
+      "integrity": "sha512-75AgysUrIvTCB054eQa2pDVFurfeFW8CrMQjpzjt3yHBfuuknoSvvsESd/3EhQxPrz9si3+P0wiDUVsWUlljfA==",
+      "dependencies": {
+        "@types/webxr": "*"
+      }
+    },
+    "node_modules/@types/webxr": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.0.tgz",
+      "integrity": "sha512-IUMDPSXnYIbEO2IereEFcgcqfDREOgmbGqtrMpVPpACTU6pltYLwHgVkrnYv0XhWEcjio9sYEfIEzgn3c7nDqA=="
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -7569,9 +7577,9 @@
       }
     },
     "node_modules/three": {
-      "version": "0.140.2",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.140.2.tgz",
-      "integrity": "sha512-DdT/AHm/TbZXEhQKQpGt5/iSgBrmXpjU26FNtj1KhllVPTKj1eG4X/ShyD5W2fngE+I1s1wa4ttC4C3oCJt7Ag=="
+      "version": "0.146.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.146.0.tgz",
+      "integrity": "sha512-1lvNfLezN6OJ9NaFAhfX4sm5e9YCzHtaRgZ1+B4C+Hv6TibRMsuBAM5/wVKzxjpYIlMymvgsHEFrrigEfXnb2A=="
     },
     "node_modules/through": {
       "version": "2.3.8",
@@ -7992,8 +8000,8 @@
       "license": "LicenseRef-LICENSE",
       "dependencies": {
         "@esotericsoftware/spine-core": "^4.1.23",
-        "@types/three": "^0.140.0",
-        "three": "^0.140.0"
+        "@types/three": "^0.146.0",
+        "three": "^0.146.0"
       }
     },
     "spine-webgl": {
@@ -8025,8 +8033,8 @@
       "version": "file:spine-threejs",
       "requires": {
         "@esotericsoftware/spine-core": "^4.1.23",
-        "@types/three": "^0.140.0",
-        "three": "^0.140.0"
+        "@types/three": "^0.146.0",
+        "three": "^0.146.0"
       }
     },
     "@esotericsoftware/spine-webgl": {
@@ -8042,9 +8050,17 @@
       "dev": true
     },
     "@types/three": {
-      "version": "0.140.0",
-      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.140.0.tgz",
-      "integrity": "sha512-YPJLSIY6uKUOp1k6BZYDq5GtEIdhfeK04UCbc9IPAVbdn/RNjkfrbnyd7smrsNkJhc0IFASLpd3AAYgwqgXKVQ=="
+      "version": "0.146.0",
+      "resolved": "https://registry.npmjs.org/@types/three/-/three-0.146.0.tgz",
+      "integrity": "sha512-75AgysUrIvTCB054eQa2pDVFurfeFW8CrMQjpzjt3yHBfuuknoSvvsESd/3EhQxPrz9si3+P0wiDUVsWUlljfA==",
+      "requires": {
+        "@types/webxr": "*"
+      }
+    },
+    "@types/webxr": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.0.tgz",
+      "integrity": "sha512-IUMDPSXnYIbEO2IereEFcgcqfDREOgmbGqtrMpVPpACTU6pltYLwHgVkrnYv0XhWEcjio9sYEfIEzgn3c7nDqA=="
     },
     "accepts": {
       "version": "1.3.8",
@@ -13963,9 +13979,9 @@
       }
     },
     "three": {
-      "version": "0.140.2",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.140.2.tgz",
-      "integrity": "sha512-DdT/AHm/TbZXEhQKQpGt5/iSgBrmXpjU26FNtj1KhllVPTKj1eG4X/ShyD5W2fngE+I1s1wa4ttC4C3oCJt7Ag=="
+      "version": "0.146.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.146.0.tgz",
+      "integrity": "sha512-1lvNfLezN6OJ9NaFAhfX4sm5e9YCzHtaRgZ1+B4C+Hv6TibRMsuBAM5/wVKzxjpYIlMymvgsHEFrrigEfXnb2A=="
     },
     "through": {
       "version": "2.3.8",

+ 2 - 2
spine-ts/spine-threejs/package.json

@@ -30,8 +30,8 @@
   },
   "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
   "dependencies": {
-    "@types/three": "^0.140.0",
-    "three": "^0.140.0",
+    "@types/three": "^0.146.0",
+    "three": "^0.146.0",
     "@esotericsoftware/spine-core": "^4.1.23"
   }
 }

+ 1 - 1
spine-ts/spine-webgl/src/SkeletonDebugRenderer.ts

@@ -195,7 +195,7 @@ export class SkeletonDebugRenderer implements Disposable {
 			for (let i = 0, n = bones.length; i < n; i++) {
 				let bone = bones[i];
 				if (ignoredBones && ignoredBones.indexOf(bone.data.name) > -1) continue;
-				shapes.circle(true, bone.worldX, bone.worldY, 3 * this.scale, SkeletonDebugRenderer.GREEN, 8);
+				shapes.circle(true, bone.worldX, bone.worldY, 3 * this.scale, this.boneOriginColor, 8);
 			}
 		}