From 13f5eb1f71b17d4d1e80310225059ec9de118724 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Tue, 15 Aug 2023 17:49:13 +0200 Subject: [PATCH] Reorganize BT tasks --- SCsub | 9 +- bt/behavior_tree.cpp | 1 - bt/behavior_tree.h | 6 +- bt/bt_player.cpp | 2 - bt/bt_player.h | 9 +- bt/bt_state.cpp | 1 - bt/bt_state.h | 5 +- bt/{ => tasks}/actions/bt_await_animation.cpp | 0 bt/{ => tasks}/actions/bt_await_animation.h | 2 +- bt/{ => tasks}/actions/bt_call_method.cpp | 0 bt/{ => tasks}/actions/bt_call_method.h | 2 +- bt/{ => tasks}/actions/bt_console_print.cpp | 2 - bt/{ => tasks}/actions/bt_console_print.h | 3 +- bt/{ => tasks}/actions/bt_fail.cpp | 0 bt/{ => tasks}/actions/bt_fail.h | 4 +- bt/{ => tasks}/actions/bt_pause_animation.cpp | 0 bt/{ => tasks}/actions/bt_pause_animation.h | 2 +- bt/{ => tasks}/actions/bt_play_animation.cpp | 0 bt/{ => tasks}/actions/bt_play_animation.h | 2 +- bt/{ => tasks}/actions/bt_random_wait.cpp | 0 bt/{ => tasks}/actions/bt_random_wait.h | 4 +- .../actions/bt_set_agent_property.cpp | 0 .../actions/bt_set_agent_property.h | 5 +- bt/{ => tasks}/actions/bt_set_var.cpp | 0 bt/{ => tasks}/actions/bt_set_var.h | 5 +- bt/{ => tasks}/actions/bt_stop_animation.cpp | 2 +- bt/{ => tasks}/actions/bt_stop_animation.h | 2 +- bt/{ => tasks}/actions/bt_wait.cpp | 0 bt/{ => tasks}/actions/bt_wait.h | 4 +- bt/{ => tasks}/actions/bt_wait_ticks.cpp | 1 - bt/{ => tasks}/actions/bt_wait_ticks.h | 4 +- bt/{actions => tasks}/bt_action.cpp | 0 bt/{actions => tasks}/bt_action.h | 4 +- bt/{composites => tasks}/bt_composite.cpp | 0 bt/{composites => tasks}/bt_composite.h | 4 +- bt/{conditions => tasks}/bt_condition.cpp | 0 bt/{conditions => tasks}/bt_condition.h | 4 +- bt/{decorators => tasks}/bt_decorator.cpp | 0 bt/{decorators => tasks}/bt_decorator.h | 4 +- bt/{ => tasks}/bt_task.cpp | 0 bt/{ => tasks}/bt_task.h | 0 .../composites/bt_dynamic_selector.cpp | 0 .../composites/bt_dynamic_selector.h | 4 +- .../composites/bt_dynamic_sequence.cpp | 0 .../composites/bt_dynamic_sequence.h | 4 +- bt/{ => tasks}/composites/bt_parallel.cpp | 0 bt/{ => tasks}/composites/bt_parallel.h | 4 +- .../composites/bt_random_selector.cpp | 0 .../composites/bt_random_selector.h | 2 +- .../composites/bt_random_sequence.cpp | 0 .../composites/bt_random_sequence.h | 2 +- bt/{ => tasks}/composites/bt_selector.cpp | 0 bt/{ => tasks}/composites/bt_selector.h | 2 +- bt/{ => tasks}/composites/bt_sequence.cpp | 0 bt/{ => tasks}/composites/bt_sequence.h | 4 +- .../conditions/bt_check_agent_property.cpp | 0 .../conditions/bt_check_agent_property.h | 3 +- .../conditions/bt_check_trigger.cpp | 1 - bt/{ => tasks}/conditions/bt_check_trigger.h | 5 +- bt/{ => tasks}/conditions/bt_check_var.cpp | 0 bt/{ => tasks}/conditions/bt_check_var.h | 2 +- bt/{ => tasks}/decorators/bt_always_fail.cpp | 0 bt/{ => tasks}/decorators/bt_always_fail.h | 4 +- .../decorators/bt_always_succeed.cpp | 0 bt/{ => tasks}/decorators/bt_always_succeed.h | 4 +- bt/{ => tasks}/decorators/bt_cooldown.cpp | 0 bt/{ => tasks}/decorators/bt_cooldown.h | 3 +- bt/{ => tasks}/decorators/bt_delay.cpp | 0 bt/{ => tasks}/decorators/bt_delay.h | 4 +- bt/{ => tasks}/decorators/bt_for_each.cpp | 0 bt/{ => tasks}/decorators/bt_for_each.h | 4 +- bt/{ => tasks}/decorators/bt_invert.cpp | 0 bt/{ => tasks}/decorators/bt_invert.h | 4 +- bt/{ => tasks}/decorators/bt_new_scope.cpp | 0 bt/{ => tasks}/decorators/bt_new_scope.h | 4 +- bt/{ => tasks}/decorators/bt_probability.cpp | 0 bt/{ => tasks}/decorators/bt_probability.h | 2 +- bt/{ => tasks}/decorators/bt_repeat.cpp | 0 bt/{ => tasks}/decorators/bt_repeat.h | 4 +- .../decorators/bt_repeat_until_failure.cpp | 0 .../decorators/bt_repeat_until_failure.h | 4 +- .../decorators/bt_repeat_until_success.cpp | 0 .../decorators/bt_repeat_until_success.h | 4 +- bt/{ => tasks}/decorators/bt_run_limit.cpp | 0 bt/{ => tasks}/decorators/bt_run_limit.h | 2 +- bt/{ => tasks}/decorators/bt_subtree.cpp | 6 +- bt/{ => tasks}/decorators/bt_subtree.h | 0 bt/{ => tasks}/decorators/bt_time_limit.cpp | 0 bt/{ => tasks}/decorators/bt_time_limit.h | 4 +- editor/debugger/behavior_tree_data.h | 4 +- editor/debugger/behavior_tree_view.cpp | 3 +- editor/debugger/limbo_debugger.cpp | 2 +- editor/debugger/limbo_debugger.h | 2 +- editor/limbo_ai_editor_plugin.cpp | 10 +-- editor/limbo_ai_editor_plugin.h | 2 +- register_types.cpp | 82 +++++++++---------- util/limbo_utility.cpp | 2 +- util/limbo_utility.h | 3 +- 98 files changed, 110 insertions(+), 179 deletions(-) rename bt/{ => tasks}/actions/bt_await_animation.cpp (100%) rename bt/{ => tasks}/actions/bt_await_animation.h (96%) rename bt/{ => tasks}/actions/bt_call_method.cpp (100%) rename bt/{ => tasks}/actions/bt_call_method.h (95%) rename bt/{ => tasks}/actions/bt_console_print.cpp (98%) rename bt/{ => tasks}/actions/bt_console_print.h (93%) rename bt/{ => tasks}/actions/bt_fail.cpp (100%) rename bt/{ => tasks}/actions/bt_fail.h (87%) rename bt/{ => tasks}/actions/bt_pause_animation.cpp (100%) rename bt/{ => tasks}/actions/bt_pause_animation.h (97%) rename bt/{ => tasks}/actions/bt_play_animation.cpp (100%) rename bt/{ => tasks}/actions/bt_play_animation.h (97%) rename bt/{ => tasks}/actions/bt_random_wait.cpp (100%) rename bt/{ => tasks}/actions/bt_random_wait.h (92%) rename bt/{ => tasks}/actions/bt_set_agent_property.cpp (100%) rename bt/{ => tasks}/actions/bt_set_agent_property.h (87%) rename bt/{ => tasks}/actions/bt_set_var.cpp (100%) rename bt/{ => tasks}/actions/bt_set_var.h (88%) rename bt/{ => tasks}/actions/bt_stop_animation.cpp (98%) rename bt/{ => tasks}/actions/bt_stop_animation.h (96%) rename bt/{ => tasks}/actions/bt_wait.cpp (100%) rename bt/{ => tasks}/actions/bt_wait.h (91%) rename bt/{ => tasks}/actions/bt_wait_ticks.cpp (96%) rename bt/{ => tasks}/actions/bt_wait_ticks.h (91%) rename bt/{actions => tasks}/bt_action.cpp (100%) rename bt/{actions => tasks}/bt_action.h (87%) rename bt/{composites => tasks}/bt_composite.cpp (100%) rename bt/{composites => tasks}/bt_composite.h (87%) rename bt/{conditions => tasks}/bt_condition.cpp (100%) rename bt/{conditions => tasks}/bt_condition.h (87%) rename bt/{decorators => tasks}/bt_decorator.cpp (100%) rename bt/{decorators => tasks}/bt_decorator.h (87%) rename bt/{ => tasks}/bt_task.cpp (100%) rename bt/{ => tasks}/bt_task.h (100%) rename bt/{ => tasks}/composites/bt_dynamic_selector.cpp (100%) rename bt/{ => tasks}/composites/bt_dynamic_selector.h (88%) rename bt/{ => tasks}/composites/bt_dynamic_sequence.cpp (100%) rename bt/{ => tasks}/composites/bt_dynamic_sequence.h (88%) rename bt/{ => tasks}/composites/bt_parallel.cpp (100%) rename bt/{ => tasks}/composites/bt_parallel.h (93%) rename bt/{ => tasks}/composites/bt_random_selector.cpp (100%) rename bt/{ => tasks}/composites/bt_random_selector.h (92%) rename bt/{ => tasks}/composites/bt_random_sequence.cpp (100%) rename bt/{ => tasks}/composites/bt_random_sequence.h (92%) rename bt/{ => tasks}/composites/bt_selector.cpp (100%) rename bt/{ => tasks}/composites/bt_selector.h (92%) rename bt/{ => tasks}/composites/bt_sequence.cpp (100%) rename bt/{ => tasks}/composites/bt_sequence.h (88%) rename bt/{ => tasks}/conditions/bt_check_agent_property.cpp (100%) rename bt/{ => tasks}/conditions/bt_check_agent_property.h (93%) rename bt/{ => tasks}/conditions/bt_check_trigger.cpp (98%) rename bt/{ => tasks}/conditions/bt_check_trigger.h (88%) rename bt/{ => tasks}/conditions/bt_check_var.cpp (100%) rename bt/{ => tasks}/conditions/bt_check_var.h (96%) rename bt/{ => tasks}/decorators/bt_always_fail.cpp (100%) rename bt/{ => tasks}/decorators/bt_always_fail.h (87%) rename bt/{ => tasks}/decorators/bt_always_succeed.cpp (100%) rename bt/{ => tasks}/decorators/bt_always_succeed.h (87%) rename bt/{ => tasks}/decorators/bt_cooldown.cpp (100%) rename bt/{ => tasks}/decorators/bt_cooldown.h (94%) rename bt/{ => tasks}/decorators/bt_delay.cpp (100%) rename bt/{ => tasks}/decorators/bt_delay.h (90%) rename bt/{ => tasks}/decorators/bt_for_each.cpp (100%) rename bt/{ => tasks}/decorators/bt_for_each.h (91%) rename bt/{ => tasks}/decorators/bt_invert.cpp (100%) rename bt/{ => tasks}/decorators/bt_invert.h (87%) rename bt/{ => tasks}/decorators/bt_new_scope.cpp (100%) rename bt/{ => tasks}/decorators/bt_new_scope.h (91%) rename bt/{ => tasks}/decorators/bt_probability.cpp (100%) rename bt/{ => tasks}/decorators/bt_probability.h (93%) rename bt/{ => tasks}/decorators/bt_repeat.cpp (100%) rename bt/{ => tasks}/decorators/bt_repeat.h (93%) rename bt/{ => tasks}/decorators/bt_repeat_until_failure.cpp (100%) rename bt/{ => tasks}/decorators/bt_repeat_until_failure.h (86%) rename bt/{ => tasks}/decorators/bt_repeat_until_success.cpp (100%) rename bt/{ => tasks}/decorators/bt_repeat_until_success.h (86%) rename bt/{ => tasks}/decorators/bt_run_limit.cpp (100%) rename bt/{ => tasks}/decorators/bt_run_limit.h (93%) rename bt/{ => tasks}/decorators/bt_subtree.cpp (89%) rename bt/{ => tasks}/decorators/bt_subtree.h (100%) rename bt/{ => tasks}/decorators/bt_time_limit.cpp (100%) rename bt/{ => tasks}/decorators/bt_time_limit.h (90%) diff --git a/SCsub b/SCsub index 857bbee..cbc789a 100644 --- a/SCsub +++ b/SCsub @@ -9,10 +9,11 @@ module_env.add_source_files(env.modules_sources, "*.cpp") module_env.add_source_files(env.modules_sources, "blackboard/*.cpp") module_env.add_source_files(env.modules_sources, "blackboard/bb_param/*.cpp") module_env.add_source_files(env.modules_sources, "bt/*.cpp") -module_env.add_source_files(env.modules_sources, "bt/composites/*.cpp") -module_env.add_source_files(env.modules_sources, "bt/actions/*.cpp") -module_env.add_source_files(env.modules_sources, "bt/decorators/*.cpp") -module_env.add_source_files(env.modules_sources, "bt/conditions/*.cpp") +module_env.add_source_files(env.modules_sources, "bt/tasks/*.cpp") +module_env.add_source_files(env.modules_sources, "bt/tasks/composites/*.cpp") +module_env.add_source_files(env.modules_sources, "bt/tasks/actions/*.cpp") +module_env.add_source_files(env.modules_sources, "bt/tasks/decorators/*.cpp") +module_env.add_source_files(env.modules_sources, "bt/tasks/conditions/*.cpp") if env.editor_build: module_env.add_source_files(env.modules_sources, "editor/*.cpp") module_env.add_source_files(env.modules_sources, "editor/debugger/*.cpp") diff --git a/bt/behavior_tree.cpp b/bt/behavior_tree.cpp index 7a980fc..f4e7cd4 100644 --- a/bt/behavior_tree.cpp +++ b/bt/behavior_tree.cpp @@ -13,7 +13,6 @@ #include "core/error/error_macros.h" #include "core/object/class_db.h" -#include "core/object/object.h" #include "core/templates/list.h" #include "core/variant/variant.h" diff --git a/bt/behavior_tree.h b/bt/behavior_tree.h index 3670ad6..f8582b0 100644 --- a/bt/behavior_tree.h +++ b/bt/behavior_tree.h @@ -12,12 +12,10 @@ #ifndef BEHAVIOR_TREE_H #define BEHAVIOR_TREE_H -#include "bt_task.h" +#include "core/io/resource.h" #include "modules/limboai/blackboard/blackboard.h" - -#include "core/io/resource.h" -#include "core/object/object.h" +#include "tasks/bt_task.h" class BehaviorTree : public Resource { GDCLASS(BehaviorTree, Resource); diff --git a/bt/bt_player.cpp b/bt/bt_player.cpp index a03fc59..ffecd6e 100644 --- a/bt/bt_player.cpp +++ b/bt/bt_player.cpp @@ -11,7 +11,6 @@ #include "bt_player.h" -#include "bt_task.h" #include "modules/limboai/blackboard/blackboard.h" #include "modules/limboai/editor/debugger/limbo_debugger.h" #include "modules/limboai/util/limbo_string_names.h" @@ -20,7 +19,6 @@ #include "core/error/error_macros.h" #include "core/io/resource_loader.h" #include "core/object/class_db.h" -#include "core/object/object.h" #include "core/os/memory.h" #include "core/string/string_name.h" #include "core/variant/variant.h" diff --git a/bt/bt_player.h b/bt/bt_player.h index 4584981..63bdd61 100644 --- a/bt/bt_player.h +++ b/bt/bt_player.h @@ -12,13 +12,12 @@ #ifndef BT_PLAYER_H #define BT_PLAYER_H -#include "behavior_tree.h" -#include "bt_task.h" -#include "modules/limboai/blackboard/blackboard.h" - -#include "core/object/object.h" #include "scene/main/node.h" +#include "behavior_tree.h" +#include "modules/limboai/blackboard/blackboard.h" +#include "tasks/bt_task.h" + class BTPlayer : public Node { GDCLASS(BTPlayer, Node); diff --git a/bt/bt_state.cpp b/bt/bt_state.cpp index f06469a..cf1c7d7 100644 --- a/bt/bt_state.cpp +++ b/bt/bt_state.cpp @@ -11,7 +11,6 @@ #include "bt_state.h" -#include "modules/limboai/bt/bt_task.h" #include "modules/limboai/editor/debugger/limbo_debugger.h" #include "modules/limboai/hsm/limbo_state.h" #include "modules/limboai/util/limbo_string_names.h" diff --git a/bt/bt_state.h b/bt/bt_state.h index 48708bb..497ba4e 100644 --- a/bt/bt_state.h +++ b/bt/bt_state.h @@ -12,11 +12,10 @@ #ifndef BT_STATE_H #define BT_STATE_H -#include "modules/limboai/bt/behavior_tree.h" -#include "modules/limboai/bt/bt_task.h" #include "modules/limboai/hsm/limbo_state.h" -#include "core/object/object.h" +#include "modules/limboai/bt/behavior_tree.h" +#include "modules/limboai/bt/tasks/bt_task.h" class BTState : public LimboState { GDCLASS(BTState, LimboState); diff --git a/bt/actions/bt_await_animation.cpp b/bt/tasks/actions/bt_await_animation.cpp similarity index 100% rename from bt/actions/bt_await_animation.cpp rename to bt/tasks/actions/bt_await_animation.cpp diff --git a/bt/actions/bt_await_animation.h b/bt/tasks/actions/bt_await_animation.h similarity index 96% rename from bt/actions/bt_await_animation.h rename to bt/tasks/actions/bt_await_animation.h index 66012b8..794be74 100644 --- a/bt/actions/bt_await_animation.h +++ b/bt/tasks/actions/bt_await_animation.h @@ -12,7 +12,7 @@ #ifndef BT_AWAIT_ANIMATION_H #define BT_AWAIT_ANIMATION_H -#include "bt_action.h" +#include "../bt_action.h" #include "modules/limboai/blackboard/bb_param/bb_node.h" diff --git a/bt/actions/bt_call_method.cpp b/bt/tasks/actions/bt_call_method.cpp similarity index 100% rename from bt/actions/bt_call_method.cpp rename to bt/tasks/actions/bt_call_method.cpp diff --git a/bt/actions/bt_call_method.h b/bt/tasks/actions/bt_call_method.h similarity index 95% rename from bt/actions/bt_call_method.h rename to bt/tasks/actions/bt_call_method.h index 4d7eba6..2761583 100644 --- a/bt/actions/bt_call_method.h +++ b/bt/tasks/actions/bt_call_method.h @@ -12,7 +12,7 @@ #ifndef BT_CALL_METHOD_H #define BT_CALL_METHOD_H -#include "bt_action.h" +#include "../bt_action.h" #include "modules/limboai/blackboard/bb_param/bb_node.h" diff --git a/bt/actions/bt_console_print.cpp b/bt/tasks/actions/bt_console_print.cpp similarity index 98% rename from bt/actions/bt_console_print.cpp rename to bt/tasks/actions/bt_console_print.cpp index 6dbcd2a..98b7715 100644 --- a/bt/actions/bt_console_print.cpp +++ b/bt/tasks/actions/bt_console_print.cpp @@ -11,8 +11,6 @@ #include "bt_console_print.h" -#include "modules/limboai/bt/actions/bt_action.h" - #include "core/object/object.h" #include "core/string/print_string.h" diff --git a/bt/actions/bt_console_print.h b/bt/tasks/actions/bt_console_print.h similarity index 93% rename from bt/actions/bt_console_print.h rename to bt/tasks/actions/bt_console_print.h index 98080e7..bdf0e9c 100644 --- a/bt/actions/bt_console_print.h +++ b/bt/tasks/actions/bt_console_print.h @@ -12,9 +12,8 @@ #ifndef BT_CONSOLE_PRINT_H #define BT_CONSOLE_PRINT_H -#include "bt_action.h" +#include "../bt_action.h" -#include "core/object/object.h" #include "core/variant/variant.h" class BTConsolePrint : public BTAction { diff --git a/bt/actions/bt_fail.cpp b/bt/tasks/actions/bt_fail.cpp similarity index 100% rename from bt/actions/bt_fail.cpp rename to bt/tasks/actions/bt_fail.cpp diff --git a/bt/actions/bt_fail.h b/bt/tasks/actions/bt_fail.h similarity index 87% rename from bt/actions/bt_fail.h rename to bt/tasks/actions/bt_fail.h index 7d35a93..cf64e7d 100644 --- a/bt/actions/bt_fail.h +++ b/bt/tasks/actions/bt_fail.h @@ -12,9 +12,7 @@ #ifndef BT_FAIL_H #define BT_FAIL_H -#include "bt_action.h" - -#include "core/object/object.h" +#include "../bt_action.h" class BTFail : public BTAction { GDCLASS(BTFail, BTAction); diff --git a/bt/actions/bt_pause_animation.cpp b/bt/tasks/actions/bt_pause_animation.cpp similarity index 100% rename from bt/actions/bt_pause_animation.cpp rename to bt/tasks/actions/bt_pause_animation.cpp diff --git a/bt/actions/bt_pause_animation.h b/bt/tasks/actions/bt_pause_animation.h similarity index 97% rename from bt/actions/bt_pause_animation.h rename to bt/tasks/actions/bt_pause_animation.h index b355339..bc319a1 100644 --- a/bt/actions/bt_pause_animation.h +++ b/bt/tasks/actions/bt_pause_animation.h @@ -12,7 +12,7 @@ #ifndef BT_PAUSE_ANIMATION_H #define BT_PAUSE_ANIMATION_H -#include "bt_action.h" +#include "../bt_action.h" #include "modules/limboai/blackboard/bb_param/bb_node.h" diff --git a/bt/actions/bt_play_animation.cpp b/bt/tasks/actions/bt_play_animation.cpp similarity index 100% rename from bt/actions/bt_play_animation.cpp rename to bt/tasks/actions/bt_play_animation.cpp diff --git a/bt/actions/bt_play_animation.h b/bt/tasks/actions/bt_play_animation.h similarity index 97% rename from bt/actions/bt_play_animation.h rename to bt/tasks/actions/bt_play_animation.h index 2dd1860..5b85820 100644 --- a/bt/actions/bt_play_animation.h +++ b/bt/tasks/actions/bt_play_animation.h @@ -12,7 +12,7 @@ #ifndef BT_PLAY_ANIMATION_H #define BT_PLAY_ANIMATION_H -#include "bt_action.h" +#include "../bt_action.h" #include "modules/limboai/blackboard/bb_param/bb_node.h" diff --git a/bt/actions/bt_random_wait.cpp b/bt/tasks/actions/bt_random_wait.cpp similarity index 100% rename from bt/actions/bt_random_wait.cpp rename to bt/tasks/actions/bt_random_wait.cpp diff --git a/bt/actions/bt_random_wait.h b/bt/tasks/actions/bt_random_wait.h similarity index 92% rename from bt/actions/bt_random_wait.h rename to bt/tasks/actions/bt_random_wait.h index e9d77b5..ce65c90 100644 --- a/bt/actions/bt_random_wait.h +++ b/bt/tasks/actions/bt_random_wait.h @@ -12,9 +12,7 @@ #ifndef BT_RANDOM_WAIT_H #define BT_RANDOM_WAIT_H -#include "bt_action.h" - -#include "core/object/object.h" +#include "../bt_action.h" class BTRandomWait : public BTAction { GDCLASS(BTRandomWait, BTAction); diff --git a/bt/actions/bt_set_agent_property.cpp b/bt/tasks/actions/bt_set_agent_property.cpp similarity index 100% rename from bt/actions/bt_set_agent_property.cpp rename to bt/tasks/actions/bt_set_agent_property.cpp diff --git a/bt/actions/bt_set_agent_property.h b/bt/tasks/actions/bt_set_agent_property.h similarity index 87% rename from bt/actions/bt_set_agent_property.h rename to bt/tasks/actions/bt_set_agent_property.h index b229e6d..c218547 100644 --- a/bt/actions/bt_set_agent_property.h +++ b/bt/tasks/actions/bt_set_agent_property.h @@ -12,13 +12,10 @@ #ifndef BT_SET_AGENT_PROPERTY_H #define BT_SET_AGENT_PROPERTY_H -#include "modules/limboai/bt/actions/bt_action.h" +#include "../bt_action.h" #include "modules/limboai/blackboard/bb_param/bb_variant.h" -#include "core/object/class_db.h" -#include "core/object/object.h" - class BTSetAgentProperty : public BTAction { GDCLASS(BTSetAgentProperty, BTAction); diff --git a/bt/actions/bt_set_var.cpp b/bt/tasks/actions/bt_set_var.cpp similarity index 100% rename from bt/actions/bt_set_var.cpp rename to bt/tasks/actions/bt_set_var.cpp diff --git a/bt/actions/bt_set_var.h b/bt/tasks/actions/bt_set_var.h similarity index 88% rename from bt/actions/bt_set_var.h rename to bt/tasks/actions/bt_set_var.h index 84c7c38..7fb2b51 100644 --- a/bt/actions/bt_set_var.h +++ b/bt/tasks/actions/bt_set_var.h @@ -13,11 +13,10 @@ #ifndef BT_SET_VAR_H #define BT_SET_VAR_H -#include "../actions/bt_action.h" +#include "../bt_action.h" -#include "../../blackboard/bb_param/bb_variant.h" +#include "modules/limboai/blackboard/bb_param/bb_variant.h" -#include "core/object/object.h" #include "core/string/ustring.h" class BTSetVar : public BTAction { diff --git a/bt/actions/bt_stop_animation.cpp b/bt/tasks/actions/bt_stop_animation.cpp similarity index 98% rename from bt/actions/bt_stop_animation.cpp rename to bt/tasks/actions/bt_stop_animation.cpp index 636375f..ca05f00 100644 --- a/bt/actions/bt_stop_animation.cpp +++ b/bt/tasks/actions/bt_stop_animation.cpp @@ -9,7 +9,7 @@ * ============================================================================= */ -#include "modules/limboai/bt/actions/bt_stop_animation.h" +#include "bt_stop_animation.h" //**** Setters / Getters diff --git a/bt/actions/bt_stop_animation.h b/bt/tasks/actions/bt_stop_animation.h similarity index 96% rename from bt/actions/bt_stop_animation.h rename to bt/tasks/actions/bt_stop_animation.h index 6a92f93..dbcd951 100644 --- a/bt/actions/bt_stop_animation.h +++ b/bt/tasks/actions/bt_stop_animation.h @@ -12,7 +12,7 @@ #ifndef BT_STOP_ANIMATION_H #define BT_STOP_ANIMATION_H -#include "bt_action.h" +#include "../bt_action.h" #include "modules/limboai/blackboard/bb_param/bb_node.h" diff --git a/bt/actions/bt_wait.cpp b/bt/tasks/actions/bt_wait.cpp similarity index 100% rename from bt/actions/bt_wait.cpp rename to bt/tasks/actions/bt_wait.cpp diff --git a/bt/actions/bt_wait.h b/bt/tasks/actions/bt_wait.h similarity index 91% rename from bt/actions/bt_wait.h rename to bt/tasks/actions/bt_wait.h index 610b0d7..3043449 100644 --- a/bt/actions/bt_wait.h +++ b/bt/tasks/actions/bt_wait.h @@ -12,9 +12,7 @@ #ifndef BT_WAIT_H #define BT_WAIT_H -#include "bt_action.h" - -#include "core/object/object.h" +#include "../bt_action.h" class BTWait : public BTAction { GDCLASS(BTWait, BTAction); diff --git a/bt/actions/bt_wait_ticks.cpp b/bt/tasks/actions/bt_wait_ticks.cpp similarity index 96% rename from bt/actions/bt_wait_ticks.cpp rename to bt/tasks/actions/bt_wait_ticks.cpp index 4faaf03..eed9b1e 100644 --- a/bt/actions/bt_wait_ticks.cpp +++ b/bt/tasks/actions/bt_wait_ticks.cpp @@ -11,7 +11,6 @@ #include "bt_wait_ticks.h" -#include "core/object/class_db.h" #include "core/object/object.h" #include "core/variant/variant.h" diff --git a/bt/actions/bt_wait_ticks.h b/bt/tasks/actions/bt_wait_ticks.h similarity index 91% rename from bt/actions/bt_wait_ticks.h rename to bt/tasks/actions/bt_wait_ticks.h index 1e64c80..8271bd4 100644 --- a/bt/actions/bt_wait_ticks.h +++ b/bt/tasks/actions/bt_wait_ticks.h @@ -12,9 +12,7 @@ #ifndef BT_WAIT_TICKS_H #define BT_WAIT_TICKS_H -#include "bt_action.h" - -#include "core/object/object.h" +#include "../bt_action.h" class BTWaitTicks : public BTAction { GDCLASS(BTWaitTicks, BTAction); diff --git a/bt/actions/bt_action.cpp b/bt/tasks/bt_action.cpp similarity index 100% rename from bt/actions/bt_action.cpp rename to bt/tasks/bt_action.cpp diff --git a/bt/actions/bt_action.h b/bt/tasks/bt_action.h similarity index 87% rename from bt/actions/bt_action.h rename to bt/tasks/bt_action.h index 1bff720..cc7749f 100644 --- a/bt/actions/bt_action.h +++ b/bt/tasks/bt_action.h @@ -12,9 +12,7 @@ #ifndef BT_ACTION_H #define BT_ACTION_H -#include "../bt_task.h" - -#include "core/object/object.h" +#include "bt_task.h" class BTAction : public BTTask { GDCLASS(BTAction, BTTask); diff --git a/bt/composites/bt_composite.cpp b/bt/tasks/bt_composite.cpp similarity index 100% rename from bt/composites/bt_composite.cpp rename to bt/tasks/bt_composite.cpp diff --git a/bt/composites/bt_composite.h b/bt/tasks/bt_composite.h similarity index 87% rename from bt/composites/bt_composite.h rename to bt/tasks/bt_composite.h index 56beb13..56cd376 100644 --- a/bt/composites/bt_composite.h +++ b/bt/tasks/bt_composite.h @@ -12,9 +12,7 @@ #ifndef BT_COMPOSITE_H #define BT_COMPOSITE_H -#include "../bt_task.h" - -#include "core/object/object.h" +#include "bt_task.h" class BTComposite : public BTTask { GDCLASS(BTComposite, BTTask); diff --git a/bt/conditions/bt_condition.cpp b/bt/tasks/bt_condition.cpp similarity index 100% rename from bt/conditions/bt_condition.cpp rename to bt/tasks/bt_condition.cpp diff --git a/bt/conditions/bt_condition.h b/bt/tasks/bt_condition.h similarity index 87% rename from bt/conditions/bt_condition.h rename to bt/tasks/bt_condition.h index fe8cc3b..19efda1 100644 --- a/bt/conditions/bt_condition.h +++ b/bt/tasks/bt_condition.h @@ -12,9 +12,7 @@ #ifndef BT_CONDITION_H #define BT_CONDITION_H -#include "../bt_task.h" - -#include "core/object/object.h" +#include "bt_task.h" class BTCondition : public BTTask { GDCLASS(BTCondition, BTTask); diff --git a/bt/decorators/bt_decorator.cpp b/bt/tasks/bt_decorator.cpp similarity index 100% rename from bt/decorators/bt_decorator.cpp rename to bt/tasks/bt_decorator.cpp diff --git a/bt/decorators/bt_decorator.h b/bt/tasks/bt_decorator.h similarity index 87% rename from bt/decorators/bt_decorator.h rename to bt/tasks/bt_decorator.h index aba047f..249122d 100644 --- a/bt/decorators/bt_decorator.h +++ b/bt/tasks/bt_decorator.h @@ -12,9 +12,7 @@ #ifndef BT_DECORATOR_H #define BT_DECORATOR_H -#include "../bt_task.h" - -#include "core/object/object.h" +#include "bt_task.h" class BTDecorator : public BTTask { GDCLASS(BTDecorator, BTTask) diff --git a/bt/bt_task.cpp b/bt/tasks/bt_task.cpp similarity index 100% rename from bt/bt_task.cpp rename to bt/tasks/bt_task.cpp diff --git a/bt/bt_task.h b/bt/tasks/bt_task.h similarity index 100% rename from bt/bt_task.h rename to bt/tasks/bt_task.h diff --git a/bt/composites/bt_dynamic_selector.cpp b/bt/tasks/composites/bt_dynamic_selector.cpp similarity index 100% rename from bt/composites/bt_dynamic_selector.cpp rename to bt/tasks/composites/bt_dynamic_selector.cpp diff --git a/bt/composites/bt_dynamic_selector.h b/bt/tasks/composites/bt_dynamic_selector.h similarity index 88% rename from bt/composites/bt_dynamic_selector.h rename to bt/tasks/composites/bt_dynamic_selector.h index 4cbd37e..b5d0631 100644 --- a/bt/composites/bt_dynamic_selector.h +++ b/bt/tasks/composites/bt_dynamic_selector.h @@ -12,9 +12,7 @@ #ifndef BT_DYNAMIC_SELECTOR_H #define BT_DYNAMIC_SELECTOR_H -#include "bt_composite.h" - -#include "core/object/object.h" +#include "../bt_composite.h" class BTDynamicSelector : public BTComposite { GDCLASS(BTDynamicSelector, BTComposite); diff --git a/bt/composites/bt_dynamic_sequence.cpp b/bt/tasks/composites/bt_dynamic_sequence.cpp similarity index 100% rename from bt/composites/bt_dynamic_sequence.cpp rename to bt/tasks/composites/bt_dynamic_sequence.cpp diff --git a/bt/composites/bt_dynamic_sequence.h b/bt/tasks/composites/bt_dynamic_sequence.h similarity index 88% rename from bt/composites/bt_dynamic_sequence.h rename to bt/tasks/composites/bt_dynamic_sequence.h index 6681868..3f5813a 100644 --- a/bt/composites/bt_dynamic_sequence.h +++ b/bt/tasks/composites/bt_dynamic_sequence.h @@ -12,9 +12,7 @@ #ifndef BT_DYNAMIC_SEQUENCE_H #define BT_DYNAMIC_SEQUENCE_H -#include "bt_composite.h" - -#include "core/object/object.h" +#include "../bt_composite.h" class BTDynamicSequence : public BTComposite { GDCLASS(BTDynamicSequence, BTComposite); diff --git a/bt/composites/bt_parallel.cpp b/bt/tasks/composites/bt_parallel.cpp similarity index 100% rename from bt/composites/bt_parallel.cpp rename to bt/tasks/composites/bt_parallel.cpp diff --git a/bt/composites/bt_parallel.h b/bt/tasks/composites/bt_parallel.h similarity index 93% rename from bt/composites/bt_parallel.h rename to bt/tasks/composites/bt_parallel.h index 2da1f17..93cf0b5 100644 --- a/bt/composites/bt_parallel.h +++ b/bt/tasks/composites/bt_parallel.h @@ -12,9 +12,7 @@ #ifndef BT_PARALLEL_H #define BT_PARALLEL_H -#include "bt_composite.h" - -#include "core/object/object.h" +#include "../bt_composite.h" class BTParallel : public BTComposite { GDCLASS(BTParallel, BTComposite); diff --git a/bt/composites/bt_random_selector.cpp b/bt/tasks/composites/bt_random_selector.cpp similarity index 100% rename from bt/composites/bt_random_selector.cpp rename to bt/tasks/composites/bt_random_selector.cpp diff --git a/bt/composites/bt_random_selector.h b/bt/tasks/composites/bt_random_selector.h similarity index 92% rename from bt/composites/bt_random_selector.h rename to bt/tasks/composites/bt_random_selector.h index 60347d6..1f10527 100644 --- a/bt/composites/bt_random_selector.h +++ b/bt/tasks/composites/bt_random_selector.h @@ -12,7 +12,7 @@ #ifndef BT_RANDOM_SELECTOR_H #define BT_RANDOM_SELECTOR_H -#include "bt_composite.h" +#include "../bt_composite.h" #include "core/templates/vector.h" diff --git a/bt/composites/bt_random_sequence.cpp b/bt/tasks/composites/bt_random_sequence.cpp similarity index 100% rename from bt/composites/bt_random_sequence.cpp rename to bt/tasks/composites/bt_random_sequence.cpp diff --git a/bt/composites/bt_random_sequence.h b/bt/tasks/composites/bt_random_sequence.h similarity index 92% rename from bt/composites/bt_random_sequence.h rename to bt/tasks/composites/bt_random_sequence.h index bee7380..c2ed551 100644 --- a/bt/composites/bt_random_sequence.h +++ b/bt/tasks/composites/bt_random_sequence.h @@ -12,7 +12,7 @@ #ifndef BT_RANDOM_SEQUENCE_H #define BT_RANDOM_SEQUENCE_H -#include "bt_composite.h" +#include "../bt_composite.h" #include "core/templates/vector.h" diff --git a/bt/composites/bt_selector.cpp b/bt/tasks/composites/bt_selector.cpp similarity index 100% rename from bt/composites/bt_selector.cpp rename to bt/tasks/composites/bt_selector.cpp diff --git a/bt/composites/bt_selector.h b/bt/tasks/composites/bt_selector.h similarity index 92% rename from bt/composites/bt_selector.h rename to bt/tasks/composites/bt_selector.h index 9dbbd91..c60b045 100644 --- a/bt/composites/bt_selector.h +++ b/bt/tasks/composites/bt_selector.h @@ -12,7 +12,7 @@ #ifndef BT_SELECTOR_H #define BT_SELECTOR_H -#include "bt_composite.h" +#include "../bt_composite.h" class BTSelector : public BTComposite { GDCLASS(BTSelector, BTComposite); diff --git a/bt/composites/bt_sequence.cpp b/bt/tasks/composites/bt_sequence.cpp similarity index 100% rename from bt/composites/bt_sequence.cpp rename to bt/tasks/composites/bt_sequence.cpp diff --git a/bt/composites/bt_sequence.h b/bt/tasks/composites/bt_sequence.h similarity index 88% rename from bt/composites/bt_sequence.h rename to bt/tasks/composites/bt_sequence.h index e83a2d3..b82174f 100644 --- a/bt/composites/bt_sequence.h +++ b/bt/tasks/composites/bt_sequence.h @@ -12,9 +12,7 @@ #ifndef BT_SEQUENCE_H #define BT_SEQUENCE_H -#include "bt_composite.h" - -#include "core/object/object.h" +#include "../bt_composite.h" class BTSequence : public BTComposite { GDCLASS(BTSequence, BTComposite); diff --git a/bt/conditions/bt_check_agent_property.cpp b/bt/tasks/conditions/bt_check_agent_property.cpp similarity index 100% rename from bt/conditions/bt_check_agent_property.cpp rename to bt/tasks/conditions/bt_check_agent_property.cpp diff --git a/bt/conditions/bt_check_agent_property.h b/bt/tasks/conditions/bt_check_agent_property.h similarity index 93% rename from bt/conditions/bt_check_agent_property.h rename to bt/tasks/conditions/bt_check_agent_property.h index e488f26..113b01f 100644 --- a/bt/conditions/bt_check_agent_property.h +++ b/bt/tasks/conditions/bt_check_agent_property.h @@ -12,12 +12,11 @@ #ifndef BT_CHECK_AGENT_PROPERTY #define BT_CHECK_AGENT_PROPERTY -#include "bt_condition.h" +#include "../bt_condition.h" #include "modules/limboai/blackboard/bb_param/bb_variant.h" #include "modules/limboai/util/limbo_utility.h" -#include "core/object/object.h" #include "core/string/string_name.h" class BTCheckAgentProperty : public BTCondition { diff --git a/bt/conditions/bt_check_trigger.cpp b/bt/tasks/conditions/bt_check_trigger.cpp similarity index 98% rename from bt/conditions/bt_check_trigger.cpp rename to bt/tasks/conditions/bt_check_trigger.cpp index db7199d..ef477de 100644 --- a/bt/conditions/bt_check_trigger.cpp +++ b/bt/tasks/conditions/bt_check_trigger.cpp @@ -11,7 +11,6 @@ #include "bt_check_trigger.h" -#include "bt_condition.h" #include "modules/limboai/util/limbo_utility.h" #include "core/variant/variant.h" diff --git a/bt/conditions/bt_check_trigger.h b/bt/tasks/conditions/bt_check_trigger.h similarity index 88% rename from bt/conditions/bt_check_trigger.h rename to bt/tasks/conditions/bt_check_trigger.h index 3064644..f7d899d 100644 --- a/bt/conditions/bt_check_trigger.h +++ b/bt/tasks/conditions/bt_check_trigger.h @@ -14,13 +14,10 @@ #ifndef BT_CHECK_TRIGGER_H #define BT_CHECK_TRIGGER_H -#include "bt_condition.h" +#include "../bt_condition.h" -#include "core/object/object.h" #include "core/string/ustring.h" -#include "core/object/class_db.h" - class BTCheckTrigger : public BTCondition { GDCLASS(BTCheckTrigger, BTCondition); diff --git a/bt/conditions/bt_check_var.cpp b/bt/tasks/conditions/bt_check_var.cpp similarity index 100% rename from bt/conditions/bt_check_var.cpp rename to bt/tasks/conditions/bt_check_var.cpp diff --git a/bt/conditions/bt_check_var.h b/bt/tasks/conditions/bt_check_var.h similarity index 96% rename from bt/conditions/bt_check_var.h rename to bt/tasks/conditions/bt_check_var.h index 0a2c0fb..2ff9815 100644 --- a/bt/conditions/bt_check_var.h +++ b/bt/tasks/conditions/bt_check_var.h @@ -12,7 +12,7 @@ #ifndef BT_CHECK_VAR_H #define BT_CHECK_VAR_H -#include "bt_condition.h" +#include "../bt_condition.h" #include "modules/limboai/blackboard/bb_param/bb_variant.h" #include "modules/limboai/util/limbo_utility.h" diff --git a/bt/decorators/bt_always_fail.cpp b/bt/tasks/decorators/bt_always_fail.cpp similarity index 100% rename from bt/decorators/bt_always_fail.cpp rename to bt/tasks/decorators/bt_always_fail.cpp diff --git a/bt/decorators/bt_always_fail.h b/bt/tasks/decorators/bt_always_fail.h similarity index 87% rename from bt/decorators/bt_always_fail.h rename to bt/tasks/decorators/bt_always_fail.h index 1b8a31c..d5e322f 100644 --- a/bt/decorators/bt_always_fail.h +++ b/bt/tasks/decorators/bt_always_fail.h @@ -12,9 +12,7 @@ #ifndef BT_ALWAYS_FAIL_H #define BT_ALWAYS_FAIL_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTAlwaysFail : public BTDecorator { GDCLASS(BTAlwaysFail, BTDecorator); diff --git a/bt/decorators/bt_always_succeed.cpp b/bt/tasks/decorators/bt_always_succeed.cpp similarity index 100% rename from bt/decorators/bt_always_succeed.cpp rename to bt/tasks/decorators/bt_always_succeed.cpp diff --git a/bt/decorators/bt_always_succeed.h b/bt/tasks/decorators/bt_always_succeed.h similarity index 87% rename from bt/decorators/bt_always_succeed.h rename to bt/tasks/decorators/bt_always_succeed.h index f61a163..411c595 100644 --- a/bt/decorators/bt_always_succeed.h +++ b/bt/tasks/decorators/bt_always_succeed.h @@ -12,9 +12,7 @@ #ifndef BT_ALWAYS_SUCCEED_H #define BT_ALWAYS_SUCCEED_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTAlwaysSucceed : public BTDecorator { GDCLASS(BTAlwaysSucceed, BTDecorator); diff --git a/bt/decorators/bt_cooldown.cpp b/bt/tasks/decorators/bt_cooldown.cpp similarity index 100% rename from bt/decorators/bt_cooldown.cpp rename to bt/tasks/decorators/bt_cooldown.cpp diff --git a/bt/decorators/bt_cooldown.h b/bt/tasks/decorators/bt_cooldown.h similarity index 94% rename from bt/decorators/bt_cooldown.h rename to bt/tasks/decorators/bt_cooldown.h index 6695bdc..a2b0759 100644 --- a/bt/decorators/bt_cooldown.h +++ b/bt/tasks/decorators/bt_cooldown.h @@ -12,9 +12,8 @@ #ifndef BT_COOLDOWN_H #define BT_COOLDOWN_H -#include "bt_decorator.h" +#include "../bt_decorator.h" -#include "core/object/object.h" #include "scene/main/scene_tree.h" class BTCooldown : public BTDecorator { diff --git a/bt/decorators/bt_delay.cpp b/bt/tasks/decorators/bt_delay.cpp similarity index 100% rename from bt/decorators/bt_delay.cpp rename to bt/tasks/decorators/bt_delay.cpp diff --git a/bt/decorators/bt_delay.h b/bt/tasks/decorators/bt_delay.h similarity index 90% rename from bt/decorators/bt_delay.h rename to bt/tasks/decorators/bt_delay.h index 227a7fd..8093658 100644 --- a/bt/decorators/bt_delay.h +++ b/bt/tasks/decorators/bt_delay.h @@ -12,9 +12,7 @@ #ifndef BT_DELAY_H #define BT_DELAY_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTDelay : public BTDecorator { GDCLASS(BTDelay, BTDecorator); diff --git a/bt/decorators/bt_for_each.cpp b/bt/tasks/decorators/bt_for_each.cpp similarity index 100% rename from bt/decorators/bt_for_each.cpp rename to bt/tasks/decorators/bt_for_each.cpp diff --git a/bt/decorators/bt_for_each.h b/bt/tasks/decorators/bt_for_each.h similarity index 91% rename from bt/decorators/bt_for_each.h rename to bt/tasks/decorators/bt_for_each.h index a22cc01..41479b6 100644 --- a/bt/decorators/bt_for_each.h +++ b/bt/tasks/decorators/bt_for_each.h @@ -12,9 +12,7 @@ #ifndef BT_FOR_EACH_H #define BT_FOR_EACH_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTForEach : public BTDecorator { GDCLASS(BTForEach, BTDecorator); diff --git a/bt/decorators/bt_invert.cpp b/bt/tasks/decorators/bt_invert.cpp similarity index 100% rename from bt/decorators/bt_invert.cpp rename to bt/tasks/decorators/bt_invert.cpp diff --git a/bt/decorators/bt_invert.h b/bt/tasks/decorators/bt_invert.h similarity index 87% rename from bt/decorators/bt_invert.h rename to bt/tasks/decorators/bt_invert.h index d5e48f7..b224cd0 100644 --- a/bt/decorators/bt_invert.h +++ b/bt/tasks/decorators/bt_invert.h @@ -12,9 +12,7 @@ #ifndef BT_INVERT_H #define BT_INVERT_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTInvert : public BTDecorator { GDCLASS(BTInvert, BTDecorator); diff --git a/bt/decorators/bt_new_scope.cpp b/bt/tasks/decorators/bt_new_scope.cpp similarity index 100% rename from bt/decorators/bt_new_scope.cpp rename to bt/tasks/decorators/bt_new_scope.cpp diff --git a/bt/decorators/bt_new_scope.h b/bt/tasks/decorators/bt_new_scope.h similarity index 91% rename from bt/decorators/bt_new_scope.h rename to bt/tasks/decorators/bt_new_scope.h index b071034..99ac94c 100644 --- a/bt/decorators/bt_new_scope.h +++ b/bt/tasks/decorators/bt_new_scope.h @@ -12,9 +12,7 @@ #ifndef BT_NEW_SCOPE_H #define BT_NEW_SCOPE_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTNewScope : public BTDecorator { GDCLASS(BTNewScope, BTDecorator); diff --git a/bt/decorators/bt_probability.cpp b/bt/tasks/decorators/bt_probability.cpp similarity index 100% rename from bt/decorators/bt_probability.cpp rename to bt/tasks/decorators/bt_probability.cpp diff --git a/bt/decorators/bt_probability.h b/bt/tasks/decorators/bt_probability.h similarity index 93% rename from bt/decorators/bt_probability.h rename to bt/tasks/decorators/bt_probability.h index 9727ef0..10e0309 100644 --- a/bt/decorators/bt_probability.h +++ b/bt/tasks/decorators/bt_probability.h @@ -12,7 +12,7 @@ #ifndef BT_PROBABILITY_H #define BT_PROBABILITY_H -#include "bt_decorator.h" +#include "../bt_decorator.h" class BTProbability : public BTDecorator { GDCLASS(BTProbability, BTDecorator); diff --git a/bt/decorators/bt_repeat.cpp b/bt/tasks/decorators/bt_repeat.cpp similarity index 100% rename from bt/decorators/bt_repeat.cpp rename to bt/tasks/decorators/bt_repeat.cpp diff --git a/bt/decorators/bt_repeat.h b/bt/tasks/decorators/bt_repeat.h similarity index 93% rename from bt/decorators/bt_repeat.h rename to bt/tasks/decorators/bt_repeat.h index f0ea99c..448701d 100644 --- a/bt/decorators/bt_repeat.h +++ b/bt/tasks/decorators/bt_repeat.h @@ -12,9 +12,7 @@ #ifndef BT_REPEAT_H #define BT_REPEAT_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTRepeat : public BTDecorator { GDCLASS(BTRepeat, BTDecorator); diff --git a/bt/decorators/bt_repeat_until_failure.cpp b/bt/tasks/decorators/bt_repeat_until_failure.cpp similarity index 100% rename from bt/decorators/bt_repeat_until_failure.cpp rename to bt/tasks/decorators/bt_repeat_until_failure.cpp diff --git a/bt/decorators/bt_repeat_until_failure.h b/bt/tasks/decorators/bt_repeat_until_failure.h similarity index 86% rename from bt/decorators/bt_repeat_until_failure.h rename to bt/tasks/decorators/bt_repeat_until_failure.h index d189f03..5d7d4f4 100644 --- a/bt/decorators/bt_repeat_until_failure.h +++ b/bt/tasks/decorators/bt_repeat_until_failure.h @@ -12,9 +12,7 @@ #ifndef BT_REPEAT_UNTIL_FAILURE_H #define BT_REPEAT_UNTIL_FAILURE_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTRepeatUntilFailure : public BTDecorator { GDCLASS(BTRepeatUntilFailure, BTDecorator); diff --git a/bt/decorators/bt_repeat_until_success.cpp b/bt/tasks/decorators/bt_repeat_until_success.cpp similarity index 100% rename from bt/decorators/bt_repeat_until_success.cpp rename to bt/tasks/decorators/bt_repeat_until_success.cpp diff --git a/bt/decorators/bt_repeat_until_success.h b/bt/tasks/decorators/bt_repeat_until_success.h similarity index 86% rename from bt/decorators/bt_repeat_until_success.h rename to bt/tasks/decorators/bt_repeat_until_success.h index 8d796da..db65e85 100644 --- a/bt/decorators/bt_repeat_until_success.h +++ b/bt/tasks/decorators/bt_repeat_until_success.h @@ -12,9 +12,7 @@ #ifndef BT_REPEAT_UNTIL_SUCCESS_H #define BT_REPEAT_UNTIL_SUCCESS_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTRepeatUntilSuccess : public BTDecorator { GDCLASS(BTRepeatUntilSuccess, BTDecorator); diff --git a/bt/decorators/bt_run_limit.cpp b/bt/tasks/decorators/bt_run_limit.cpp similarity index 100% rename from bt/decorators/bt_run_limit.cpp rename to bt/tasks/decorators/bt_run_limit.cpp diff --git a/bt/decorators/bt_run_limit.h b/bt/tasks/decorators/bt_run_limit.h similarity index 93% rename from bt/decorators/bt_run_limit.h rename to bt/tasks/decorators/bt_run_limit.h index f747252..ec694c1 100644 --- a/bt/decorators/bt_run_limit.h +++ b/bt/tasks/decorators/bt_run_limit.h @@ -12,7 +12,7 @@ #ifndef BT_RUN_LIMIT_H #define BT_RUN_LIMIT_H -#include "bt_decorator.h" +#include "../bt_decorator.h" class BTRunLimit : public BTDecorator { GDCLASS(BTRunLimit, BTDecorator); diff --git a/bt/decorators/bt_subtree.cpp b/bt/tasks/decorators/bt_subtree.cpp similarity index 89% rename from bt/decorators/bt_subtree.cpp rename to bt/tasks/decorators/bt_subtree.cpp index a6ce46b..3d86a5e 100644 --- a/bt/decorators/bt_subtree.cpp +++ b/bt/tasks/decorators/bt_subtree.cpp @@ -11,12 +11,8 @@ #include "bt_subtree.h" +#include "bt_new_scope.h" #include "modules/limboai/blackboard/blackboard.h" -#include "modules/limboai/bt/actions/bt_action.h" -#include "modules/limboai/bt/actions/bt_fail.h" -#include "modules/limboai/bt/bt_task.h" -#include "modules/limboai/bt/decorators/bt_decorator.h" -#include "modules/limboai/bt/decorators/bt_new_scope.h" #include "core/config/engine.h" #include "core/error/error_macros.h" diff --git a/bt/decorators/bt_subtree.h b/bt/tasks/decorators/bt_subtree.h similarity index 100% rename from bt/decorators/bt_subtree.h rename to bt/tasks/decorators/bt_subtree.h diff --git a/bt/decorators/bt_time_limit.cpp b/bt/tasks/decorators/bt_time_limit.cpp similarity index 100% rename from bt/decorators/bt_time_limit.cpp rename to bt/tasks/decorators/bt_time_limit.cpp diff --git a/bt/decorators/bt_time_limit.h b/bt/tasks/decorators/bt_time_limit.h similarity index 90% rename from bt/decorators/bt_time_limit.h rename to bt/tasks/decorators/bt_time_limit.h index 730ffd5..d0207ed 100644 --- a/bt/decorators/bt_time_limit.h +++ b/bt/tasks/decorators/bt_time_limit.h @@ -12,9 +12,7 @@ #ifndef BT_TIME_LIMIT_H #define BT_TIME_LIMIT_H -#include "bt_decorator.h" - -#include "core/object/object.h" +#include "../bt_decorator.h" class BTTimeLimit : public BTDecorator { GDCLASS(BTTimeLimit, BTDecorator); diff --git a/editor/debugger/behavior_tree_data.h b/editor/debugger/behavior_tree_data.h index 980cba5..e0ccb99 100644 --- a/editor/debugger/behavior_tree_data.h +++ b/editor/debugger/behavior_tree_data.h @@ -12,9 +12,7 @@ #ifndef BEHAVIOR_TREE_DATA_H #define BEHAVIOR_TREE_DATA_H -#include "modules/limboai/bt/bt_task.h" - -#include "core/object/object.h" +#include "modules/limboai/bt/tasks/bt_task.h" class BehaviorTreeData { public: diff --git a/editor/debugger/behavior_tree_view.cpp b/editor/debugger/behavior_tree_view.cpp index 7a57aa8..df5beec 100644 --- a/editor/debugger/behavior_tree_view.cpp +++ b/editor/debugger/behavior_tree_view.cpp @@ -12,8 +12,9 @@ #ifdef TOOLS_ENABLED #include "behavior_tree_view.h" + #include "behavior_tree_data.h" -#include "modules/limboai/bt/bt_task.h" +#include "modules/limboai/bt/tasks/bt_task.h" #include "modules/limboai/util/limbo_utility.h" #include "core/math/color.h" diff --git a/editor/debugger/limbo_debugger.cpp b/editor/debugger/limbo_debugger.cpp index 2a0c303..6a9fb6d 100644 --- a/editor/debugger/limbo_debugger.cpp +++ b/editor/debugger/limbo_debugger.cpp @@ -12,7 +12,7 @@ #include "limbo_debugger.h" #include "behavior_tree_data.h" -#include "modules/limboai/bt/bt_task.h" +#include "modules/limboai/bt/tasks/bt_task.h" #include "core/debugger/engine_debugger.h" #include "core/error/error_macros.h" diff --git a/editor/debugger/limbo_debugger.h b/editor/debugger/limbo_debugger.h index e0d910a..b6295cc 100644 --- a/editor/debugger/limbo_debugger.h +++ b/editor/debugger/limbo_debugger.h @@ -12,7 +12,7 @@ #ifndef LIMBO_DEBUGGER_H #define LIMBO_DEBUGGER_H -#include "modules/limboai/bt/bt_task.h" +#include "modules/limboai/bt/tasks/bt_task.h" #include "core/object/class_db.h" #include "core/object/object.h" diff --git a/editor/limbo_ai_editor_plugin.cpp b/editor/limbo_ai_editor_plugin.cpp index 5b78261..ccfb5fa 100644 --- a/editor/limbo_ai_editor_plugin.cpp +++ b/editor/limbo_ai_editor_plugin.cpp @@ -13,12 +13,12 @@ #include "limbo_ai_editor_plugin.h" -#include "modules/limboai/bt/actions/bt_action.h" #include "modules/limboai/bt/behavior_tree.h" -#include "modules/limboai/bt/bt_task.h" -#include "modules/limboai/bt/composites/bt_parallel.h" -#include "modules/limboai/bt/composites/bt_selector.h" -#include "modules/limboai/bt/composites/bt_sequence.h" +#include "modules/limboai/bt/tasks/bt_action.h" +#include "modules/limboai/bt/tasks/bt_task.h" +#include "modules/limboai/bt/tasks/composites/bt_parallel.h" +#include "modules/limboai/bt/tasks/composites/bt_selector.h" +#include "modules/limboai/bt/tasks/composites/bt_sequence.h" #include "modules/limboai/editor/debugger/limbo_debugger_plugin.h" #include "modules/limboai/util/limbo_utility.h" diff --git a/editor/limbo_ai_editor_plugin.h b/editor/limbo_ai_editor_plugin.h index 1815476..949067b 100644 --- a/editor/limbo_ai_editor_plugin.h +++ b/editor/limbo_ai_editor_plugin.h @@ -14,7 +14,7 @@ #define LIMBO_AI_EDITOR_PLUGIN_H #include "modules/limboai/bt/behavior_tree.h" -#include "modules/limboai/bt/bt_task.h" +#include "modules/limboai/bt/tasks/bt_task.h" #include "core/object/class_db.h" #include "core/object/object.h" diff --git a/register_types.cpp b/register_types.cpp index 2e99327..84743a2 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -44,50 +44,50 @@ #include "blackboard/bb_param/bb_vector4.h" #include "blackboard/bb_param/bb_vector4i.h" #include "blackboard/blackboard.h" -#include "bt/actions/bt_action.h" -#include "bt/actions/bt_await_animation.h" -#include "bt/actions/bt_call_method.h" -#include "bt/actions/bt_console_print.h" -#include "bt/actions/bt_fail.h" -#include "bt/actions/bt_pause_animation.h" -#include "bt/actions/bt_play_animation.h" -#include "bt/actions/bt_random_wait.h" -#include "bt/actions/bt_set_agent_property.h" -#include "bt/actions/bt_set_var.h" -#include "bt/actions/bt_stop_animation.h" -#include "bt/actions/bt_wait.h" -#include "bt/actions/bt_wait_ticks.h" #include "bt/behavior_tree.h" #include "bt/bt_player.h" #include "bt/bt_state.h" -#include "bt/bt_task.h" -#include "bt/composites/bt_composite.h" -#include "bt/composites/bt_dynamic_selector.h" -#include "bt/composites/bt_dynamic_sequence.h" -#include "bt/composites/bt_parallel.h" -#include "bt/composites/bt_random_selector.h" -#include "bt/composites/bt_random_sequence.h" -#include "bt/composites/bt_selector.h" -#include "bt/composites/bt_sequence.h" -#include "bt/conditions/bt_check_agent_property.h" -#include "bt/conditions/bt_check_trigger.h" -#include "bt/conditions/bt_check_var.h" -#include "bt/conditions/bt_condition.h" -#include "bt/decorators/bt_always_fail.h" -#include "bt/decorators/bt_always_succeed.h" -#include "bt/decorators/bt_cooldown.h" -#include "bt/decorators/bt_decorator.h" -#include "bt/decorators/bt_delay.h" -#include "bt/decorators/bt_for_each.h" -#include "bt/decorators/bt_invert.h" -#include "bt/decorators/bt_new_scope.h" -#include "bt/decorators/bt_probability.h" -#include "bt/decorators/bt_repeat.h" -#include "bt/decorators/bt_repeat_until_failure.h" -#include "bt/decorators/bt_repeat_until_success.h" -#include "bt/decorators/bt_run_limit.h" -#include "bt/decorators/bt_subtree.h" -#include "bt/decorators/bt_time_limit.h" +#include "bt/tasks/actions/bt_await_animation.h" +#include "bt/tasks/actions/bt_call_method.h" +#include "bt/tasks/actions/bt_console_print.h" +#include "bt/tasks/actions/bt_fail.h" +#include "bt/tasks/actions/bt_pause_animation.h" +#include "bt/tasks/actions/bt_play_animation.h" +#include "bt/tasks/actions/bt_random_wait.h" +#include "bt/tasks/actions/bt_set_agent_property.h" +#include "bt/tasks/actions/bt_set_var.h" +#include "bt/tasks/actions/bt_stop_animation.h" +#include "bt/tasks/actions/bt_wait.h" +#include "bt/tasks/actions/bt_wait_ticks.h" +#include "bt/tasks/bt_action.h" +#include "bt/tasks/bt_composite.h" +#include "bt/tasks/bt_condition.h" +#include "bt/tasks/bt_decorator.h" +#include "bt/tasks/bt_task.h" +#include "bt/tasks/composites/bt_dynamic_selector.h" +#include "bt/tasks/composites/bt_dynamic_sequence.h" +#include "bt/tasks/composites/bt_parallel.h" +#include "bt/tasks/composites/bt_random_selector.h" +#include "bt/tasks/composites/bt_random_sequence.h" +#include "bt/tasks/composites/bt_selector.h" +#include "bt/tasks/composites/bt_sequence.h" +#include "bt/tasks/conditions/bt_check_agent_property.h" +#include "bt/tasks/conditions/bt_check_trigger.h" +#include "bt/tasks/conditions/bt_check_var.h" +#include "bt/tasks/decorators/bt_always_fail.h" +#include "bt/tasks/decorators/bt_always_succeed.h" +#include "bt/tasks/decorators/bt_cooldown.h" +#include "bt/tasks/decorators/bt_delay.h" +#include "bt/tasks/decorators/bt_for_each.h" +#include "bt/tasks/decorators/bt_invert.h" +#include "bt/tasks/decorators/bt_new_scope.h" +#include "bt/tasks/decorators/bt_probability.h" +#include "bt/tasks/decorators/bt_repeat.h" +#include "bt/tasks/decorators/bt_repeat_until_failure.h" +#include "bt/tasks/decorators/bt_repeat_until_success.h" +#include "bt/tasks/decorators/bt_run_limit.h" +#include "bt/tasks/decorators/bt_subtree.h" +#include "bt/tasks/decorators/bt_time_limit.h" #include "editor/debugger/limbo_debugger.h" #include "hsm/limbo_hsm.h" #include "hsm/limbo_state.h" diff --git a/util/limbo_utility.cpp b/util/limbo_utility.cpp index 2594b77..6b0c8fa 100644 --- a/util/limbo_utility.cpp +++ b/util/limbo_utility.cpp @@ -11,7 +11,7 @@ #include "limbo_utility.h" -#include "modules/limboai/bt/bt_task.h" +#include "modules/limboai/bt/tasks/bt_task.h" #include "core/variant/variant.h" #include "scene/resources/texture.h" diff --git a/util/limbo_utility.h b/util/limbo_utility.h index 7d410d6..a102a0c 100644 --- a/util/limbo_utility.h +++ b/util/limbo_utility.h @@ -12,8 +12,9 @@ #ifndef LIMBO_UTILITY_H #define LIMBO_UTILITY_H -#include "core/object/class_db.h" #include "core/object/object.h" + +#include "core/object/class_db.h" #include "core/variant/variant.h" #include "scene/resources/texture.h"