UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Closes #2381, regression in SpineSlot::get_bone()

Browse Source
This commit is contained in:
Mario Zechner 2023-09-22 11:15:21 +02:00
parent 432cb9d8e7
commit fa1fb09cb2
2 changed files with 113 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
spine-godot/.vscode/launch.json vendored
View File

@ -1,133 +1,113 @@
{ {
// Use IntelliSense to learn about possible attributes. // Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes. // Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "cppvsdbg", "type": "cppvsdbg",
"request": "launch", "request": "launch",
"name": "debug scene v4", "name": "debug scene v4",
"program": "godot/bin/godot.windows.editor.dev.x86_64.exe", "program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
"args": [ "args": ["--path", "example-v4", "examples/07-slot-node/slot-node.tscn"],
"--path", "cwd": "${workspaceFolder}",
"example-v4", "preLaunchTask": "build-v4",
"examples/01-helloworld/helloworld.tscn" "linux": {
], "type": "lldb",
"cwd": "${workspaceFolder}", "request": "launch",
"preLaunchTask": "build-v4", "name": "debug scene v3",
"linux": { "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
"type": "lldb", },
"request": "launch", "osx": {
"name": "debug scene v3", "type": "lldb",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64", "request": "launch",
}, "name": "debug scene v3",
"osx": { "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64"
"type": "lldb", }
"request": "launch", },
"name": "debug scene v3", {
"program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64", "type": "cppvsdbg",
}, "request": "launch",
}, "name": "debug editor v4",
{ "program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
"type": "cppvsdbg", "args": ["-e", "--path", "example-v4"],
"request": "launch", "cwd": "${workspaceFolder}",
"name": "debug editor v4", "preLaunchTask": "build-v4",
"program": "godot/bin/godot.windows.editor.dev.x86_64.exe", "linux": {
"args": [ "type": "lldb",
"-e", "request": "launch",
"--path", "name": "debug scene v3",
"example-v4", "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
], },
"cwd": "${workspaceFolder}", "osx": {
"preLaunchTask": "build-v4", "type": "lldb",
"linux": { "request": "launch",
"type": "lldb", "name": "debug scene v3",
"request": "launch", "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64"
"name": "debug scene v3", }
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64", },
}, {
"osx": { "type": "cppvsdbg",
"type": "lldb", "request": "launch",
"request": "launch", "name": "debug editor v4 c#",
"name": "debug scene v3", "program": "godot/bin/godot.windows.editor.dev.x86_64.mono.exe",
"program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64", "args": ["-e", "--path", "example-v4"],
}, "cwd": "${workspaceFolder}",
}, "preLaunchTask": "build-v4",
{ "linux": {
"type": "cppvsdbg", "type": "lldb",
"request": "launch", "request": "launch",
"name": "debug editor v4 c#", "name": "debug editor v4",
"program": "godot/bin/godot.windows.editor.dev.x86_64.mono.exe", "program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
"args": [ },
"-e", "osx": {
"--path", "type": "lldb",
"example-v4", "request": "launch",
], "name": "debug editor v4",
"cwd": "${workspaceFolder}", "program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64.mono"
"preLaunchTask": "build-v4", }
"linux": { },
"type": "lldb", {
"request": "launch", "type": "cppvsdbg",
"name": "debug editor v4", "request": "launch",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64", "name": "debug scene v3",
}, "cwd": "${workspaceFolder}",
"osx": { "program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
"type": "lldb", "args": ["--path", "example", "examples/01-helloworld/helloworld.tscn"],
"request": "launch", "preLaunchTask": "build-v3",
"name": "debug editor v4", "linux": {
"program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64.mono", "type": "cppdbg",
}, "request": "launch",
}, "name": "debug scene v3",
{ "program": "${workspaceFolder}/godot/bin/godot.linux.tools.64"
"type": "cppvsdbg", },
"request": "launch", "osx": {
"name": "debug scene v3", "type": "lldb",
"cwd": "${workspaceFolder}", "request": "launch",
"program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe", "name": "debug scene v3",
"args": [ "program": "${workspaceFolder}/godot/bin/godot.osx.tools.64"
"--path", }
"example", },
"examples/01-helloworld/helloworld.tscn" {
], "type": "cppvsdbg",
"preLaunchTask": "build-v3", "request": "launch",
"linux": { "name": "debug editor v3",
"type": "cppdbg", "program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
"request": "launch", "args": ["-e", "--path", "example"],
"name": "debug scene v3", "cwd": "${workspaceFolder}",
"program": "${workspaceFolder}/godot/bin/godot.linux.tools.64", "preLaunchTask": "build-v3",
}, "linux": {
"osx": { "type": "cppdbg",
"type": "lldb", "request": "launch",
"request": "launch", "name": "debug editor v3",
"name": "debug scene v3", "program": "${workspaceFolder}/godot/bin/godot.linux.tools.64"
"program": "${workspaceFolder}/godot/bin/godot.osx.tools.64", },
}, "osx": {
}, "type": "lldb",
{ "request": "launch",
"type": "cppvsdbg", "name": "debug editor v3",
"request": "launch", "program": "${workspaceFolder}/godot/bin/godot.osx.tools.64"
"name": "debug editor v3", }
"program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe", }
"args": [ ]
"-e",
"--path",
"example",
],
"cwd": "${workspaceFolder}",
"preLaunchTask": "build-v3",
"linux": {
"type": "cppdbg",
"request": "launch",
"name": "debug editor v3",
"program": "${workspaceFolder}/godot/bin/godot.linux.tools.64",
},
"osx": {
"type": "lldb",
"request": "launch",
"name": "debug editor v3",
"program": "${workspaceFolder}/godot/bin/godot.osx.tools.64",
},
},
]
} }

2
spine-godot/spine_godot/SpineSlot.cpp
View File

@ -73,7 +73,7 @@ Ref<SpineSlotData> SpineSlot::get_data() {
Ref<SpineBone> SpineSlot::get_bone() { Ref<SpineBone> SpineSlot::get_bone() {
SPINE_CHECK(get_spine_object(), nullptr) SPINE_CHECK(get_spine_object(), nullptr)
if (_bone.is_valid()) { if (_bone.is_valid()) {
return _data; return _bone;
} else { } else {
auto &bone = get_spine_object()->getBone(); auto &bone = get_spine_object()->getBone();
Ref<SpineBone> bone_ref(memnew(SpineBone)); Ref<SpineBone> bone_ref(memnew(SpineBone));