Skip to content

Commit

Permalink
[godot] Closes #2381, regression in SpineSlot::get_bone()
Browse files Browse the repository at this point in the history
  • Loading branch information
@badlogic
badlogic committed Sep 22, 2023
1 parent 432cb9d commit fa1fb09
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 133 deletions.
244 changes: 112 additions & 132 deletions spine-godot/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
@@ -1,133 +1,113 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "cppvsdbg",
"request": "launch",
"name": "debug scene v4",
"program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
"args": [
"--path",
"example-v4",
"examples/01-helloworld/helloworld.tscn"
],
"cwd": "${workspaceFolder}",
"preLaunchTask": "build-v4",
"linux": {
"type": "lldb",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64",
},
"osx": {
"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",
"args": [
"-e",
"--path",
"example-v4",
],
"cwd": "${workspaceFolder}",
"preLaunchTask": "build-v4",
"linux": {
"type": "lldb",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64",
},
"osx": {
"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 c#",
"program": "godot/bin/godot.windows.editor.dev.x86_64.mono.exe",
"args": [
"-e",
"--path",
"example-v4",
],
"cwd": "${workspaceFolder}",
"preLaunchTask": "build-v4",
"linux": {
"type": "lldb",
"request": "launch",
"name": "debug editor v4",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64",
},
"osx": {
"type": "lldb",
"request": "launch",
"name": "debug editor v4",
"program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64.mono",
},
},
{
"type": "cppvsdbg",
"request": "launch",
"name": "debug scene v3",
"cwd": "${workspaceFolder}",
"program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
"args": [
"--path",
"example",
"examples/01-helloworld/helloworld.tscn"
],
"preLaunchTask": "build-v3",
"linux": {
"type": "cppdbg",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.linux.tools.64",
},
"osx": {
"type": "lldb",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.osx.tools.64",
},
},
{
"type": "cppvsdbg",
"request": "launch",
"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",
},
},
]
}
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "cppvsdbg",
"request": "launch",
"name": "debug scene v4",
"program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
"args": ["--path", "example-v4", "examples/07-slot-node/slot-node.tscn"],
"cwd": "${workspaceFolder}",
"preLaunchTask": "build-v4",
"linux": {
"type": "lldb",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
},
"osx": {
"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",
"args": ["-e", "--path", "example-v4"],
"cwd": "${workspaceFolder}",
"preLaunchTask": "build-v4",
"linux": {
"type": "lldb",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
},
"osx": {
"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 c#",
"program": "godot/bin/godot.windows.editor.dev.x86_64.mono.exe",
"args": ["-e", "--path", "example-v4"],
"cwd": "${workspaceFolder}",
"preLaunchTask": "build-v4",
"linux": {
"type": "lldb",
"request": "launch",
"name": "debug editor v4",
"program": "${workspaceFolder}/godot/bin/godot.linux.editor.dev.x86_64"
},
"osx": {
"type": "lldb",
"request": "launch",
"name": "debug editor v4",
"program": "${workspaceFolder}/godot/bin/godot.macos.editor.dev.arm64.mono"
}
},
{
"type": "cppvsdbg",
"request": "launch",
"name": "debug scene v3",
"cwd": "${workspaceFolder}",
"program": "${workspaceFolder}/godot/bin/godot.windows.tools.64.exe",
"args": ["--path", "example", "examples/01-helloworld/helloworld.tscn"],
"preLaunchTask": "build-v3",
"linux": {
"type": "cppdbg",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.linux.tools.64"
},
"osx": {
"type": "lldb",
"request": "launch",
"name": "debug scene v3",
"program": "${workspaceFolder}/godot/bin/godot.osx.tools.64"
}
},
{
"type": "cppvsdbg",
"request": "launch",
"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 changes: 1 addition & 1 deletion spine-godot/spine_godot/SpineSlot.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Ref<SpineSlotData> SpineSlot::get_data() {
Ref<SpineBone> SpineSlot::get_bone() {
SPINE_CHECK(get_spine_object(), nullptr)
if (_bone.is_valid()) {
return _data;
return _bone;
} else {
auto &bone = get_spine_object()->getBone();
Ref<SpineBone> bone_ref(memnew(SpineBone));
Expand Down

0 comments on commit fa1fb09

Please sign in to comment.