From b01acf49fda01f4861582b9c4c20035e58804714 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 6 Apr 2022 11:49:16 +0200 Subject: [PATCH] [godot] Refactor example file layout. --- spine-godot/example/Spineboy.gd | 4 ++-- .../assets/mix-and-match/mix-and-match-data.tres | 10 ++++++++++ .../mix-and-match/mix-and-match-pro.json | 0 .../mix-and-match/mix-and-match-pro.json.import | 13 +++++++++++++ .../mix-and-match/mix-and-match.atlas | 0 .../mix-and-match/mix-and-match.atlas.import | 14 ++++++++++++++ .../{ => assets}/mix-and-match/mix-and-match.png | Bin .../mix-and-match/mix-and-match.png.import | 6 +++--- .../example/assets/raptor/raprot-data.tres | 10 ++++++++++ .../example/{ => assets}/raptor/raptor-pro.skel | Bin .../example/assets/raptor/raptor-pro.skel.import | 13 +++++++++++++ .../example/{ => assets}/raptor/raptor.atlas | 0 .../example/assets/raptor/raptor.atlas.import | 14 ++++++++++++++ .../example/{ => assets}/raptor/raptor.png | Bin .../example/{ => assets}/raptor/raptor.png.import | 6 +++--- .../example/assets/spineboy/spineboy-data.tres | 10 ++++++++++ .../{ => assets}/spineboy/spineboy-pro.json | 0 .../assets/spineboy/spineboy-pro.json.import | 13 +++++++++++++ .../{ => assets}/spineboy/spineboy-pro.skel | Bin .../assets/spineboy/spineboy-pro.skel.import | 13 +++++++++++++ .../example/{ => assets}/spineboy/spineboy.atlas | 0 .../example/assets/spineboy/spineboy.atlas.import | 14 ++++++++++++++ .../example/{ => assets}/spineboy/spineboy.png | Bin .../{ => assets}/spineboy/spineboy.png.import | 6 +++--- spine-godot/example/mix-and-match.gd | 2 +- .../example/mix-and-match/mix-and-match-data.tres | 10 ---------- .../mix-and-match/mix-and-match-pro.json.import | 13 ------------- .../mix-and-match/mix-and-match.atlas.import | 14 -------------- spine-godot/example/raptor/raprot-data.tres | 10 ---------- spine-godot/example/raptor/raptor-pro.skel.import | 13 ------------- spine-godot/example/raptor/raptor.atlas.import | 14 -------------- spine-godot/example/spineboy.tscn | 8 ++++---- spine-godot/example/spineboy/spineboy-data.tres | 10 ---------- .../example/spineboy/spineboy-pro.json.import | 13 ------------- .../example/spineboy/spineboy-pro.skel.import | 13 ------------- .../example/spineboy/spineboy.atlas.import | 14 -------------- spine-godot/example/tests/unit-tests.tscn | 2 +- .../godot/modules/spine_godot/SpineSprite.cpp | 2 +- 38 files changed, 142 insertions(+), 142 deletions(-) create mode 100644 spine-godot/example/assets/mix-and-match/mix-and-match-data.tres rename spine-godot/example/{ => assets}/mix-and-match/mix-and-match-pro.json (100%) create mode 100644 spine-godot/example/assets/mix-and-match/mix-and-match-pro.json.import rename spine-godot/example/{ => assets}/mix-and-match/mix-and-match.atlas (100%) create mode 100644 spine-godot/example/assets/mix-and-match/mix-and-match.atlas.import rename spine-godot/example/{ => assets}/mix-and-match/mix-and-match.png (100%) rename spine-godot/example/{ => assets}/mix-and-match/mix-and-match.png.import (69%) create mode 100644 spine-godot/example/assets/raptor/raprot-data.tres rename spine-godot/example/{ => assets}/raptor/raptor-pro.skel (100%) create mode 100644 spine-godot/example/assets/raptor/raptor-pro.skel.import rename spine-godot/example/{ => assets}/raptor/raptor.atlas (100%) create mode 100644 spine-godot/example/assets/raptor/raptor.atlas.import rename spine-godot/example/{ => assets}/raptor/raptor.png (100%) rename spine-godot/example/{ => assets}/raptor/raptor.png.import (72%) create mode 100644 spine-godot/example/assets/spineboy/spineboy-data.tres rename spine-godot/example/{ => assets}/spineboy/spineboy-pro.json (100%) create mode 100644 spine-godot/example/assets/spineboy/spineboy-pro.json.import rename spine-godot/example/{ => assets}/spineboy/spineboy-pro.skel (100%) create mode 100644 spine-godot/example/assets/spineboy/spineboy-pro.skel.import rename spine-godot/example/{ => assets}/spineboy/spineboy.atlas (100%) create mode 100644 spine-godot/example/assets/spineboy/spineboy.atlas.import rename spine-godot/example/{ => assets}/spineboy/spineboy.png (100%) rename spine-godot/example/{ => assets}/spineboy/spineboy.png.import (71%) delete mode 100644 spine-godot/example/mix-and-match/mix-and-match-data.tres delete mode 100644 spine-godot/example/mix-and-match/mix-and-match-pro.json.import delete mode 100644 spine-godot/example/mix-and-match/mix-and-match.atlas.import delete mode 100644 spine-godot/example/raptor/raprot-data.tres delete mode 100644 spine-godot/example/raptor/raptor-pro.skel.import delete mode 100644 spine-godot/example/raptor/raptor.atlas.import delete mode 100644 spine-godot/example/spineboy/spineboy-data.tres delete mode 100644 spine-godot/example/spineboy/spineboy-pro.json.import delete mode 100644 spine-godot/example/spineboy/spineboy-pro.skel.import delete mode 100644 spine-godot/example/spineboy/spineboy.atlas.import diff --git a/spine-godot/example/Spineboy.gd b/spine-godot/example/Spineboy.gd index 6a7de1c43..e140e27f1 100644 --- a/spine-godot/example/Spineboy.gd +++ b/spine-godot/example/Spineboy.gd @@ -1,4 +1,4 @@ extends SpineSprite -func _ready(): - get_animation_state().set_animation("walk", true, 0); +func _ready(): + get_animation_state().set_animation("walk", true, 0) diff --git a/spine-godot/example/assets/mix-and-match/mix-and-match-data.tres b/spine-godot/example/assets/mix-and-match/mix-and-match-data.tres new file mode 100644 index 000000000..691b54067 --- /dev/null +++ b/spine-godot/example/assets/mix-and-match/mix-and-match-data.tres @@ -0,0 +1,10 @@ +[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] + +[ext_resource path="res://assets/mix-and-match/mix-and-match.atlas" type="SpineAtlasResource" id=1] +[ext_resource path="res://assets/mix-and-match/mix-and-match-pro.json" type="SpineSkeletonFileResource" id=2] + +[resource] +atlas_res = ExtResource( 1 ) +skeleton_file_res = ExtResource( 2 ) +animations = null +skins = null diff --git a/spine-godot/example/mix-and-match/mix-and-match-pro.json b/spine-godot/example/assets/mix-and-match/mix-and-match-pro.json similarity index 100% rename from spine-godot/example/mix-and-match/mix-and-match-pro.json rename to spine-godot/example/assets/mix-and-match/mix-and-match-pro.json diff --git a/spine-godot/example/assets/mix-and-match/mix-and-match-pro.json.import b/spine-godot/example/assets/mix-and-match/mix-and-match-pro.json.import new file mode 100644 index 000000000..0d81a2f6a --- /dev/null +++ b/spine-godot/example/assets/mix-and-match/mix-and-match-pro.json.import @@ -0,0 +1,13 @@ +[remap] + +importer="spine.json" +type="SpineSkeletonFileResource" +path="res://.import/mix-and-match-pro.json-57325a5014e6fd56fc4a86824bc458ea.spjson" + +[deps] + +source_file="res://assets/mix-and-match/mix-and-match-pro.json" +dest_files=[ "res://.import/mix-and-match-pro.json-57325a5014e6fd56fc4a86824bc458ea.spjson" ] + +[params] + diff --git a/spine-godot/example/mix-and-match/mix-and-match.atlas b/spine-godot/example/assets/mix-and-match/mix-and-match.atlas similarity index 100% rename from spine-godot/example/mix-and-match/mix-and-match.atlas rename to spine-godot/example/assets/mix-and-match/mix-and-match.atlas diff --git a/spine-godot/example/assets/mix-and-match/mix-and-match.atlas.import b/spine-godot/example/assets/mix-and-match/mix-and-match.atlas.import new file mode 100644 index 000000000..eb2d7b75a --- /dev/null +++ b/spine-godot/example/assets/mix-and-match/mix-and-match.atlas.import @@ -0,0 +1,14 @@ +[remap] + +importer="spine.atlas" +type="SpineAtlasResource" +path="res://.import/mix-and-match.atlas-3d349b543ecdcc01fb29033adaef0841.spatlas" + +[deps] + +source_file="res://assets/mix-and-match/mix-and-match.atlas" +dest_files=[ "res://.import/mix-and-match.atlas-3d349b543ecdcc01fb29033adaef0841.spatlas" ] + +[params] + +normal_texture_prefix="n" diff --git a/spine-godot/example/mix-and-match/mix-and-match.png b/spine-godot/example/assets/mix-and-match/mix-and-match.png similarity index 100% rename from spine-godot/example/mix-and-match/mix-and-match.png rename to spine-godot/example/assets/mix-and-match/mix-and-match.png diff --git a/spine-godot/example/mix-and-match/mix-and-match.png.import b/spine-godot/example/assets/mix-and-match/mix-and-match.png.import similarity index 69% rename from spine-godot/example/mix-and-match/mix-and-match.png.import rename to spine-godot/example/assets/mix-and-match/mix-and-match.png.import index c62d6622a..5aed4962f 100644 --- a/spine-godot/example/mix-and-match/mix-and-match.png.import +++ b/spine-godot/example/assets/mix-and-match/mix-and-match.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/mix-and-match.png-9b5652df6ad1d929562c4c4464642a95.stex" +path="res://.import/mix-and-match.png-c2d8e28d9f2efc380ff8b95a22dadcc3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://mix-and-match/mix-and-match.png" -dest_files=[ "res://.import/mix-and-match.png-9b5652df6ad1d929562c4c4464642a95.stex" ] +source_file="res://assets/mix-and-match/mix-and-match.png" +dest_files=[ "res://.import/mix-and-match.png-c2d8e28d9f2efc380ff8b95a22dadcc3.stex" ] [params] diff --git a/spine-godot/example/assets/raptor/raprot-data.tres b/spine-godot/example/assets/raptor/raprot-data.tres new file mode 100644 index 000000000..c36f08e3c --- /dev/null +++ b/spine-godot/example/assets/raptor/raprot-data.tres @@ -0,0 +1,10 @@ +[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] + +[ext_resource path="res://assets/raptor/raptor.atlas" type="SpineAtlasResource" id=1] +[ext_resource path="res://assets/raptor/raptor-pro.skel" type="SpineSkeletonFileResource" id=2] + +[resource] +atlas_res = ExtResource( 1 ) +skeleton_file_res = ExtResource( 2 ) +animations = null +skins = null diff --git a/spine-godot/example/raptor/raptor-pro.skel b/spine-godot/example/assets/raptor/raptor-pro.skel similarity index 100% rename from spine-godot/example/raptor/raptor-pro.skel rename to spine-godot/example/assets/raptor/raptor-pro.skel diff --git a/spine-godot/example/assets/raptor/raptor-pro.skel.import b/spine-godot/example/assets/raptor/raptor-pro.skel.import new file mode 100644 index 000000000..e5dde3bda --- /dev/null +++ b/spine-godot/example/assets/raptor/raptor-pro.skel.import @@ -0,0 +1,13 @@ +[remap] + +importer="spine.skel" +type="SpineSkeletonFileResource" +path="res://.import/raptor-pro.skel-022e23a5f5581547a2d7faa9fb2c54e3.spskel" + +[deps] + +source_file="res://assets/raptor/raptor-pro.skel" +dest_files=[ "res://.import/raptor-pro.skel-022e23a5f5581547a2d7faa9fb2c54e3.spskel" ] + +[params] + diff --git a/spine-godot/example/raptor/raptor.atlas b/spine-godot/example/assets/raptor/raptor.atlas similarity index 100% rename from spine-godot/example/raptor/raptor.atlas rename to spine-godot/example/assets/raptor/raptor.atlas diff --git a/spine-godot/example/assets/raptor/raptor.atlas.import b/spine-godot/example/assets/raptor/raptor.atlas.import new file mode 100644 index 000000000..e9d58e9c3 --- /dev/null +++ b/spine-godot/example/assets/raptor/raptor.atlas.import @@ -0,0 +1,14 @@ +[remap] + +importer="spine.atlas" +type="SpineAtlasResource" +path="res://.import/raptor.atlas-66da4b831eebf404341993162ba3ddb8.spatlas" + +[deps] + +source_file="res://assets/raptor/raptor.atlas" +dest_files=[ "res://.import/raptor.atlas-66da4b831eebf404341993162ba3ddb8.spatlas" ] + +[params] + +normal_texture_prefix="n" diff --git a/spine-godot/example/raptor/raptor.png b/spine-godot/example/assets/raptor/raptor.png similarity index 100% rename from spine-godot/example/raptor/raptor.png rename to spine-godot/example/assets/raptor/raptor.png diff --git a/spine-godot/example/raptor/raptor.png.import b/spine-godot/example/assets/raptor/raptor.png.import similarity index 72% rename from spine-godot/example/raptor/raptor.png.import rename to spine-godot/example/assets/raptor/raptor.png.import index abf1055bd..d5b77bbbf 100644 --- a/spine-godot/example/raptor/raptor.png.import +++ b/spine-godot/example/assets/raptor/raptor.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/raptor.png-420f3263481783832181f91be3310d7c.stex" +path="res://.import/raptor.png-505be50f63fd1d0fb9175a9efbb9776c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://raptor/raptor.png" -dest_files=[ "res://.import/raptor.png-420f3263481783832181f91be3310d7c.stex" ] +source_file="res://assets/raptor/raptor.png" +dest_files=[ "res://.import/raptor.png-505be50f63fd1d0fb9175a9efbb9776c.stex" ] [params] diff --git a/spine-godot/example/assets/spineboy/spineboy-data.tres b/spine-godot/example/assets/spineboy/spineboy-data.tres new file mode 100644 index 000000000..bbf68fd09 --- /dev/null +++ b/spine-godot/example/assets/spineboy/spineboy-data.tres @@ -0,0 +1,10 @@ +[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] + +[ext_resource path="res://assets/spineboy/spineboy.atlas" type="SpineAtlasResource" id=1] +[ext_resource path="res://assets/spineboy/spineboy-pro.json" type="SpineSkeletonFileResource" id=2] + +[resource] +atlas_res = ExtResource( 1 ) +skeleton_file_res = ExtResource( 2 ) +animations = null +skins = null diff --git a/spine-godot/example/spineboy/spineboy-pro.json b/spine-godot/example/assets/spineboy/spineboy-pro.json similarity index 100% rename from spine-godot/example/spineboy/spineboy-pro.json rename to spine-godot/example/assets/spineboy/spineboy-pro.json diff --git a/spine-godot/example/assets/spineboy/spineboy-pro.json.import b/spine-godot/example/assets/spineboy/spineboy-pro.json.import new file mode 100644 index 000000000..2417e0c06 --- /dev/null +++ b/spine-godot/example/assets/spineboy/spineboy-pro.json.import @@ -0,0 +1,13 @@ +[remap] + +importer="spine.json" +type="SpineSkeletonFileResource" +path="res://.import/spineboy-pro.json-60444223fe3960c6d4c33b92d7495419.spjson" + +[deps] + +source_file="res://assets/spineboy/spineboy-pro.json" +dest_files=[ "res://.import/spineboy-pro.json-60444223fe3960c6d4c33b92d7495419.spjson" ] + +[params] + diff --git a/spine-godot/example/spineboy/spineboy-pro.skel b/spine-godot/example/assets/spineboy/spineboy-pro.skel similarity index 100% rename from spine-godot/example/spineboy/spineboy-pro.skel rename to spine-godot/example/assets/spineboy/spineboy-pro.skel diff --git a/spine-godot/example/assets/spineboy/spineboy-pro.skel.import b/spine-godot/example/assets/spineboy/spineboy-pro.skel.import new file mode 100644 index 000000000..99e97a7a1 --- /dev/null +++ b/spine-godot/example/assets/spineboy/spineboy-pro.skel.import @@ -0,0 +1,13 @@ +[remap] + +importer="spine.skel" +type="SpineSkeletonFileResource" +path="res://.import/spineboy-pro.skel-52781a88227740d2a80cb8d7636ea22e.spskel" + +[deps] + +source_file="res://assets/spineboy/spineboy-pro.skel" +dest_files=[ "res://.import/spineboy-pro.skel-52781a88227740d2a80cb8d7636ea22e.spskel" ] + +[params] + diff --git a/spine-godot/example/spineboy/spineboy.atlas b/spine-godot/example/assets/spineboy/spineboy.atlas similarity index 100% rename from spine-godot/example/spineboy/spineboy.atlas rename to spine-godot/example/assets/spineboy/spineboy.atlas diff --git a/spine-godot/example/assets/spineboy/spineboy.atlas.import b/spine-godot/example/assets/spineboy/spineboy.atlas.import new file mode 100644 index 000000000..059e2f8b6 --- /dev/null +++ b/spine-godot/example/assets/spineboy/spineboy.atlas.import @@ -0,0 +1,14 @@ +[remap] + +importer="spine.atlas" +type="SpineAtlasResource" +path="res://.import/spineboy.atlas-54c12b5ff1cdaaa1b4e452a7d0d868c9.spatlas" + +[deps] + +source_file="res://assets/spineboy/spineboy.atlas" +dest_files=[ "res://.import/spineboy.atlas-54c12b5ff1cdaaa1b4e452a7d0d868c9.spatlas" ] + +[params] + +normal_texture_prefix="n" diff --git a/spine-godot/example/spineboy/spineboy.png b/spine-godot/example/assets/spineboy/spineboy.png similarity index 100% rename from spine-godot/example/spineboy/spineboy.png rename to spine-godot/example/assets/spineboy/spineboy.png diff --git a/spine-godot/example/spineboy/spineboy.png.import b/spine-godot/example/assets/spineboy/spineboy.png.import similarity index 71% rename from spine-godot/example/spineboy/spineboy.png.import rename to spine-godot/example/assets/spineboy/spineboy.png.import index 8518e5044..1ff0d1e77 100644 --- a/spine-godot/example/spineboy/spineboy.png.import +++ b/spine-godot/example/assets/spineboy/spineboy.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/spineboy.png-a63588ec3a5ca6e83ef256edf38d798a.stex" +path="res://.import/spineboy.png-436dbd6da2b707b6828ede17b7871f43.stex" metadata={ "vram_texture": false } [deps] -source_file="res://spineboy/spineboy.png" -dest_files=[ "res://.import/spineboy.png-a63588ec3a5ca6e83ef256edf38d798a.stex" ] +source_file="res://assets/spineboy/spineboy.png" +dest_files=[ "res://.import/spineboy.png-436dbd6da2b707b6828ede17b7871f43.stex" ] [params] diff --git a/spine-godot/example/mix-and-match.gd b/spine-godot/example/mix-and-match.gd index 424b75c9a..e9a4309c7 100644 --- a/spine-godot/example/mix-and-match.gd +++ b/spine-godot/example/mix-and-match.gd @@ -14,5 +14,5 @@ func _ready(): customSkin.add_skin(data.find_skin("accessories/bag")) customSkin.add_skin(data.find_skin("accessories/hat-red-yellow")) get_skeleton().set_skin(customSkin); - + get_animation_state().set_animation("dance", true, 0) diff --git a/spine-godot/example/mix-and-match/mix-and-match-data.tres b/spine-godot/example/mix-and-match/mix-and-match-data.tres deleted file mode 100644 index 07ed6e681..000000000 --- a/spine-godot/example/mix-and-match/mix-and-match-data.tres +++ /dev/null @@ -1,10 +0,0 @@ -[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] - -[ext_resource path="res://mix-and-match/mix-and-match.atlas" type="SpineAtlasResource" id=1] -[ext_resource path="res://mix-and-match/mix-and-match-pro.json" type="SpineSkeletonFileResource" id=2] - -[resource] -atlas_res = ExtResource( 1 ) -skeleton_file_res = ExtResource( 2 ) -animations = null -skins = null diff --git a/spine-godot/example/mix-and-match/mix-and-match-pro.json.import b/spine-godot/example/mix-and-match/mix-and-match-pro.json.import deleted file mode 100644 index 6cc3ca6f3..000000000 --- a/spine-godot/example/mix-and-match/mix-and-match-pro.json.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="spine.json" -type="SpineSkeletonFileResource" -path="res://.import/mix-and-match-pro.json-5ca1b9fd6cb1c37bf492ced0be2e27b8.spjson" - -[deps] - -source_file="res://mix-and-match/mix-and-match-pro.json" -dest_files=[ "res://.import/mix-and-match-pro.json-5ca1b9fd6cb1c37bf492ced0be2e27b8.spjson" ] - -[params] - diff --git a/spine-godot/example/mix-and-match/mix-and-match.atlas.import b/spine-godot/example/mix-and-match/mix-and-match.atlas.import deleted file mode 100644 index 986667144..000000000 --- a/spine-godot/example/mix-and-match/mix-and-match.atlas.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="spine.atlas" -type="SpineAtlasResource" -path="res://.import/mix-and-match.atlas-0bbed47d1d8e8f4ac037195dc25c9fd9.spatlas" - -[deps] - -source_file="res://mix-and-match/mix-and-match.atlas" -dest_files=[ "res://.import/mix-and-match.atlas-0bbed47d1d8e8f4ac037195dc25c9fd9.spatlas" ] - -[params] - -normal_texture_prefix="n" diff --git a/spine-godot/example/raptor/raprot-data.tres b/spine-godot/example/raptor/raprot-data.tres deleted file mode 100644 index 4106432b7..000000000 --- a/spine-godot/example/raptor/raprot-data.tres +++ /dev/null @@ -1,10 +0,0 @@ -[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] - -[ext_resource path="res://raptor/raptor.atlas" type="SpineAtlasResource" id=1] -[ext_resource path="res://raptor/raptor-pro.skel" type="SpineSkeletonFileResource" id=2] - -[resource] -atlas_res = ExtResource( 1 ) -skeleton_file_res = ExtResource( 2 ) -animations = null -skins = null diff --git a/spine-godot/example/raptor/raptor-pro.skel.import b/spine-godot/example/raptor/raptor-pro.skel.import deleted file mode 100644 index efc8cde21..000000000 --- a/spine-godot/example/raptor/raptor-pro.skel.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="spine.skel" -type="SpineSkeletonFileResource" -path="res://.import/raptor-pro.skel-081da74993f6ecc0a4d44df29812228b.spskel" - -[deps] - -source_file="res://raptor/raptor-pro.skel" -dest_files=[ "res://.import/raptor-pro.skel-081da74993f6ecc0a4d44df29812228b.spskel" ] - -[params] - diff --git a/spine-godot/example/raptor/raptor.atlas.import b/spine-godot/example/raptor/raptor.atlas.import deleted file mode 100644 index de23c9d5e..000000000 --- a/spine-godot/example/raptor/raptor.atlas.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="spine.atlas" -type="SpineAtlasResource" -path="res://.import/raptor.atlas-583a25d9ded86c934bc106fc3b7bf122.spatlas" - -[deps] - -source_file="res://raptor/raptor.atlas" -dest_files=[ "res://.import/raptor.atlas-583a25d9ded86c934bc106fc3b7bf122.spatlas" ] - -[params] - -normal_texture_prefix="n" diff --git a/spine-godot/example/spineboy.tscn b/spine-godot/example/spineboy.tscn index 144fc9029..e0628758b 100644 --- a/spine-godot/example/spineboy.tscn +++ b/spine-godot/example/spineboy.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=9 format=2] [ext_resource path="res://Spineboy.gd" type="Script" id=1] -[ext_resource path="res://spineboy/spineboy-data.tres" type="SpineSkeletonDataResource" id=2] -[ext_resource path="res://mix-and-match/mix-and-match-data.tres" type="SpineSkeletonDataResource" id=3] +[ext_resource path="res://assets/spineboy/spineboy-data.tres" type="SpineSkeletonDataResource" id=2] +[ext_resource path="res://assets/mix-and-match/mix-and-match-data.tres" type="SpineSkeletonDataResource" id=3] [ext_resource path="res://mix-and-match.gd" type="Script" id=5] -[ext_resource path="res://raptor/raprot-data.tres" type="SpineSkeletonDataResource" id=6] +[ext_resource path="res://assets/raptor/raprot-data.tres" type="SpineSkeletonDataResource" id=6] [sub_resource type="SpineAnimationStateDataResource" id=2] skeleton = ExtResource( 2 ) @@ -29,7 +29,7 @@ scale = Vector2( 0.5, 0.5 ) animation_state_data_res = SubResource( 3 ) script = ExtResource( 5 ) -[node name="SpineSprite" type="SpineSprite" parent="."] +[node name="Raptor" type="SpineSprite" parent="."] position = Vector2( 261.223, 541.504 ) scale = Vector2( 0.5, 0.5 ) animation_state_data_res = SubResource( 5 ) diff --git a/spine-godot/example/spineboy/spineboy-data.tres b/spine-godot/example/spineboy/spineboy-data.tres deleted file mode 100644 index 2d86840dd..000000000 --- a/spine-godot/example/spineboy/spineboy-data.tres +++ /dev/null @@ -1,10 +0,0 @@ -[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] - -[ext_resource path="res://spineboy/spineboy.atlas" type="SpineAtlasResource" id=1] -[ext_resource path="res://spineboy/spineboy-pro.json" type="SpineSkeletonFileResource" id=2] - -[resource] -atlas_res = ExtResource( 1 ) -skeleton_file_res = ExtResource( 2 ) -animations = null -skins = null diff --git a/spine-godot/example/spineboy/spineboy-pro.json.import b/spine-godot/example/spineboy/spineboy-pro.json.import deleted file mode 100644 index 9c29cab82..000000000 --- a/spine-godot/example/spineboy/spineboy-pro.json.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="spine.json" -type="SpineSkeletonFileResource" -path="res://.import/spineboy-pro.json-32eeb9972a49130cf636442038541a01.spjson" - -[deps] - -source_file="res://spineboy/spineboy-pro.json" -dest_files=[ "res://.import/spineboy-pro.json-32eeb9972a49130cf636442038541a01.spjson" ] - -[params] - diff --git a/spine-godot/example/spineboy/spineboy-pro.skel.import b/spine-godot/example/spineboy/spineboy-pro.skel.import deleted file mode 100644 index 36d370ed6..000000000 --- a/spine-godot/example/spineboy/spineboy-pro.skel.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="spine.skel" -type="SpineSkeletonFileResource" -path="res://.import/spineboy-pro.skel-88c7de1bbf310b7c70ac742b725847b2.spskel" - -[deps] - -source_file="res://spineboy/spineboy-pro.skel" -dest_files=[ "res://.import/spineboy-pro.skel-88c7de1bbf310b7c70ac742b725847b2.spskel" ] - -[params] - diff --git a/spine-godot/example/spineboy/spineboy.atlas.import b/spine-godot/example/spineboy/spineboy.atlas.import deleted file mode 100644 index 05918eceb..000000000 --- a/spine-godot/example/spineboy/spineboy.atlas.import +++ /dev/null @@ -1,14 +0,0 @@ -[remap] - -importer="spine.atlas" -type="SpineAtlasResource" -path="res://.import/spineboy.atlas-0160ebf51649da264b83de15c13561f4.spatlas" - -[deps] - -source_file="res://spineboy/spineboy.atlas" -dest_files=[ "res://.import/spineboy.atlas-0160ebf51649da264b83de15c13561f4.spatlas" ] - -[params] - -normal_texture_prefix="n" diff --git a/spine-godot/example/tests/unit-tests.tscn b/spine-godot/example/tests/unit-tests.tscn index 48dca3de9..438887eab 100644 --- a/spine-godot/example/tests/unit-tests.tscn +++ b/spine-godot/example/tests/unit-tests.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=56 format=2] [ext_resource path="res://tests/unit-tests.gd" type="Script" id=1] -[ext_resource path="res://spineboy/spineboy-data.tres" type="SpineSkeletonDataResource" id=2] +[ext_resource path="res://assets/spineboy/spineboy-data.tres" type="SpineSkeletonDataResource" id=2] [sub_resource type="SpineAnimationStateDataResource" id=1] skeleton = ExtResource( 2 ) diff --git a/spine-godot/godot/modules/spine_godot/SpineSprite.cpp b/spine-godot/godot/modules/spine_godot/SpineSprite.cpp index 68146ad79..53ac79165 100644 --- a/spine-godot/godot/modules/spine_godot/SpineSprite.cpp +++ b/spine-godot/godot/modules/spine_godot/SpineSprite.cpp @@ -37,7 +37,7 @@ void SpineSprite::_bind_methods() { ClassDB::bind_method(D_METHOD("get_animation_state_data_res"), &SpineSprite::get_animation_state_data_res); ClassDB::bind_method(D_METHOD("_on_animation_data_created"), &SpineSprite::_on_animation_data_created); ClassDB::bind_method(D_METHOD("get_skeleton"), &SpineSprite::get_skeleton); - ClassDB::bind_method(D_METHOD("get_spine_object"), &SpineSprite::get_animation_state); + ClassDB::bind_method(D_METHOD("get_animation_state"), &SpineSprite::get_animation_state); ClassDB::bind_method(D_METHOD("_on_animation_data_changed"), &SpineSprite::_on_animation_data_changed); ClassDB::bind_method(D_METHOD("get_bind_slot_nodes"), &SpineSprite::get_bind_slot_nodes);