diff --git a/editor/limbo_ai_editor_plugin.cpp b/editor/limbo_ai_editor_plugin.cpp index 27ef75e..d6d59d6 100644 --- a/editor/limbo_ai_editor_plugin.cpp +++ b/editor/limbo_ai_editor_plugin.cpp @@ -66,6 +66,7 @@ #include #include #include +#include #include #include #include @@ -73,6 +74,21 @@ #include #endif // LIMBOAI_GDEXTENSION +namespace { + +// If built-in resource - switch to the owner scene (open it if not already). +inline void _switch_to_owner_scene_if_builtin(const Ref &p_behavior_tree) { + if (p_behavior_tree.is_valid() && p_behavior_tree->get_path().contains("::")) { + String current_scene = SCENE_TREE()->get_edited_scene_root()->get_scene_file_path(); + String scene_path = p_behavior_tree->get_path().get_slice("::", 0); + if (current_scene != scene_path) { + EditorInterface::get_singleton()->open_scene_from_path(scene_path); + } + } +} + +} // unnamed namespace + //**** LimboAIEditor _FORCE_INLINE_ String _get_script_template_path() { @@ -291,6 +307,8 @@ void LimboAIEditor::_disable_editing() { void LimboAIEditor::edit_bt(const Ref &p_behavior_tree, bool p_force_refresh) { ERR_FAIL_COND_MSG(p_behavior_tree.is_null(), "p_behavior_tree is null"); + _switch_to_owner_scene_if_builtin(p_behavior_tree); + if (!p_force_refresh && task_tree->get_bt() == p_behavior_tree) { return; } @@ -882,6 +900,7 @@ void LimboAIEditor::_on_tree_task_activated() { void LimboAIEditor::_on_visibility_changed() { if (task_tree->is_visible_in_tree()) { + _switch_to_owner_scene_if_builtin(task_tree->get_bt()); Ref sel = task_tree->get_selected(); if (sel.is_valid()) { EDIT_RESOURCE(sel); @@ -899,16 +918,6 @@ void LimboAIEditor::_on_visibility_changed() { } } -void LimboAIEditor::_on_header_pressed() { - task_tree->clear_selection(); -#ifdef LIMBOAI_MODULE - if (task_tree->get_bt().is_valid()) { - task_tree->get_bt()->editor_set_section_unfold("blackboard_plan", true); - } -#endif // LIMBOAI_MODULE - EDIT_RESOURCE(task_tree->get_bt()); -} - void LimboAIEditor::_on_save_pressed() { if (task_tree->get_bt().is_null()) { return; @@ -1959,8 +1968,9 @@ void LimboAIEditorPlugin::edit(Object *p_object) { #elif LIMBOAI_GDEXTENSION void LimboAIEditorPlugin::_edit(Object *p_object) { #endif - if (Object::cast_to(p_object)) { - limbo_ai_editor->edit_bt(Object::cast_to(p_object)); + Ref bt = Object::cast_to(p_object); + if (bt.is_valid()) { + limbo_ai_editor->edit_bt(bt); } } diff --git a/editor/limbo_ai_editor_plugin.h b/editor/limbo_ai_editor_plugin.h index 6068aec..92942cb 100644 --- a/editor/limbo_ai_editor_plugin.h +++ b/editor/limbo_ai_editor_plugin.h @@ -241,7 +241,6 @@ private: void _on_tree_task_selected(const Ref &p_task); void _on_tree_task_activated(); void _on_visibility_changed(); - void _on_header_pressed(); void _on_save_pressed(); void _on_history_back(); void _on_history_forward();