From 22c0f2a9eba2cd376b58d4f74e738f50ffa6b0f8 Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 13 Apr 2022 21:28:46 +0200 Subject: [PATCH] [godot] SpineSkeletonDataResource animation mixes UI functional. --- .../include/spine/AnimationStateData.h | 3 + .../src/spine/AnimationStateData.cpp | 5 ++ .../assets/spineboy/spinebody-data-res.tres | 12 ++- spine-godot/spine_godot/SpineEditorPlugin.cpp | 89 +++++++++++++++---- spine-godot/spine_godot/SpineEditorPlugin.h | 5 +- .../spine_godot/SpineSkeletonDataResource.cpp | 25 +++++- .../spine_godot/SpineSkeletonDataResource.h | 2 + 7 files changed, 120 insertions(+), 21 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h index dec7999b6..84db21f0b 100644 --- a/spine-cpp/spine-cpp/include/spine/AnimationStateData.h +++ b/spine-cpp/spine-cpp/include/spine/AnimationStateData.h @@ -67,6 +67,9 @@ namespace spine { /// or the DefaultMix if no mix duration has been set. float getMix(Animation *from, Animation *to); + /// Removes all mixes and sets the default mix to 0. + void clear(); + private: class AnimationPair : public SpineObject { public: diff --git a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp index de41deb2e..a68e62cd1 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationStateData.cpp @@ -73,6 +73,11 @@ void AnimationStateData::setDefaultMix(float inValue) { _defaultMix = inValue; } +void AnimationStateData::clear() { + _defaultMix = 0; + _animationToMixTime.clear(); +} + AnimationStateData::AnimationPair::AnimationPair(Animation *a1, Animation *a2) : _a1(a1), _a2(a2) { } diff --git a/spine-godot/example/assets/spineboy/spinebody-data-res.tres b/spine-godot/example/assets/spineboy/spinebody-data-res.tres index 43d89158d..9bc3ba1a1 100644 --- a/spine-godot/example/assets/spineboy/spinebody-data-res.tres +++ b/spine-godot/example/assets/spineboy/spinebody-data-res.tres @@ -1,9 +1,19 @@ -[gd_resource type="SpineSkeletonDataResource" load_steps=16 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 = "death" +to = "aim" +mix = 1.2 + +[sub_resource type="SpineAnimationMix" id=2] +from = "idle-turn" +to = "aim" + [resource] atlas_res = ExtResource( 1 ) skeleton_file_res = ExtResource( 2 ) default_mix = 0.2 +animation_mixes = [ SubResource( 1 ), SubResource( 2 ) ] diff --git a/spine-godot/spine_godot/SpineEditorPlugin.cpp b/spine-godot/spine_godot/SpineEditorPlugin.cpp index 8649ba672..4195e7e47 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.cpp +++ b/spine-godot/spine_godot/SpineEditorPlugin.cpp @@ -101,53 +101,110 @@ bool SpineAnimationMixesInspectorPlugin::parse_property(Object *object, Variant: return false; } -SpineEditorPropertyAnimationMixes::SpineEditorPropertyAnimationMixes() { - container = memnew(VBoxContainer); - add_child(container); - set_bottom_editor(container); +SpineEditorPropertyAnimationMixes::SpineEditorPropertyAnimationMixes(): skeleton_data(nullptr), container(nullptr), updating(false) { } void SpineEditorPropertyAnimationMixes::_bind_methods() { ClassDB::bind_method(D_METHOD("add_mix"), &SpineEditorPropertyAnimationMixes::add_mix); + ClassDB::bind_method(D_METHOD("delete_mix"), &SpineEditorPropertyAnimationMixes::delete_mix); + ClassDB::bind_method(D_METHOD("property_changed"), &SpineEditorPropertyAnimationMixes::property_changed); } void SpineEditorPropertyAnimationMixes::add_mix() { if (!skeleton_data.is_valid() || !skeleton_data->is_skeleton_data_loaded() || updating) return; - + + Vector animation_names; + skeleton_data->get_animation_names(animation_names); Ref mix = Ref(memnew(SpineAnimationMix)); + mix->set_from(animation_names[0]); + mix->set_to(animation_names[0]); + mix->set_mix(0); + Array mixes = skeleton_data->get_animation_mixes().duplicate(); mixes.push_back(mix); skeleton_data->set_animation_mixes(mixes); emit_changed(get_edited_property(), mixes); } +void SpineEditorPropertyAnimationMixes::delete_mix(int64_t idx) { + if (!skeleton_data.is_valid() || !skeleton_data->is_skeleton_data_loaded() || updating) return; + + auto mixes = skeleton_data->get_animation_mixes().duplicate(); + mixes.remove(idx); + skeleton_data->set_animation_mixes(mixes); + emit_changed(get_edited_property(), mixes); +} + +void SpineEditorPropertyAnimationMixes::property_changed(const String &property, Variant value, const String &name, bool changing, Ref mix) { + if (property == "from") mix->set_from(value); + if (property == "to") mix->set_to(value); + if (property == "mix") mix->set_mix(value); + emit_changed(get_edited_property(), skeleton_data->get_animation_mixes().duplicate()); +} + void SpineEditorPropertyAnimationMixes::update_property() { if (updating) return; updating = true; - for (int i = 0; container->get_child_count() != 0; i++) { - auto child = container->get_child(i); - child->queue_delete(); - container->remove_child(child); + if (container) { + set_bottom_editor(nullptr); + memdelete(container); + container->queue_delete(); + container = nullptr; } + if (!skeleton_data.is_valid() || !skeleton_data->is_skeleton_data_loaded()) { + updating = false; + return; + } + + Vector animation_names; + skeleton_data->get_animation_names(animation_names); + + container = memnew(VBoxContainer); + add_child(container); + set_bottom_editor(container); + Array mixes = skeleton_data->get_animation_mixes(); for (int i = 0; i < mixes.size(); i++) { + Ref mix = mixes[i]; auto hbox = memnew(HBoxContainer); + hbox->set_h_size_flags(SIZE_FILL); - auto from_label = memnew(Label); - from_label->set_text("From:" ); - hbox->add_child(from_label); + auto from_enum = memnew(EditorPropertyTextEnum); + from_enum->set_h_size_flags(SIZE_EXPAND_FILL); + from_enum->setup(animation_names); + from_enum->set_object_and_property(*mix, "from"); + from_enum->update_property(); + from_enum->connect("property_changed", this, "property_changed", varray(mix)); + hbox->add_child(from_enum); - auto to_label = memnew(Label); - to_label->set_text("To: "); - hbox->add_child(to_label); + auto to_enum = memnew(EditorPropertyTextEnum); + to_enum->set_h_size_flags(SIZE_EXPAND_FILL); + to_enum->setup(animation_names); + to_enum->set_object_and_property(*mix, "to"); + to_enum->update_property(); + to_enum->connect("property_changed", this, "property_changed", varray(mix)); + hbox->add_child(to_enum); + + auto mix_float = memnew(EditorPropertyFloat); + mix_float->set_h_size_flags(SIZE_EXPAND_FILL); + mix_float->setup(0, 9999999, 0.001, true, false, false, false); + mix_float->set_object_and_property(*mix, "mix"); + mix_float->update_property(); + mix_float->connect("property_changed", this, "property_changed", varray(mix)); + hbox->add_child(mix_float); + + auto delete_button = memnew(Button); + delete_button->set_text("Delete"); + delete_button->connect("pressed", this, "delete_mix", varray(i)); + hbox->add_child(delete_button); container->add_child(hbox); } - add_mix_button = memnew(Button); + auto add_mix_button = memnew(Button); add_mix_button->set_text("Add mix"); add_mix_button->set_h_size_flags(SIZE_EXPAND_FILL); add_mix_button->connect("pressed", this, "add_mix"); diff --git a/spine-godot/spine_godot/SpineEditorPlugin.h b/spine-godot/spine_godot/SpineEditorPlugin.h index 7ad5378d4..4c503adaf 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.h +++ b/spine-godot/spine_godot/SpineEditorPlugin.h @@ -140,13 +140,12 @@ class SpineEditorPropertyAnimationMixes: public EditorProperty { Ref skeleton_data; VBoxContainer *container; - Button *add_mix_button; - Vector cells; - Vector