diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index 46b5170ef..97029ac7d 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -455,25 +455,25 @@ Skin *SkeletonBinary::readSkin(DataInput *input, bool defaultSkin, SkeletonData skin = new (__FILE__, __LINE__) Skin(readStringRef(input, skeletonData)); for (int i = 0, n = readVarint(input, true); i < n; i++) { int boneIndex = readVarint(input, true); - if (boneIndex >= skeletonData->_bones.size()) return NULL; + if (boneIndex >= (int)skeletonData->_bones.size()) return NULL; skin->getBones().add(skeletonData->_bones[boneIndex]); } for (int i = 0, n = readVarint(input, true); i < n; i++) { int ikIndex = readVarint(input, true); - if (ikIndex >= skeletonData->_ikConstraints.size()) return NULL; + if (ikIndex >= (int)skeletonData->_ikConstraints.size()) return NULL; skin->getConstraints().add(skeletonData->_ikConstraints[ikIndex]); } for (int i = 0, n = readVarint(input, true); i < n; i++) { int transformIndex = readVarint(input, true); - if (transformIndex >= skeletonData->_transformConstraints.size()) return NULL; + if (transformIndex >= (int)skeletonData->_transformConstraints.size()) return NULL; skin->getConstraints().add(skeletonData->_transformConstraints[transformIndex]); } for (int i = 0, n = readVarint(input, true); i < n; i++) { int pathIndex = readVarint(input, true); - if (pathIndex >= skeletonData->_pathConstraints.size()) return NULL; + if (pathIndex >= (int)skeletonData->_pathConstraints.size()) return NULL; skin->getConstraints().add(skeletonData->_pathConstraints[pathIndex]); } slotCount = readVarint(input, true); 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 index eb2d7b75a..602678dd4 100644 --- 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 @@ -11,4 +11,4 @@ dest_files=[ "res://.import/mix-and-match.atlas-3d349b543ecdcc01fb29033adaef0841 [params] -normal_texture_prefix="n" +normal_map_prefix="n" diff --git a/spine-godot/example/assets/raptor/raptor.atlas.import b/spine-godot/example/assets/raptor/raptor.atlas.import index e9d58e9c3..840608165 100644 --- a/spine-godot/example/assets/raptor/raptor.atlas.import +++ b/spine-godot/example/assets/raptor/raptor.atlas.import @@ -11,4 +11,4 @@ dest_files=[ "res://.import/raptor.atlas-66da4b831eebf404341993162ba3ddb8.spatla [params] -normal_texture_prefix="n" +normal_map_prefix="n" diff --git a/spine-godot/example/assets/spineboy/spinebody-data-res.tres b/spine-godot/example/assets/spineboy/spinebody-data-res.tres index bbf68fd09..94fb261c5 100644 --- a/spine-godot/example/assets/spineboy/spinebody-data-res.tres +++ b/spine-godot/example/assets/spineboy/spinebody-data-res.tres @@ -1,10 +1,22 @@ -[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2] +[gd_resource type="SpineSkeletonDataResource" load_steps=5 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] +[sub_resource type="SpineAnimationMix" id=1] +from = "run" +to = "idle" +mix = 1.0 + +[sub_resource type="SpineAnimationMix" id=2] +from = "idle" +to = "run" +mix = 1.0 + [resource] atlas_res = ExtResource( 1 ) skeleton_file_res = ExtResource( 2 ) +default_mix = 0.2 +animation_mixes = [ SubResource( 1 ), SubResource( 2 ), null, null ] animations = null skins = null diff --git a/spine-godot/example/assets/spineboy/spineboy.atlas.import b/spine-godot/example/assets/spineboy/spineboy.atlas.import index 059e2f8b6..166d719ba 100644 --- a/spine-godot/example/assets/spineboy/spineboy.atlas.import +++ b/spine-godot/example/assets/spineboy/spineboy.atlas.import @@ -11,4 +11,4 @@ dest_files=[ "res://.import/spineboy.atlas-54c12b5ff1cdaaa1b4e452a7d0d868c9.spat [params] -normal_texture_prefix="n" +normal_map_prefix="n" diff --git a/spine-godot/example/examples/helloworld/helloworld.tscn b/spine-godot/example/examples/helloworld/helloworld.tscn index 7d9c7da9c..65eb6e9cd 100644 --- a/spine-godot/example/examples/helloworld/helloworld.tscn +++ b/spine-godot/example/examples/helloworld/helloworld.tscn @@ -1,34 +1,12 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://examples/helloworld/spineboy-helloworld.gd" type="Script" id=1] -[ext_resource path="res://examples/mix-and-match/mix-and-match.gd" type="Script" id=2] [ext_resource path="res://assets/spineboy/spinebody-data-res.tres" type="SpineSkeletonDataResource" id=3] -[ext_resource path="res://assets/mix-and-match/mix-and-match-data.tres" type="SpineSkeletonDataResource" id=4] -[ext_resource path="res://assets/raptor/raprot-data.tres" type="SpineSkeletonDataResource" id=5] - -[sub_resource type="GDScript" id=1] -script/source = "extends SpineSprite - -func _ready(): - get_animation_state().set_animation(\"walk\", true) -" [node name="Node2D" type="Node2D"] [node name="Spineboy" type="SpineSprite" parent="."] -position = Vector2( 137.107, 540.132 ) +position = Vector2( 496.207, 477.185 ) scale = Vector2( 0.466832, 0.466832 ) skeleton_data_res = ExtResource( 3 ) script = ExtResource( 1 ) - -[node name="MixAndMatch" type="SpineSprite" parent="."] -position = Vector2( 402.469, 534.677 ) -scale = Vector2( 0.366163, 0.366163 ) -skeleton_data_res = ExtResource( 4 ) -script = ExtResource( 2 ) - -[node name="Raptor" type="SpineSprite" parent="."] -position = Vector2( 793.667, 527.026 ) -scale = Vector2( 0.343143, 0.343143 ) -skeleton_data_res = ExtResource( 5 ) -script = SubResource( 1 ) diff --git a/spine-godot/example/examples/helloworld/spineboy-helloworld.gd b/spine-godot/example/examples/helloworld/spineboy-helloworld.gd index e140e27f1..1a4493c41 100644 --- a/spine-godot/example/examples/helloworld/spineboy-helloworld.gd +++ b/spine-godot/example/examples/helloworld/spineboy-helloworld.gd @@ -1,4 +1,4 @@ extends SpineSprite -func _ready(): +func _ready(): get_animation_state().set_animation("walk", true, 0) diff --git a/spine-godot/example/examples/simple-input/simple-input.tscn b/spine-godot/example/examples/simple-input/simple-input.tscn new file mode 100644 index 000000000..158909975 --- /dev/null +++ b/spine-godot/example/examples/simple-input/simple-input.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://assets/spineboy/spinebody-data-res.tres" type="SpineSkeletonDataResource" id=1] +[ext_resource path="res://examples/simple-input/spineboy-simple-input.gd" type="Script" id=2] + +[node name="Node2D" type="Node2D"] + +[node name="Spineboy" type="SpineSprite" parent="."] +position = Vector2( 501.503, 472.035 ) +scale = Vector2( 0.518624, 0.518624 ) +skeleton_data_res = ExtResource( 1 ) +script = ExtResource( 2 ) diff --git a/spine-godot/example/examples/simple-input/spineboy-simple-input.gd b/spine-godot/example/examples/simple-input/spineboy-simple-input.gd new file mode 100644 index 000000000..c871dc613 --- /dev/null +++ b/spine-godot/example/examples/simple-input/spineboy-simple-input.gd @@ -0,0 +1,19 @@ +extends SpineSprite + +func _ready(): + get_animation_state().set_animation("idle", true, 0) + +func _process(delta): + if Input.is_action_just_pressed("ui_left"): + get_animation_state().set_animation("run", true, 0) + get_skeleton().set_scale_x(-1) + + if Input.is_action_just_released("ui_left"): + get_animation_state().set_animation("idle", true, 0) + + if (Input.is_action_just_pressed("ui_right")): + get_animation_state().set_animation("run", true, 0) + get_skeleton().set_scale_x(1) + + if Input.is_action_just_released("ui_right"): + get_animation_state().set_animation("idle", true, 0) diff --git a/spine-godot/example/project.godot b/spine-godot/example/project.godot index b196fc59f..464c70e05 100644 --- a/spine-godot/example/project.godot +++ b/spine-godot/example/project.godot @@ -11,7 +11,7 @@ config_version=4 [application] config/name="spine-godot-examples" -run/main_scene="res://tests/batch-test.tscn" +run/main_scene="res://examples/simple-input/simple-input.tscn" run/low_processor_mode=true config/icon="res://icon.png" diff --git a/spine-godot/setup.sh b/spine-godot/setup.sh index 9a504c6e8..213b5e67f 100755 --- a/spine-godot/setup.sh +++ b/spine-godot/setup.sh @@ -6,6 +6,5 @@ cp -r .idea godot cp custom.py godot cp -r ../spine-cpp/spine-cpp spine_godot pushd godot -scons -Q compiledb custom_modules="../spine_godot" -scons target=debug custom_modules="../spine_godot" --jobs=8 +scons compiledb=yes custom_modules="../spine_godot" -j16 popd \ No newline at end of file diff --git a/spine-godot/spine_godot/SpineAnimation.h b/spine-godot/spine_godot/SpineAnimation.h index a6051b2ea..80c101ee3 100644 --- a/spine-godot/spine_godot/SpineAnimation.h +++ b/spine-godot/spine_godot/SpineAnimation.h @@ -32,7 +32,7 @@ #include "SpineConstant.h" #include "core/reference.h" -#include +#include class SpineEvent; class SpineSkeleton; diff --git a/spine-godot/spine_godot/SpineAtlasResource.cpp b/spine-godot/spine_godot/SpineAtlasResource.cpp index 37193461b..36c7f2537 100644 --- a/spine-godot/spine_godot/SpineAtlasResource.cpp +++ b/spine-godot/spine_godot/SpineAtlasResource.cpp @@ -70,8 +70,8 @@ public: if (error != OK) { ERR_PRINT(vformat("Can't load texture: \"%s\"", String(path.buffer()))); auto renderer_object = memnew(SpineRendererObject); - renderer_object->texture = nullptr; - renderer_object->normal_map = nullptr; + renderer_object->texture = Ref(nullptr); + renderer_object->normal_map = Ref(nullptr); page.setRendererObject((void *) renderer_object); return; } @@ -79,7 +79,7 @@ public: textures->append(texture); auto renderer_object = memnew(SpineRendererObject); renderer_object->texture = texture; - renderer_object->normal_map = nullptr; + renderer_object->normal_map = Ref(nullptr); String temp_path = fixed_path; String new_path = vformat("%s/%s_%s", temp_path.get_base_dir(), normal_map_prefix, temp_path.get_file()); diff --git a/spine-godot/spine_godot/SpineAtlasResource.h b/spine-godot/spine_godot/SpineAtlasResource.h index bff5c1e4f..abe0dd67f 100644 --- a/spine-godot/spine_godot/SpineAtlasResource.h +++ b/spine-godot/spine_godot/SpineAtlasResource.h @@ -30,14 +30,11 @@ #ifndef GODOT_SPINEATLASRESOURCE_H #define GODOT_SPINEATLASRESOURCE_H - -#include - #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/io/image_loader.h" +#include -class spine::Atlas; class GodotSpineTextureLoader; class SpineAtlasResource : public Resource { diff --git a/spine-godot/spine_godot/SpineEditorPlugin.cpp b/spine-godot/spine_godot/SpineEditorPlugin.cpp index 8fcd367d2..ceba20826 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.cpp +++ b/spine-godot/spine_godot/SpineEditorPlugin.cpp @@ -76,13 +76,40 @@ SpineEditorPlugin::SpineEditorPlugin(EditorNode *node) { add_import_plugin(memnew(SpineAtlasResourceImportPlugin)); add_import_plugin(memnew(SpineJsonResourceImportPlugin)); add_import_plugin(memnew(SpineBinaryResourceImportPlugin)); + add_inspector_plugin(memnew(SpineAnimationMixesInspectorPlugin)); } SpineEditorPlugin::~SpineEditorPlugin() { } bool SpineEditorPlugin::handles(Object *object) const { - return object->is_class("SpineSprite"); + return object->is_class("SpineSprite") || object->is_class("SpineSkeletonDataResource"); +} + +SpineAnimationMixesInspectorPlugin::SpineAnimationMixesInspectorPlugin(): add_mix_button(nullptr) { + add_mix_button = memnew(Button); + add_mix_button->set_text("Add mix"); +} + +SpineAnimationMixesInspectorPlugin::~SpineAnimationMixesInspectorPlugin() { + +} + +bool SpineAnimationMixesInspectorPlugin::can_handle(Object *object) { + return object->is_class("SpineSkeletonDataResource"); +} + +void SpineAnimationMixesInspectorPlugin::parse_begin(Object *object) { + sprite = object->cast_to(object); +} + +bool SpineAnimationMixesInspectorPlugin::parse_property(Object *object, Variant::Type type, const String &path, + PropertyHint hint, const String &hint_text, int usage) { + if (path == "animation_mixes") { + add_custom_control(add_mix_button); + return true; + } + return false; } #endif diff --git a/spine-godot/spine_godot/SpineEditorPlugin.h b/spine-godot/spine_godot/SpineEditorPlugin.h index 0fae3e3ba..761264092 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.h +++ b/spine-godot/spine_godot/SpineEditorPlugin.h @@ -32,29 +32,31 @@ #ifdef TOOLS_ENABLED #include "editor/editor_node.h" +#include "SpineSprite.h" +#include "editor/editor_properties.h" class SpineAtlasResourceImportPlugin : public EditorImportPlugin { GDCLASS(SpineAtlasResourceImportPlugin, EditorImportPlugin) public: String get_importer_name() const override { return "spine.atlas"; } - + String get_visible_name() const override { return "Spine Runtime Atlas"; } - + void get_recognized_extensions(List *extensions) const override { extensions->push_back("atlas"); } - + String get_preset_name(int idx) const override { return idx == 0 ? "Default" : "Unknown"; } - + int get_preset_count() const override { return 1; } - + String get_save_extension() const override { return "spatlas"; } - + String get_resource_type() const override { return "SpineAtlasResource"; } - + void get_import_options(List *options, int preset) const override; - + bool get_option_visibility(const String &option, const Map &options) const override { return true; } - + Error import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) override; }; @@ -63,23 +65,23 @@ class SpineJsonResourceImportPlugin : public EditorImportPlugin { public: String get_importer_name() const override { return "spine.json"; } - + String get_visible_name() const override { return "Spine Skeleton Json"; } - + void get_recognized_extensions(List *extensions) const override { extensions->push_back("json"); } - + String get_preset_name(int idx) const override { return idx == 0 ? "Default" : "Unknown"; } - + int get_preset_count() const override { return 1; } - + String get_save_extension() const override { return "spjson"; } - + String get_resource_type() const override { return "SpineSkeletonFileResource"; } - + void get_import_options(List *options, int preset) const override {} - + bool get_option_visibility(const String &option, const Map &options) const override { return true; } - + Error import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) override; }; @@ -116,11 +118,46 @@ public: ~SpineEditorPlugin(); String get_name() const override { return "SpineEditorPlugin"; } - + bool has_main_screen() const { return false; } - + bool handles(Object *object) const override; }; + +class SpineAnimationMixesInspectorPlugin: public EditorInspectorPlugin { + GDCLASS(SpineAnimationMixesInspectorPlugin, EditorInspectorPlugin) + + SpineSprite *sprite; + + Button *add_mix_button; + Vector