Fix GCC warning for unhandled 'PACKED_VECTOR4_ARRAY' in switch

Due to upstream change:

	1bcbbe96c4

.pre-commit-config.yaml

@@ -0,0 +1,24 @@
+repos:
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v17.0.6
+    hooks:
+      - id: clang-format
+        files: \.(c|h|cpp|hpp|cc|cxx|m|mm|inc|java|glsl)$
+        types_or: [text]
+        exclude: |
+          (?x)^(
+            tests/python_build.*|
+            .*thirdparty.*|
+            .*platform/android/java/lib/src/com.*|
+            .*-so_wrap.*
+          )
+
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.2.0
+    hooks:
+      - id: black
+        files: (\.py$|SConstruct|SCsub)
+        types_or: [text]
+        exclude: .*thirdparty.*
+        args:
+          - --line-length=120

README.md

@@ -34,6 +34,7 @@ Behavior Trees are powerful hierarchical structures used to model and control th
 [![Demonstration](https://img.youtube.com/vi/NWaMArUg7mY/0.jpg)](https://www.youtube.com/watch?v=NWaMArUg7mY)
 
 >**🛈 Demo project** lives in the `demo` folder and is available separately in [**Releases**](https://github.com/limbonaut/limboai/releases).
+> Run `demo/scenes/showcase.tscn` to get started.
 > It also contains a tutorial that introduces behavior trees using examples.
 
 ## Features

SCsub

@@ -5,7 +5,7 @@ Import("env_modules")
 
 module_env = env.Clone()
 
-module_env.Append(CPPDEFINES = ['LIMBOAI_MODULE'])
+module_env.Append(CPPDEFINES=["LIMBOAI_MODULE"])
 
 module_env.add_source_files(env.modules_sources, "*.cpp")
 module_env.add_source_files(env.modules_sources, "blackboard/*.cpp")

blackboard/bb_param/bb_param.cpp

@@ -79,6 +79,9 @@ Variant BBParam::get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard,
 	ERR_FAIL_COND_V(!p_blackboard.is_valid(), p_default);
 
 	if (value_source == SAVED_VALUE) {
+		if (saved_value == Variant()) {
+			_assign_default_value();
+		}
 		return saved_value;
 	} else {
 		ERR_FAIL_COND_V_MSG(!p_blackboard->has_var(variable), p_default, vformat("BBParam: Blackboard variable \"%s\" doesn't exist.", variable));
@@ -114,6 +117,4 @@ void BBParam::_bind_methods() {
 
 BBParam::BBParam() {
 	value_source = SAVED_VALUE;
-
-	_assign_default_value();
 }

blackboard/blackboard.cpp

@@ -64,13 +64,19 @@ void Blackboard::erase_var(const StringName &p_name) {
 	data.erase(p_name);
 }
 
-void Blackboard::bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property) {
-	ERR_FAIL_COND_MSG(!data.has(p_name), "Blackboard: Binding failed - can't bind variable that doesn't exist.");
+void Blackboard::bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property, bool p_create) {
+	if (!data.has(p_name)) {
+		if (p_create) {
+			data.insert(p_name, BBVariable());
+		} else {
+			ERR_FAIL_MSG("Blackboard: Can't bind variable that doesn't exist (var: " + p_name + ").");
+		}
+	}
 	data[p_name].bind(p_object, p_property);
 }
 
 void Blackboard::unbind_var(const StringName &p_name) {
-	ERR_FAIL_COND_MSG(data.has(p_name), "Blackboard: Can't unbind variable that doesn't exist.");
+	ERR_FAIL_COND_MSG(data.has(p_name), "Blackboard: Can't unbind variable that doesn't exist (var: " + p_name + ").");
 	data[p_name].unbind();
 }
 
@@ -78,8 +84,14 @@ void Blackboard::assign_var(const StringName &p_name, const BBVariable &p_var) {
 	data.insert(p_name, p_var);
 }
 
-void Blackboard::link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var) {
-	ERR_FAIL_COND_MSG(!data.has(p_name), "Blackboard: Can't link variable that doesn't exist (var: " + p_name + ").");
+void Blackboard::link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var, bool p_create) {
+	if (!data.has(p_name)) {
+		if (p_create) {
+			data.insert(p_name, BBVariable());
+		} else {
+			ERR_FAIL_MSG("Blackboard: Can't link variable that doesn't exist (var: " + p_name + ").");
+		}
+	}
 	ERR_FAIL_COND_MSG(p_target_blackboard.is_null(), "Blackboard: Can't link variable to target blackboard that is null (var: " + p_name + ").");
 	ERR_FAIL_COND_MSG(!p_target_blackboard->data.has(p_target_var), "Blackboard: Can't link variable to non-existent target (var: " + p_name + ", target: " + p_target_var + ").");
 	data[p_name] = p_target_blackboard->data[p_target_var];
@@ -93,7 +105,7 @@ void Blackboard::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_parent"), &Blackboard::get_parent);
 	ClassDB::bind_method(D_METHOD("erase_var", "var_name"), &Blackboard::erase_var);
 	ClassDB::bind_method(D_METHOD("top"), &Blackboard::top);
-	ClassDB::bind_method(D_METHOD("bind_var_to_property", "var_name", "object", "property"), &Blackboard::bind_var_to_property);
+	ClassDB::bind_method(D_METHOD("bind_var_to_property", "var_name", "object", "property", "create"), &Blackboard::bind_var_to_property, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("unbind_var", "var_name"), &Blackboard::unbind_var);
-	ClassDB::bind_method(D_METHOD("link_var", "var_name", "target_blackboard", "target_var"), &Blackboard::link_var);
+	ClassDB::bind_method(D_METHOD("link_var", "var_name", "target_blackboard", "target_var", "create"), &Blackboard::link_var, DEFVAL(false));
 }

blackboard/blackboard.h

@@ -51,12 +51,12 @@ public:
 	bool has_var(const StringName &p_name) const;
 	void erase_var(const StringName &p_name);
 
-	void bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property);
+	void bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property, bool p_create = false);
 	void unbind_var(const StringName &p_name);
 
 	void assign_var(const StringName &p_name, const BBVariable &p_var);
 
-	void link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var);
+	void link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var, bool p_create = false);
 
 	// TODO: Add serialization API.
 };

bt/tasks/bt_decorator.cpp

@@ -18,3 +18,8 @@ PackedStringArray BTDecorator::get_configuration_warnings() {
 	}
 	return warnings;
 }
+
+BT::Status BTDecorator::_tick(double p_delta) {
+	ERR_FAIL_COND_V_MSG(get_child_count() == 0, FAILURE, "BT decorator doesn't have a child.");
+	return get_child(0)->execute(p_delta);
+}

bt/tasks/bt_decorator.h

@@ -17,6 +17,9 @@
 class BTDecorator : public BTTask {
 	GDCLASS(BTDecorator, BTTask)
 
+protected:
+	virtual Status _tick(double p_delta) override;
+
 public:
 	virtual PackedStringArray get_configuration_warnings() override;
 };

doc/source/classes/class_blackboard.rst

@@ -33,27 +33,27 @@ Methods
 .. table::
    :widths: auto
 
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | void                                | :ref:`bind_var_to_property<class_Blackboard_method_bind_var_to_property>` **(** StringName var_name, Object object, StringName property **)**                   |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | void                                | :ref:`erase_var<class_Blackboard_method_erase_var>` **(** StringName var_name **)**                                                                             |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | :ref:`Blackboard<class_Blackboard>` | :ref:`get_parent<class_Blackboard_method_get_parent>` **(** **)** |const|                                                                                       |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | Variant                             | :ref:`get_var<class_Blackboard_method_get_var>` **(** StringName var_name, Variant default=null, bool complain=true **)** |const|                               |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | bool                                | :ref:`has_var<class_Blackboard_method_has_var>` **(** StringName var_name **)** |const|                                                                         |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | void                                | :ref:`link_var<class_Blackboard_method_link_var>` **(** StringName var_name, :ref:`Blackboard<class_Blackboard>` target_blackboard, StringName target_var **)** |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | void                                | :ref:`set_parent<class_Blackboard_method_set_parent>` **(** :ref:`Blackboard<class_Blackboard>` blackboard **)**                                                |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | void                                | :ref:`set_var<class_Blackboard_method_set_var>` **(** StringName var_name, Variant value **)**                                                                  |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | :ref:`Blackboard<class_Blackboard>` | :ref:`top<class_Blackboard_method_top>` **(** **)** |const|                                                                                                     |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-   | void                                | :ref:`unbind_var<class_Blackboard_method_unbind_var>` **(** StringName var_name **)**                                                                           |
-   +-------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | void                                | :ref:`bind_var_to_property<class_Blackboard_method_bind_var_to_property>` **(** StringName var_name, Object object, StringName property, bool create **)**                   |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | void                                | :ref:`erase_var<class_Blackboard_method_erase_var>` **(** StringName var_name **)**                                                                                          |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | :ref:`Blackboard<class_Blackboard>` | :ref:`get_parent<class_Blackboard_method_get_parent>` **(** **)** |const|                                                                                                    |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | Variant                             | :ref:`get_var<class_Blackboard_method_get_var>` **(** StringName var_name, Variant default=null, bool complain=true **)** |const|                                            |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | bool                                | :ref:`has_var<class_Blackboard_method_has_var>` **(** StringName var_name **)** |const|                                                                                      |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | void                                | :ref:`link_var<class_Blackboard_method_link_var>` **(** StringName var_name, :ref:`Blackboard<class_Blackboard>` target_blackboard, StringName target_var, bool create **)** |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | void                                | :ref:`set_parent<class_Blackboard_method_set_parent>` **(** :ref:`Blackboard<class_Blackboard>` blackboard **)**                                                             |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | void                                | :ref:`set_var<class_Blackboard_method_set_var>` **(** StringName var_name, Variant value **)**                                                                               |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | :ref:`Blackboard<class_Blackboard>` | :ref:`top<class_Blackboard_method_top>` **(** **)** |const|                                                                                                                  |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | void                                | :ref:`unbind_var<class_Blackboard_method_unbind_var>` **(** StringName var_name **)**                                                                                        |
+   +-------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 .. rst-class:: classref-section-separator
 
@@ -68,9 +68,9 @@ Method Descriptions
 
 .. rst-class:: classref-method
 
-void **bind_var_to_property** **(** StringName var_name, Object object, StringName property **)**
+void **bind_var_to_property** **(** StringName var_name, Object object, StringName property, bool create **)**
 
-Establish a binding between a variable and the object's property specified by ``property`` and ``object``. Changes to the variable update the property, and vice versa.
+Establish a binding between a variable and the object's property specified by ``property`` and ``object``. Changes to the variable update the property, and vice versa. If ``create`` is ``true``, the variable will be created if it doesn't exist.
 
 .. rst-class:: classref-item-separator
 
@@ -128,13 +128,11 @@ Returns ``true`` if the Blackboard contains the ``var_name`` variable, including
 
 .. rst-class:: classref-method
 
-void **link_var** **(** StringName var_name, :ref:`Blackboard<class_Blackboard>` target_blackboard, StringName target_var **)**
+void **link_var** **(** StringName var_name, :ref:`Blackboard<class_Blackboard>` target_blackboard, StringName target_var, bool create **)**
 
-Links a variable to another Blackboard variable. If a variable is linked to another variable, their state will always be identical, and any change to one will be reflected in the other. You can use this method to link a variable in the current scope to a variable in another scope, or in another Blackboard instance.
+Links a variable to another Blackboard variable. If a variable is linked to another variable, their state will always be identical, and any change to one will be reflected in the other. If ``create`` is ``true``, the variable will be created if it doesn't exist.
 
-
-
-A variable can only be linked to one other variable. Calling this method again will overwrite the previous link. However, it is possible to link to the same variable from multiple different variables.
+You can use this method to link a variable in the current scope to a variable in another scope, or in another Blackboard instance. A variable can only be linked to one other variable. Calling this method again will overwrite the previous link. However, it is possible to link to the same variable from multiple different variables.
 
 .. rst-class:: classref-item-separator
 

doc/source/conf.py

@@ -6,19 +6,19 @@
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
-project = 'LimboAI'
-copyright = '2021-present Serhii Snitsaruk and the LimboAI contributors'
-author = 'Serhii Snitsaruk and the LimboAI contributors'
-release = '1.0'
+project = "LimboAI"
+copyright = "2021-present Serhii Snitsaruk and the LimboAI contributors"
+author = "Serhii Snitsaruk and the LimboAI contributors"
+release = "1.0"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
 
-extensions = ['sphinx_rtd_dark_mode', 'sphinx_copybutton']
+extensions = ["sphinx_rtd_dark_mode", "sphinx_copybutton"]
 
-master_doc = 'index'
-templates_path = ['_templates']
-exclude_patterns = ['_build']
+master_doc = "index"
+templates_path = ["_templates"]
+exclude_patterns = ["_build"]
 
 # -- Markdown configuration (sphinx_markdown_builder).
 # markdown_anchor_sections = True
@@ -33,12 +33,11 @@ default_dark_mode = False
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
-html_theme = 'sphinx_rtd_theme'
-html_static_path = ['_static']
+html_theme = "sphinx_rtd_theme"
+html_static_path = ["_static"]
 html_logo = "logo.png"
 html_theme_options = {
-    'logo_only': True,
-    'display_version': True,
+    "logo_only": True,
+    "display_version": True,
     "collapse_navigation": True,
 }
-

doc_classes/Blackboard.xml

@@ -16,8 +16,9 @@
 			<param index="0" name="var_name" type="StringName" />
 			<param index="1" name="object" type="Object" />
 			<param index="2" name="property" type="StringName" />
+			<param index="3" name="create" type="bool" />
 			<description>
-				Establish a binding between a variable and the object's property specified by [param property] and [param object]. Changes to the variable update the property, and vice versa.
+				Establish a binding between a variable and the object's property specified by [param property] and [param object]. Changes to the variable update the property, and vice versa. If [param create] is [code]true[/code], the variable will be created if it doesn't exist.
 			</description>
 		</method>
 		<method name="erase_var">
@@ -54,10 +55,10 @@
 			<param index="0" name="var_name" type="StringName" />
 			<param index="1" name="target_blackboard" type="Blackboard" />
 			<param index="2" name="target_var" type="StringName" />
+			<param index="3" name="create" type="bool" />
 			<description>
-				Links a variable to another Blackboard variable. If a variable is linked to another variable, their state will always be identical, and any change to one will be reflected in the other. You can use this method to link a variable in the current scope to a variable in another scope, or in another Blackboard instance.
-
-				A variable can only be linked to one other variable. Calling this method again will overwrite the previous link. However, it is possible to link to the same variable from multiple different variables.
+				Links a variable to another Blackboard variable. If a variable is linked to another variable, their state will always be identical, and any change to one will be reflected in the other. If [param create] is [code]true[/code], the variable will be created if it doesn't exist.
+				You can use this method to link a variable in the current scope to a variable in another scope, or in another Blackboard instance. A variable can only be linked to one other variable. Calling this method again will overwrite the previous link. However, it is possible to link to the same variable from multiple different variables.
 			</description>
 		</method>
 		<method name="set_parent">

editor/action_banner.cpp

@@ -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
 

editor/blackboard_plan_editor.cpp

@@ -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

editor/debugger/behavior_tree_view.cpp

@@ -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);
 			}
 

editor/debugger/limbo_debugger_plugin.cpp

@@ -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"

editor/limbo_ai_editor_plugin.cpp

@@ -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

editor/limbo_ai_editor_plugin.h

@@ -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"

editor/task_palette.cpp

@@ -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

editor/task_tree.cpp

@@ -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);
 		}
 	}

gdextension/SConstruct

@@ -14,22 +14,22 @@ env = SConscript("godot-cpp/SConstruct")
 
 # tweak this if you want to use different folders, or more folders, to store your source code in.
 env.Append(CPPPATH=["limboai/"])
-env.Append(CPPDEFINES = ['LIMBOAI_GDEXTENSION'])
+env.Append(CPPDEFINES=["LIMBOAI_GDEXTENSION"])
 sources = Glob("limboai/*.cpp")
-sources += (Glob("limboai/blackboard/*.cpp"))
-sources += (Glob("limboai/blackboard/bb_param/*.cpp"))
-sources += (Glob("limboai/bt/*.cpp"))
-sources += (Glob("limboai/bt/tasks/*.cpp"))
-sources += (Glob("limboai/bt/tasks/blackboard/*.cpp"))
-sources += (Glob("limboai/bt/tasks/composites/*.cpp"))
-sources += (Glob("limboai/bt/tasks/decorators/*.cpp"))
-sources += (Glob("limboai/bt/tasks/scene/*.cpp"))
-sources += (Glob("limboai/bt/tasks/utility/*.cpp"))
-sources += (Glob("limboai/gdextension/*.cpp"))
-sources += (Glob("limboai/editor/debugger/*.cpp"))
-sources += (Glob("limboai/editor/*.cpp"))
-sources += (Glob("limboai/hsm/*.cpp"))
-sources += (Glob("limboai/util/*.cpp"))
+sources += Glob("limboai/blackboard/*.cpp")
+sources += Glob("limboai/blackboard/bb_param/*.cpp")
+sources += Glob("limboai/bt/*.cpp")
+sources += Glob("limboai/bt/tasks/*.cpp")
+sources += Glob("limboai/bt/tasks/blackboard/*.cpp")
+sources += Glob("limboai/bt/tasks/composites/*.cpp")
+sources += Glob("limboai/bt/tasks/decorators/*.cpp")
+sources += Glob("limboai/bt/tasks/scene/*.cpp")
+sources += Glob("limboai/bt/tasks/utility/*.cpp")
+sources += Glob("limboai/gdextension/*.cpp")
+sources += Glob("limboai/editor/debugger/*.cpp")
+sources += Glob("limboai/editor/*.cpp")
+sources += Glob("limboai/hsm/*.cpp")
+sources += Glob("limboai/util/*.cpp")
 
 
 if env["platform"] == "macos":

gdextension/update_icons.py

@@ -31,18 +31,23 @@ def get_script_dir():
 def main():
     silent = False
     try:
-        opts, args = getopt.getopt(sys.argv[1:],
-            "s", ["silent"])
+        opts, args = getopt.getopt(sys.argv[1:], "s", ["silent"])
     except getopt.GetoptError as e:
-        print('%s: %s!\n' % (os.path.basename(__file__), e.msg,))
+        print(
+            "%s: %s!\n"
+            % (
+                os.path.basename(__file__),
+                e.msg,
+            )
+        )
         usage()
         sys.exit(2)
 
     for opt, arg in opts:
-        if opt in ('-h', '--help'):
+        if opt in ("-h", "--help"):
             usage()
             sys.exit(0)
-        elif opt in ('-s','--silent'):
+        elif opt in ("-s", "--silent"):
             silent = True
 
     config_dir = get_script_dir()
@@ -66,7 +71,7 @@ def main():
 
     icon_files.sort()
     for icon_file in icon_files:
-        content += os.path.splitext(icon_file)[0] + " = \"res://addons/limboai/icons/" + icon_file + "\"\n"
+        content += os.path.splitext(icon_file)[0] + ' = "res://addons/limboai/icons/' + icon_file + '"\n'
 
     f = open(config_path, "w")
     f.write(content)

tests/test_bb_param.h

@@ -17,8 +17,14 @@
 #include "core/object/ref_counted.h"
 #include "core/string/node_path.h"
 #include "core/variant/variant.h"
+#include "modules/limboai/blackboard/bb_param/bb_bool.h"
+#include "modules/limboai/blackboard/bb_param/bb_float.h"
+#include "modules/limboai/blackboard/bb_param/bb_int.h"
 #include "modules/limboai/blackboard/bb_param/bb_node.h"
 #include "modules/limboai/blackboard/bb_param/bb_param.h"
+#include "modules/limboai/blackboard/bb_param/bb_string.h"
+#include "modules/limboai/blackboard/bb_param/bb_variant.h"
+#include "modules/limboai/blackboard/bb_param/bb_vector2.h"
 #include "modules/limboai/blackboard/blackboard.h"
 #include "modules/limboai/bt/tasks/bt_task.h"
 #include "tests/test_macros.h"
@@ -122,6 +128,68 @@ TEST_CASE("[Modules][LimboAI] BBNode") {
 	memdelete(dummy);
 }
 
+TEST_CASE("[Modules][LimboAI] BBParam default values") {
+	Node *dummy = memnew(Node);
+	Ref<Blackboard> bb = memnew(Blackboard);
+
+	SUBCASE("Test default value for BBBool") {
+		Ref<BBBool> param = memnew(BBBool);
+		param->set_value_source(BBParam::SAVED_VALUE);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(false));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+	}
+	SUBCASE("Test default value for BBInt") {
+		Ref<BBInt> param = memnew(BBInt);
+		param->set_value_source(BBParam::SAVED_VALUE);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(0));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+	}
+	SUBCASE("Test default value for BBFloat") {
+		Ref<BBFloat> param = memnew(BBFloat);
+		param->set_value_source(BBParam::SAVED_VALUE);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(0.0));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+	}
+	SUBCASE("Test default value for BBString") {
+		Ref<BBString> param = memnew(BBString);
+		param->set_value_source(BBParam::SAVED_VALUE);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(""));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+	}
+	SUBCASE("Test default value for BBVector2") {
+		Ref<BBVector2> param = memnew(BBVector2);
+		param->set_value_source(BBParam::SAVED_VALUE);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(Vector2()));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+	}
+	SUBCASE("Test default value for BBVariant") {
+		Ref<BBVariant> param = memnew(BBVariant);
+		CHECK_EQ(param->get_value(dummy, bb), Variant());
+		param->set_value_source(BBParam::SAVED_VALUE);
+		CHECK_EQ(param->get_value(dummy, bb), Variant());
+		param->set_type(Variant::BOOL);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(false));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+		param->set_type(Variant::INT);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(0));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+		param->set_type(Variant::FLOAT);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(0.0));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+		param->set_type(Variant::STRING);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(""));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+		param->set_type(Variant::VECTOR2);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(Vector2()));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+		param->set_type(Variant::NODE_PATH);
+		CHECK_EQ(param->get_value(dummy, bb), Variant(NodePath()));
+		CHECK_NE(param->get_value(dummy, bb), Variant());
+	}
+
+	memdelete(dummy);
+}
+
 } //namespace TestBBParam
 
 #endif // TEST_BB_PARAM_H

tests/test_hsm.h

@@ -24,6 +24,12 @@
 
 namespace TestHSM {
 
+inline void wire_callbacks(LimboState *p_state, Ref<CallbackCounter> p_entries_counter, Ref<CallbackCounter> p_updates_counter, Ref<CallbackCounter> p_exits_counter) {
+	p_state->call_on_enter(callable_mp(p_entries_counter.ptr(), &CallbackCounter::callback));
+	p_state->call_on_update(callable_mp(p_updates_counter.ptr(), &CallbackCounter::callback_delta));
+	p_state->call_on_exit(callable_mp(p_exits_counter.ptr(), &CallbackCounter::callback));
+}
+
 class TestGuard : public RefCounted {
 	GDCLASS(TestGuard, RefCounted);
 
@@ -42,22 +48,38 @@ TEST_CASE("[Modules][LimboAI] HSM") {
 	Ref<CallbackCounter> beta_entries = memnew(CallbackCounter);
 	Ref<CallbackCounter> beta_exits = memnew(CallbackCounter);
 	Ref<CallbackCounter> beta_updates = memnew(CallbackCounter);
+	Ref<CallbackCounter> nested_entries = memnew(CallbackCounter);
+	Ref<CallbackCounter> nested_exits = memnew(CallbackCounter);
+	Ref<CallbackCounter> nested_updates = memnew(CallbackCounter);
+	Ref<CallbackCounter> gamma_entries = memnew(CallbackCounter);
+	Ref<CallbackCounter> gamma_exits = memnew(CallbackCounter);
+	Ref<CallbackCounter> gamma_updates = memnew(CallbackCounter);
+	Ref<CallbackCounter> delta_entries = memnew(CallbackCounter);
+	Ref<CallbackCounter> delta_exits = memnew(CallbackCounter);
+	Ref<CallbackCounter> delta_updates = memnew(CallbackCounter);
 
 	LimboState *state_alpha = memnew(LimboState);
-	state_alpha->call_on_enter(callable_mp(alpha_entries.ptr(), &CallbackCounter::callback));
-	state_alpha->call_on_update(callable_mp(alpha_updates.ptr(), &CallbackCounter::callback_delta));
-	state_alpha->call_on_exit(callable_mp(alpha_exits.ptr(), &CallbackCounter::callback));
-
+	wire_callbacks(state_alpha, alpha_entries, alpha_updates, alpha_exits);
 	LimboState *state_beta = memnew(LimboState);
-	state_beta->call_on_enter(callable_mp(beta_entries.ptr(), &CallbackCounter::callback));
-	state_beta->call_on_update(callable_mp(beta_updates.ptr(), &CallbackCounter::callback_delta));
-	state_beta->call_on_exit(callable_mp(beta_exits.ptr(), &CallbackCounter::callback));
+	wire_callbacks(state_beta, beta_entries, beta_updates, beta_exits);
+	LimboHSM *nested_hsm = memnew(LimboHSM);
+	wire_callbacks(nested_hsm, nested_entries, nested_updates, nested_exits);
+	LimboState *state_gamma = memnew(LimboState);
+	wire_callbacks(state_gamma, gamma_entries, gamma_updates, gamma_exits);
+	LimboState *state_delta = memnew(LimboState);
+	wire_callbacks(state_delta, delta_entries, delta_updates, delta_exits);
 
 	hsm->add_child(state_alpha);
 	hsm->add_child(state_beta);
+	hsm->add_child(nested_hsm);
+	nested_hsm->add_child(state_gamma);
+	nested_hsm->add_child(state_delta);
 
 	hsm->add_transition(state_alpha, state_beta, "event_one");
 	hsm->add_transition(state_beta, state_alpha, "event_two");
+	hsm->add_transition(hsm->anystate(), nested_hsm, "goto_nested");
+	nested_hsm->add_transition(state_gamma, state_delta, "goto_delta");
+	nested_hsm->add_transition(state_delta, state_gamma, "goto_gamma");
 
 	hsm->set_initial_state(state_alpha);
 	Ref<Blackboard> parent_scope = memnew(Blackboard);
@@ -179,6 +201,57 @@ TEST_CASE("[Modules][LimboAI] HSM") {
 		CHECK(state_beta->get_blackboard()->get_parent() == parent_scope);
 		CHECK(state_alpha->get_blackboard()->get_var("parent_var", Variant()) == Variant(100));
 	}
+	SUBCASE("Test flow with a nested HSM, and test dispatch() from nested states") {
+		state_gamma->dispatch("goto_nested");
+		CHECK(hsm->get_leaf_state() == state_gamma);
+		CHECK(nested_entries->num_callbacks == 1);
+		CHECK(nested_updates->num_callbacks == 0);
+		CHECK(nested_exits->num_callbacks == 0);
+		CHECK(gamma_entries->num_callbacks == 1);
+		CHECK(gamma_updates->num_callbacks == 0);
+		CHECK(gamma_exits->num_callbacks == 0);
+
+		hsm->update(0.01666);
+		CHECK(nested_entries->num_callbacks == 1);
+		CHECK(nested_updates->num_callbacks == 1);
+		CHECK(nested_exits->num_callbacks == 0);
+		CHECK(gamma_entries->num_callbacks == 1);
+		CHECK(gamma_updates->num_callbacks == 1);
+		CHECK(gamma_exits->num_callbacks == 0);
+
+		state_gamma->dispatch("goto_delta");
+		CHECK(hsm->get_leaf_state() == state_delta);
+		CHECK(nested_entries->num_callbacks == 1);
+		CHECK(nested_updates->num_callbacks == 1);
+		CHECK(nested_exits->num_callbacks == 0);
+		CHECK(gamma_entries->num_callbacks == 1);
+		CHECK(gamma_updates->num_callbacks == 1);
+		CHECK(gamma_exits->num_callbacks == 1);
+		CHECK(delta_entries->num_callbacks == 1);
+		CHECK(delta_updates->num_callbacks == 0);
+		CHECK(delta_exits->num_callbacks == 0);
+
+		state_delta->dispatch(hsm->event_finished());
+		CHECK(nested_entries->num_callbacks == 1);
+		CHECK(nested_updates->num_callbacks == 1);
+		CHECK(nested_exits->num_callbacks == 1);
+		CHECK(gamma_entries->num_callbacks == 1);
+		CHECK(gamma_updates->num_callbacks == 1);
+		CHECK(gamma_exits->num_callbacks == 1);
+		CHECK(delta_entries->num_callbacks == 1);
+		CHECK(delta_updates->num_callbacks == 0);
+		CHECK(delta_exits->num_callbacks == 1);
+		CHECK(hsm->is_active() == false);
+		CHECK(hsm->get_leaf_state() == hsm);
+	}
+	SUBCASE("Test get_root()") {
+		CHECK(hsm->get_root() == hsm);
+		CHECK(state_alpha->get_root() == hsm);
+		CHECK(state_beta->get_root() == hsm);
+		CHECK(nested_hsm->get_root() == hsm);
+		CHECK(state_delta->get_root() == hsm);
+		CHECK(state_gamma->get_root() == hsm);
+	}
 
 	memdelete(agent);
 	memdelete(hsm);

util/limbo_string_names.cpp

@@ -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");

util/limbo_string_names.h

@@ -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;

util/limbo_utility.cpp

@@ -515,6 +515,7 @@ PackedInt32Array LimboUtility::get_property_hints_allowed_for_type(Variant::Type
 		case Variant::Type::PACKED_STRING_ARRAY:
 		case Variant::Type::PACKED_VECTOR2_ARRAY:
 		case Variant::Type::PACKED_VECTOR3_ARRAY:
+		case Variant::Type::PACKED_VECTOR4_ARRAY:
 		case Variant::Type::PACKED_COLOR_ARRAY:
 		case Variant::Type::VARIANT_MAX: {
 		} break;