Fix debugging tools and APIs (#89)

Author: GuilhermeGSousa

godot-cpp

@@ -71,7 +71,7 @@ void MMEditor::_bake_all_animation_libraries(const AnimationMixer* p_mixer, cons
     }
 }
 
-void MMEditor::_refresh() {
+void MMEditor::_refresh(bool character_changed) {
     if (!_current_controller) {
         return;
     }
@@ -93,10 +93,19 @@ void MMEditor::_refresh() {
 
         _library_selector->add_item(animation_library_list[i]);
     }
-    _library_selector->select(-1);
+    if (animation_library_list.is_empty()) {
+        _library_selector->select(-1);
+    } else if (character_changed) {
+        _library_selector->select(0);
+    }
 
     _visualization_tab->clear();
     _data_tab->clear();
+
+    const int32_t selected_index = _library_selector->get_selected();
+    if (selected_index != -1) {
+        _anim_lib_selected(selected_index);
+    }
 }
 
 void MMEditor::_bake_button_pressed() {
@@ -130,7 +139,8 @@ void MMEditor::_bake_button_pressed() {
     mm_lib->bake_data(animation_mixer, skeleton);
     ResourceSaver::get_singleton()->save(mm_lib);
 
-    _refresh();
+    _visualization_tab->refresh();
+    _data_tab->set_animation_library(mm_lib);
 }
 
 void MMEditor::_anim_lib_selected(int p_index) {

src/editor/mm_editor.cpp

@@ -23,9 +23,7 @@ class MMEditor : public Control {
         const bool changed = p_controller != _current_controller;
 
         _current_controller = p_controller;
-        if (changed) {
-            _refresh();
-        }
+        _refresh(changed);
     }
 
 protected:
@@ -34,7 +32,7 @@ class MMEditor : public Control {
 
 private:
     static void _bake_all_animation_libraries(const AnimationMixer* p_mixer, const Skeleton3D* p_skeleton);
-    void _refresh();
+    void _refresh(bool character_changed);
     void _bake_button_pressed();
     void _anim_lib_selected(int p_index);
 

src/editor/mm_editor.h

@@ -58,7 +58,6 @@ void MMVisualizationTab::_viz_time_changed(float p_value) {
     StringName animation_name = animation_list[_selected_animation_index];
     String anim_lib_name = _current_animation_library->get_path().get_file().get_basename();
 
-    UtilityFunctions::print(anim_lib_name);
     _emit_animation_viz_request(anim_lib_name, animation_name, p_value);
 }
 
@@ -93,7 +92,9 @@ void MMVisualizationTab::refresh() {
         _viz_animation_option_button->add_item(animation_name, i);
     }
 
-    if (_current_animation_library->needs_baking()) {
+    if (!animations.is_empty()) {
+        _viz_animation_option_button->select(0);
+        _viz_anim_selected(0);
     }
 
     set_enabled(!_current_animation_library->needs_baking());

src/editor/mm_visualization_tab.cpp

@@ -68,7 +68,7 @@ PackedFloat32Array MMAnimationNode::_process_animation_node(const PackedFloat64A
             _start_transition(animation_match, time_match);
         }
         _last_query_output = query_output;
-        emit_signal("on_query_result", _output_to_dict(query_output));
+        query_input->on_query_result(query_output);
     }
 
     return _update_current_animation(p_test_only);
@@ -247,7 +247,6 @@ void MMAnimationNode::_bind_methods() {
     ADD_PROPERTY(PropertyInfo(Variant::BOOL, "blending_enabled"), "set_blending_enabled", "get_blending_enabled");
 
     BINDER_PROPERTY_PARAMS(MMAnimationNode, Variant::FLOAT, transition_halflife);
-    ADD_SIGNAL(MethodInfo("on_query_result", PropertyInfo(Variant::DICTIONARY, "query_output")));
 }
 
 Dictionary MMAnimationNode::_output_to_dict(const MMQueryOutput& output) {

src/mm_animation_node.cpp

@@ -4,6 +4,7 @@
 #include "mm_animation_library.h"
 #include "mm_animation_node.h"
 
+#include <godot_cpp/classes/animation_root_node.hpp>
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/classes/input.hpp>
 #include <godot_cpp/classes/input_event_mouse_motion.hpp>
@@ -256,6 +257,7 @@ void MMCharacter::_fill_query_input(MMQueryInput& input) {
     input.controller_transform = get_global_transform();
     input.character_transform = skeleton->get_global_transform();
     input.skeleton_state = _skeleton_state;
+    input.on_query_result = std::bind(&MMCharacter::_on_query_result, this, std::placeholders::_1);
 }
 
 void MMCharacter::_update_query() {
@@ -326,6 +328,12 @@ void MMCharacter::_update_skeleton_state(double delta_t) {
     }
 }
 
+void MMCharacter::_on_query_result(const MMQueryOutput& output) {
+    if (emit_result_signal) {
+        emit_signal("on_query_result", _output_to_dict(output));
+    }
+}
+
 Dictionary MMCharacter::_output_to_dict(const MMQueryOutput& output) {
     Dictionary result;
 
@@ -366,6 +374,9 @@ void MMCharacter::_bind_methods() {
     BINDER_PROPERTY_PARAMS(MMCharacter, Variant::FLOAT, trajectory_delta_time);
     BINDER_PROPERTY_PARAMS(MMCharacter, Variant::INT, history_point_count);
     BINDER_PROPERTY_PARAMS(MMCharacter, Variant::FLOAT, history_delta_time);
+
+    ADD_GROUP("Debug", "");
+    BINDER_PROPERTY_PARAMS(MMCharacter, Variant::BOOL, emit_result_signal);
 }
 
 void MMCharacter::_notification(int p_what) {

src/mm_character.cpp

@@ -85,6 +85,9 @@ class MMCharacter : public CharacterBody3D {
     GETSET(AnimationTree*, animation_tree);
     GETSET(Ref<MMSynchronizer>, synchronizer);
 
+    // Debug
+    GETSET(bool, emit_result_signal, false);
+
 protected:
     static constexpr size_t HISTORY_BUFFER_SIZE{100}; // Around 1.6s
     static void _bind_methods();
@@ -115,6 +118,8 @@ class MMCharacter : public CharacterBody3D {
     void _reset_skeleton_state();
     void _update_skeleton_state(double delta_t);
 
+    void _on_query_result(const MMQueryOutput& output);
+
     static Dictionary _output_to_dict(const MMQueryOutput& output);
 
 private:

src/mm_character.h

@@ -2,15 +2,25 @@
 #define MM_QUERY_H
 
 #include "mm_bone_state.h"
+#include "mm_query.h"
 #include "mm_trajectory_point.h"
 
+#include <functional>
 #include <godot_cpp/classes/skeleton3d.hpp>
 #include <godot_cpp/variant/string.hpp>
 #include <godot_cpp/variant/transform3d.hpp>
 #include <godot_cpp/variant/vector3.hpp>
 
 using namespace godot;
 
+struct MMQueryOutput {
+    String animation_match;
+    float time_match;
+    float cost;
+    PackedFloat32Array matched_frame_data;
+    Dictionary feature_costs;
+};
+
 class MMQueryInput : public RefCounted {
     GDCLASS(MMQueryInput, RefCounted);
 
@@ -22,6 +32,7 @@ class MMQueryInput : public RefCounted {
     std::vector<MMTrajectoryPoint> trajectory;
     std::vector<MMTrajectoryPoint> trajectory_history;
     SkeletonState skeleton_state;
+    std::function<void(const MMQueryOutput&)> on_query_result;
 
     bool is_valid() const {
         // Add validation logic here
@@ -33,12 +44,4 @@ class MMQueryInput : public RefCounted {
     }
 };
 
-struct MMQueryOutput {
-    String animation_match;
-    float time_match;
-    float cost;
-    PackedFloat32Array matched_frame_data;
-    Dictionary feature_costs;
-};
-
 #endif // MM_QUERY_H