Merge branch '4.1' into 4.2-beta

# Conflicts: # spine-ts/package-lock.json # spine-ts/package.json # spine-ts/spine-canvas/package.json # spine-ts/spine-core/package.json # spine-ts/spine-phaser/package.json # spine-ts/spine-pixi/package.json # spine-ts/spine-player/package.json # spine-ts/spine-threejs/package.json # spine-ts/spine-webgl/package.json
EsotericSoftware · Jan 16, 2024 · f68f543 · f68f543
2 parents bd1acdc + 5dbdcb3
commit f68f543
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/spine-godot/spine_godot/SpineBoneNode.cpp b/spine-godot/spine_godot/SpineBoneNode.cpp
@@ -45,6 +45,8 @@ void SpineBoneNode::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_debug_color"), &SpineBoneNode::set_debug_color);
 	ClassDB::bind_method(D_METHOD("get_debug_color"), &SpineBoneNode::get_debug_color);
 	ClassDB::bind_method(D_METHOD("_on_world_transforms_changed", "spine_sprite"), &SpineBoneNode::on_world_transforms_changed);
+	ClassDB::bind_method(D_METHOD("find_bone"), &SpineBoneNode::find_bone);
+	ClassDB::bind_method(D_METHOD("find_sprite"), &SpineBoneNode::find_parent_sprite);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "bone_mode", PROPERTY_HINT_ENUM, "Follow,Drive"), "set_bone_mode", "get_bone_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "get_enabled");

diff --git a/spine-godot/spine_godot/SpineBoneNode.h b/spine-godot/spine_godot/SpineBoneNode.h
@@ -30,6 +30,7 @@
 #pragma once
 
 #include "SpineCommon.h"
+#include "SpineSkeleton.h"
 #include "SpineSprite.h"
 #include "scene/2d/node_2d.h"
 
@@ -51,8 +52,6 @@ class SpineBoneNode : public Node2D {
 	void on_world_transforms_changed(const Variant &_sprite);
 	void update_transform(SpineSprite *sprite);
 	void init_transform(SpineSprite *sprite);
-	SpineSprite *find_parent_sprite() const;
-	Ref<SpineBone> find_bone() const;
 	void draw();
 
 public:
@@ -73,4 +72,8 @@ class SpineBoneNode : public Node2D {
 	void set_debug_color(Color _color);
 
 	Color get_debug_color();
+
+	SpineSprite *find_parent_sprite() const;
+
+	Ref<SpineBone> find_bone() const;
 };
diff --git a/spine-ts/spine-phaser/src/SpinePlugin.ts b/spine-ts/spine-phaser/src/SpinePlugin.ts
@@ -348,7 +348,7 @@ class SpineAtlasFile extends Phaser.Loader.MultiFile {
 					}
 				}
 
-				let basePath = file.src.match(/^.*\//);
+				let basePath = file.src.match(/^.*\//) ?? "";
 				for (var i = 0; i < textures.length; i++) {
 					var url = basePath + textures[i];
 					var key = file.key + "!" + textures[i];

diff --git a/spine-ts/tsconfig.base.json b/spine-ts/tsconfig.base.json
@@ -1,19 +1,16 @@
 {
-	"compilerOptions": {
-		"target": "ESNext",
-		"module": "ESNext",
-		"noImplicitAny": true,
-		"preserveConstEnums": true,
-		"inlineSourceMap": true,
-		"esModuleInterop": true,
-		"lib": [
-			"DOM",
-			"ES2015",
-			"ScriptHost"
-		],
-		"declaration": true,
-		"composite": true,
-		"moduleResolution": "node",
-		"strict": true,
-	}
-}
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "noImplicitAny": true,
+    "preserveConstEnums": true,
+    "inlineSourceMap": true,
+    "esModuleInterop": true,
+    "lib": ["DOM", "ES2015", "ScriptHost"],
+    "declaration": true,
+    "composite": true,
+    "moduleResolution": "node",
+    "skipLibCheck": true,
+    "strict": true
+  }
+}