Compare commits
6 Commits
aa7d8ea50e
...
c42d9ebedf
Author | SHA1 | Date |
---|---|---|
Wilson E. Alvarez | c42d9ebedf | |
Wilson E. Alvarez | ad71028135 | |
Wilson E. Alvarez | f8df4e695e | |
Wilson E. Alvarez | 181a45bf4a | |
Wilson E. Alvarez | 54605dbffa | |
Wilson E. Alvarez | 004d456983 |
|
@ -17,7 +17,7 @@
|
|||
#include "../util/limbo_string_names.h"
|
||||
|
||||
#ifdef LIMBOAI_MODULE
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/button.h"
|
||||
#endif // LIMBOAI_MODULE
|
||||
|
||||
|
|
|
@ -19,8 +19,9 @@
|
|||
|
||||
#ifdef LIMBOAI_MODULE
|
||||
#include "editor/editor_interface.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/line_edit.h"
|
||||
#include "scene/gui/margin_container.h"
|
||||
#include "scene/gui/panel_container.h"
|
||||
#include "scene/resources/style_box_flat.h"
|
||||
#endif // LIMBOAI_MODULE
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "core/object/callable_method_pointer.h"
|
||||
#include "core/os/time.h"
|
||||
#include "core/typedefs.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "editor/editor_settings.h"
|
||||
#include "scene/resources/style_box.h"
|
||||
#endif // LIMBOAI_MODULE
|
||||
|
@ -127,16 +127,16 @@ void BehaviorTreeView::_update_tree(const Ref<BehaviorTreeData> &p_data) {
|
|||
if (status_changed) {
|
||||
item->set_metadata(1, current_status);
|
||||
if (current_status == BTTask::SUCCESS) {
|
||||
item->set_custom_draw(0, this, LW_NAME(_draw_success_status));
|
||||
item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_success_status));
|
||||
item->set_icon(1, theme_cache.icon_success);
|
||||
} else if (current_status == BTTask::FAILURE) {
|
||||
item->set_custom_draw(0, this, LW_NAME(_draw_failure_status));
|
||||
item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_failure_status));
|
||||
item->set_icon(1, theme_cache.icon_failure);
|
||||
} else if (current_status == BTTask::RUNNING) {
|
||||
item->set_custom_draw(0, this, LW_NAME(_draw_running_status));
|
||||
item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_running_status));
|
||||
item->set_icon(1, theme_cache.icon_running);
|
||||
} else {
|
||||
item->set_custom_draw(0, this, LW_NAME(_draw_fresh));
|
||||
item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_fresh));
|
||||
item->set_icon(1, nullptr);
|
||||
}
|
||||
}
|
||||
|
@ -204,13 +204,13 @@ void BehaviorTreeView::_update_tree(const Ref<BehaviorTreeData> &p_data) {
|
|||
item->set_icon_max_width(0, 16 * _get_editor_scale()); // Force user icon size.
|
||||
|
||||
if (task_data.status == BTTask::SUCCESS) {
|
||||
item->set_custom_draw(0, this, LW_NAME(_draw_success_status));
|
||||
item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_success_status));
|
||||
item->set_icon(1, theme_cache.icon_success);
|
||||
} else if (task_data.status == BTTask::FAILURE) {
|
||||
item->set_custom_draw(0, this, LW_NAME(_draw_failure_status));
|
||||
item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_failure_status));
|
||||
item->set_icon(1, theme_cache.icon_failure);
|
||||
} else if (task_data.status == BTTask::RUNNING) {
|
||||
item->set_custom_draw(0, this, LW_NAME(_draw_running_status));
|
||||
item->set_custom_draw_callback(0, callable_mp(this, &BehaviorTreeView::_draw_running_status));
|
||||
item->set_icon(1, theme_cache.icon_running);
|
||||
}
|
||||
|
||||
|
|
|
@ -31,9 +31,9 @@
|
|||
#include "core/variant/array.h"
|
||||
#include "editor/editor_interface.h"
|
||||
#include "editor/editor_paths.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/filesystem_dock.h"
|
||||
#include "editor/plugins/editor_debugger_plugin.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/box_container.h"
|
||||
#include "scene/gui/control.h"
|
||||
#include "scene/gui/item_list.h"
|
||||
|
|
|
@ -34,12 +34,13 @@
|
|||
#include "editor/editor_file_system.h"
|
||||
#include "editor/editor_help.h"
|
||||
#include "editor/editor_paths.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/editor_settings.h"
|
||||
#include "editor/editor_undo_redo_manager.h"
|
||||
#include "editor/gui/editor_bottom_panel.h"
|
||||
#include "editor/inspector_dock.h"
|
||||
#include "editor/plugins/script_editor_plugin.h"
|
||||
#include "editor/project_settings_editor.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/panel_container.h"
|
||||
#include "scene/gui/separator.h"
|
||||
#endif // LIMBOAI_MODULE
|
||||
|
@ -682,7 +683,7 @@ void LimboAIEditor::_misc_option_selected(int p_id) {
|
|||
LimboDebuggerPlugin::get_singleton()->get_first_session_window()->set_window_enabled(true);
|
||||
} else {
|
||||
#ifdef LIMBOAI_MODULE
|
||||
EditorNode::get_singleton()->make_bottom_panel_item_visible(EditorDebuggerNode::get_singleton());
|
||||
EditorNode::get_bottom_panel()->make_item_visible(EditorDebuggerNode::get_singleton());
|
||||
EditorDebuggerNode::get_singleton()->get_default_debugger()->switch_to_debugger(
|
||||
LimboDebuggerPlugin::get_singleton()->get_first_session_tab_index());
|
||||
#elif LIMBOAI_GDEXTENSION
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "core/object/object.h"
|
||||
#include "core/templates/hash_set.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_plugin.h"
|
||||
#include "editor/plugins/editor_plugin.h"
|
||||
#include "editor/gui/editor_spin_slider.h"
|
||||
#include "scene/gui/box_container.h"
|
||||
#include "scene/gui/control.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "editor/editor_help.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_paths.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "editor/plugins/script_editor_plugin.h"
|
||||
#include "scene/gui/check_box.h"
|
||||
#endif // LIMBO_MODULE
|
||||
|
@ -60,7 +60,7 @@ void TaskButton::_bind_methods() {
|
|||
Control *TaskButton::_do_make_tooltip(const String &p_text) const {
|
||||
#ifdef LIMBOAI_MODULE
|
||||
EditorHelpBit *help_bit = memnew(EditorHelpBit);
|
||||
help_bit->get_rich_text()->set_custom_minimum_size(Size2(360 * EDSCALE, 1));
|
||||
help_bit->set_content_height_limits(1, 360 * EDSCALE);
|
||||
|
||||
String help_text;
|
||||
if (!p_text.is_empty()) {
|
||||
|
@ -69,7 +69,7 @@ Control *TaskButton::_do_make_tooltip(const String &p_text) const {
|
|||
help_text = "[i]" + TTR("No description.") + "[/i]";
|
||||
}
|
||||
|
||||
help_bit->set_text(help_text);
|
||||
help_bit->set_custom_text(String(), String(), help_text);
|
||||
|
||||
return help_bit;
|
||||
#endif // LIMBOAI_MODULE
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#ifdef LIMBOAI_MODULE
|
||||
#include "core/object/script_language.h"
|
||||
#include "editor/editor_scale.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#endif // LIMBOAI_MODULE
|
||||
|
||||
#ifdef LIMBOAI_GDEXTENSION
|
||||
|
@ -50,7 +50,7 @@ void TaskTree::_update_item(TreeItem *p_item) {
|
|||
if (p_item->get_parent()) {
|
||||
Ref<BTProbabilitySelector> sel = p_item->get_parent()->get_metadata(0);
|
||||
if (sel.is_valid() && sel->has_probability(p_item->get_index())) {
|
||||
p_item->set_custom_draw(0, this, LW_NAME(_draw_probability));
|
||||
p_item->set_custom_draw_callback(0, callable_mp(this, &TaskTree::_draw_probability));
|
||||
p_item->set_cell_mode(0, TreeItem::CELL_MODE_CUSTOM);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,11 +27,6 @@
|
|||
LimboStringNames *LimboStringNames::singleton = nullptr;
|
||||
|
||||
LimboStringNames::LimboStringNames() {
|
||||
_draw_failure_status = SN("_draw_failure_status");
|
||||
_draw_fresh = SN("_draw_fresh");
|
||||
_draw_probability = SN("_draw_probability");
|
||||
_draw_running_status = SN("_draw_running_status");
|
||||
_draw_success_status = SN("_draw_success_status");
|
||||
_enter = SN("_enter");
|
||||
_exit = SN("_exit");
|
||||
_generate_name = SN("_generate_name");
|
||||
|
|
|
@ -41,11 +41,6 @@ class LimboStringNames {
|
|||
public:
|
||||
_FORCE_INLINE_ static LimboStringNames *get_singleton() { return singleton; }
|
||||
|
||||
StringName _draw_failure_status;
|
||||
StringName _draw_fresh;
|
||||
StringName _draw_probability;
|
||||
StringName _draw_running_status;
|
||||
StringName _draw_success_status;
|
||||
StringName _enter;
|
||||
StringName _exit;
|
||||
StringName _generate_name;
|
||||
|
|
Loading…
Reference in New Issue