Reorganize files and sort includes

This commit is contained in:
Serhii Snitsaruk 2023-07-20 18:35:36 +02:00
parent db9233f499
commit 5dc002098f
107 changed files with 186 additions and 119 deletions

7
SCsub
View File

@ -6,12 +6,15 @@ Import("env_modules")
module_env = env.Clone()
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, "bb_param/*.cpp")
module_env.add_source_files(env.modules_sources, "debugger/*.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")
module_env.add_source_files(env.modules_sources, "hsm/*.cpp")
module_env.add_source_files(env.modules_sources, "util/*.cpp")

View File

@ -1,12 +1,14 @@
/* bb_param.cpp */
#include "bb_param.h"
#include "modules/limboai/util/limbo_utility.h"
#include "core/core_bind.h"
#include "core/error/error_macros.h"
#include "core/object/class_db.h"
#include "core/object/object.h"
#include "core/variant/variant.h"
#include "modules/limboai/limbo_utility.h"
VARIANT_ENUM_CAST(BBParam::ValueSource);

View File

@ -3,12 +3,13 @@
#ifndef BB_PARAM_H
#define BB_PARAM_H
#include "modules/limboai/blackboard/blackboard.h"
#include "modules/limboai/util/limbo_utility.h"
#include "core/io/resource.h"
#include "core/object/object.h"
#include "core/typedefs.h"
#include "core/variant/variant.h"
#include "modules/limboai/blackboard.h"
#include "modules/limboai/limbo_utility.h"
class BBParam : public Resource {
GDCLASS(BBParam, Resource);

View File

@ -1,6 +1,7 @@
/* blackboard.cpp */
#include "blackboard.h"
#include "core/error/error_macros.h"
#include "core/variant/variant.h"
#include "scene/main/node.h"

View File

@ -4,6 +4,7 @@
#define BT_ACTION_H
#include "../bt_task.h"
#include "core/object/object.h"
class BTAction : public BTTask {

View File

@ -1,9 +1,11 @@
/* bt_console_print.cpp */
#include "bt_console_print.h"
#include "modules/limboai/bt/actions/bt_action.h"
#include "core/object/object.h"
#include "core/string/print_string.h"
#include "modules/limboai/bt/actions/bt_action.h"
String BTConsolePrint::_generate_name() const {
String tx = text;

View File

@ -4,6 +4,7 @@
#define BT_CONSOLE_PRINT_H
#include "bt_action.h"
#include "core/object/object.h"
#include "core/variant/variant.h"

View File

@ -4,6 +4,7 @@
#define BT_FAIL_H
#include "bt_action.h"
#include "core/object/object.h"
class BTFail : public BTAction {

View File

@ -1,6 +1,7 @@
/* bt_random_wait.cpp */
#include "bt_random_wait.h"
#include "core/math/math_funcs.h"
String BTRandomWait::_generate_name() const {

View File

@ -4,6 +4,7 @@
#define BT_RANDOM_WAIT_H
#include "bt_action.h"
#include "core/object/object.h"
class BTRandomWait : public BTAction {

View File

@ -1,6 +1,7 @@
/* bt_wait.cpp */
#include "bt_wait.h"
#include "core/math/math_funcs.h"
#include "core/object/class_db.h"
#include "core/object/object.h"

View File

@ -4,6 +4,7 @@
#define BT_WAIT_H
#include "bt_action.h"
#include "core/object/object.h"
class BTWait : public BTAction {

View File

@ -1,6 +1,7 @@
/* bt_wait_ticks.cpp */
#include "bt_wait_ticks.h"
#include "core/object/class_db.h"
#include "core/object/object.h"
#include "core/variant/variant.h"

View File

@ -4,6 +4,7 @@
#define BT_WAIT_TICKS_H
#include "bt_action.h"
#include "core/object/object.h"
class BTWaitTicks : public BTAction {

View File

@ -1,28 +1,13 @@
/* behavior_tree.cpp */
#include "behavior_tree.h"
#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"
// void BehaviorTree::init() {
// List<BTTask *> stack;
// BTTask *task = root_task.ptr();
// while (task != nullptr) {
// for (int i = 0; i < task->get_child_count(); i++) {
// task->get_child(i)->parent = task;
// stack.push_back(task->get_child(i).ptr());
// }
// task = nullptr;
// if (!stack.is_empty()) {
// task = stack.front()->get();
// stack.pop_front();
// }
// }
// }
Ref<BehaviorTree> BehaviorTree::clone() const {
Ref<BehaviorTree> copy = duplicate(false);
copy->set_path("");

View File

@ -4,9 +4,11 @@
#define BEHAVIOR_TREE_H
#include "bt_task.h"
#include "modules/limboai/blackboard/blackboard.h"
#include "core/io/resource.h"
#include "core/object/object.h"
#include "modules/limboai/blackboard.h"
class BehaviorTree : public Resource {
GDCLASS(BehaviorTree, Resource);

View File

@ -2,8 +2,11 @@
#include "bt_player.h"
#include "../limbo_string_names.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"
#include "core/config/engine.h"
#include "core/error/error_macros.h"
#include "core/io/resource_loader.h"
@ -13,8 +16,6 @@
#include "core/string/string_name.h"
#include "core/variant/variant.h"
#include "main/performance.h"
#include "modules/limboai/blackboard.h"
#include "modules/limboai/debugger/limbo_debugger.h"
VARIANT_ENUM_CAST(BTPlayer::UpdateMode);

View File

@ -5,8 +5,9 @@
#include "behavior_tree.h"
#include "bt_task.h"
#include "modules/limboai/blackboard/blackboard.h"
#include "core/object/object.h"
#include "modules/limboai/blackboard.h"
#include "scene/main/node.h"
class BTPlayer : public Node {

View File

@ -1,13 +1,15 @@
/* bt_state.cpp */
#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"
#include "core/error/error_macros.h"
#include "core/object/class_db.h"
#include "core/variant/variant.h"
#include "modules/limboai/bt/bt_task.h"
#include "modules/limboai/debugger/limbo_debugger.h"
#include "modules/limboai/limbo_state.h"
#include "modules/limboai/limbo_string_names.h"
void BTState::_setup() {
ERR_FAIL_COND_MSG(behavior_tree.is_null(), "BTState: BehaviorTree is not assigned.");

View File

@ -3,10 +3,11 @@
#ifndef BT_STATE_H
#define BT_STATE_H
#include "core/object/object.h"
#include "modules/limboai/bt/behavior_tree.h"
#include "modules/limboai/bt/bt_task.h"
#include "modules/limboai/limbo_state.h"
#include "modules/limboai/hsm/limbo_state.h"
#include "core/object/object.h"
class BTState : public LimboState {
GDCLASS(BTState, LimboState);

View File

@ -2,6 +2,10 @@
#include "bt_task.h"
#include "modules/limboai/blackboard/blackboard.h"
#include "modules/limboai/util/limbo_string_names.h"
#include "modules/limboai/util/limbo_utility.h"
#include "core/error/error_macros.h"
#include "core/io/resource.h"
#include "core/object/class_db.h"
@ -11,9 +15,6 @@
#include "core/string/ustring.h"
#include "core/templates/hash_map.h"
#include "core/variant/variant.h"
#include "modules/limboai/blackboard.h"
#include "modules/limboai/limbo_string_names.h"
#include "modules/limboai/limbo_utility.h"
String BTTask::_generate_name() const {
if (get_script_instance()) {

View File

@ -3,6 +3,8 @@
#ifndef BTTASK_H
#define BTTASK_H
#include "modules/limboai/blackboard/blackboard.h"
#include "core/io/resource.h"
#include "core/object/object.h"
#include "core/object/ref_counted.h"
@ -10,7 +12,6 @@
#include "core/templates/vector.h"
#include "core/variant/array.h"
#include "core/variant/dictionary.h"
#include "modules/limboai/blackboard.h"
#include "scene/resources/texture.h"
class BTTask : public Resource {

View File

@ -4,6 +4,7 @@
#define BT_COMPOSITE_H
#include "../bt_task.h"
#include "core/object/object.h"
class BTComposite : public BTTask {

View File

@ -4,6 +4,7 @@
#define BT_DYNAMIC_SELECTOR_H
#include "bt_composite.h"
#include "core/object/object.h"
class BTDynamicSelector : public BTComposite {

View File

@ -4,6 +4,7 @@
#define BT_DYNAMIC_SEQUENCE_H
#include "bt_composite.h"
#include "core/object/object.h"
class BTDynamicSequence : public BTComposite {

View File

@ -1,6 +1,7 @@
/* bt_parallel.cpp */
#include "bt_parallel.h"
#include "core/object/class_db.h"
void BTParallel::_enter() {

View File

@ -4,6 +4,7 @@
#define BT_PARALLEL_H
#include "bt_composite.h"
#include "core/object/object.h"
class BTParallel : public BTComposite {

View File

@ -4,6 +4,7 @@
#define BT_RANDOM_SELECTOR_H
#include "bt_composite.h"
#include "core/templates/vector.h"
class BTRandomSelector : public BTComposite {

View File

@ -4,6 +4,7 @@
#define BT_RANDOM_SEQUENCE_H
#include "bt_composite.h"
#include "core/templates/vector.h"
class BTRandomSequence : public BTComposite {

View File

@ -4,6 +4,7 @@
#define BT_SEQUENCE_H
#include "bt_composite.h"
#include "core/object/object.h"
class BTSequence : public BTComposite {

View File

@ -4,6 +4,7 @@
#define BT_CONDITION_H
#include "../bt_task.h"
#include "core/object/object.h"
class BTCondition : public BTTask {

View File

@ -4,6 +4,7 @@
#define BT_ALWAYS_FAIL_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTAlwaysFail : public BTDecorator {

View File

@ -4,6 +4,7 @@
#define BT_ALWAYS_SUCCEED_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTAlwaysSucceed : public BTDecorator {

View File

@ -1,6 +1,7 @@
/* bt_cooldown.cpp */
#include "bt_cooldown.h"
#include "core/math/math_funcs.h"
#include "core/object/class_db.h"
#include "core/variant/array.h"

View File

@ -4,6 +4,7 @@
#define BT_COOLDOWN_H
#include "bt_decorator.h"
#include "core/object/object.h"
#include "scene/main/scene_tree.h"

View File

@ -4,6 +4,7 @@
#define BT_DECORATOR_H
#include "../bt_task.h"
#include "core/object/object.h"
class BTDecorator : public BTTask {

View File

@ -1,6 +1,7 @@
/* bt_delay.cpp */
#include "bt_delay.h"
#include "core/error/error_macros.h"
#include "core/math/math_funcs.h"
#include "core/object/class_db.h"

View File

@ -4,6 +4,7 @@
#define BT_DELAY_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTDelay : public BTDecorator {

View File

@ -1,11 +1,13 @@
/* bt_for_each.cpp */
#include "bt_for_each.h"
#include "modules/limboai/blackboard/blackboard.h"
#include "modules/limboai/util/limbo_utility.h"
#include "core/error/error_list.h"
#include "core/error/error_macros.h"
#include "core/variant/variant.h"
#include "modules/limboai/blackboard.h"
#include "modules/limboai/limbo_utility.h"
String BTForEach::_generate_name() const {
return vformat("ForEach %s in %s",

View File

@ -4,6 +4,7 @@
#define BT_FOR_EACH_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTForEach : public BTDecorator {

View File

@ -4,6 +4,7 @@
#define BT_INVERT_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTInvert : public BTDecorator {

View File

@ -1,10 +1,12 @@
/* bt_new_scope.cpp */
#include "bt_new_scope.h"
#include "modules/limboai/blackboard/blackboard.h"
#include "core/error/error_macros.h"
#include "core/os/memory.h"
#include "core/string/ustring.h"
#include "modules/limboai/blackboard.h"
void BTNewScope::initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard) {
ERR_FAIL_COND(p_agent == nullptr);

View File

@ -4,9 +4,9 @@
#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);

View File

@ -1,6 +1,7 @@
/* bt_probability.cpp */
#include "bt_probability.h"
#include "core/object/object.h"
String BTProbability::_generate_name() const {

View File

@ -4,6 +4,7 @@
#define BT_PROBABILITY_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTProbability : public BTDecorator {

View File

@ -1,6 +1,7 @@
/* bt_repeat.cpp */
#include "bt_repeat.h"
#include "core/object/object.h"
#include "core/variant/variant.h"

View File

@ -4,6 +4,7 @@
#define BT_REPEAT_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTRepeat : public BTDecorator {

View File

@ -4,6 +4,7 @@
#define BT_REPEAT_UNTIL_FAILURE_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTRepeatUntilFailure : public BTDecorator {

View File

@ -4,6 +4,7 @@
#define BT_REPEAT_UNTIL_SUCCESS_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTRepeatUntilSuccess : public BTDecorator {

View File

@ -4,6 +4,7 @@
#define BT_RUN_LIMIT_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTRunLimit : public BTDecorator {

View File

@ -1,18 +1,20 @@
/* bt_subtree.cpp */
#include "bt_subtree.h"
#include "core/config/engine.h"
#include "core/error/error_macros.h"
#include "core/object/object.h"
#include "core/typedefs.h"
#include "core/variant/variant.h"
#include "modules/limboai/blackboard.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"
#include "core/object/object.h"
#include "core/typedefs.h"
#include "core/variant/variant.h"
String BTSubtree::_generate_name() const {
String s;
if (subtree.is_null()) {

View File

@ -4,9 +4,10 @@
#define BT_SUBTREE_H
#include "bt_new_scope.h"
#include "core/object/object.h"
#include "modules/limboai/bt/behavior_tree.h"
#include "core/object/object.h"
class BTSubtree : public BTNewScope {
GDCLASS(BTSubtree, BTNewScope);

View File

@ -1,6 +1,7 @@
/* bt_time_limit.cpp */
#include "bt_time_limit.h"
#include "core/math/math_funcs.h"
String BTTimeLimit::_generate_name() const {

View File

@ -4,6 +4,7 @@
#define BT_TIME_LIMIT_H
#include "bt_decorator.h"
#include "core/object/object.h"
class BTTimeLimit : public BTDecorator {

View File

@ -1,6 +1,7 @@
/* behavior_tree_data.cpp */
#include "behavior_tree_data.h"
#include "core/templates/list.h"
//// BehaviorTreeData

View File

@ -3,9 +3,10 @@
#ifndef BEHAVIOR_TREE_DATA_H
#define BEHAVIOR_TREE_DATA_H
#include "core/object/object.h"
#include "modules/limboai/bt/bt_task.h"
#include "core/object/object.h"
class BehaviorTreeData {
public:
struct TaskData {

View File

@ -4,13 +4,14 @@
#include "behavior_tree_view.h"
#include "behavior_tree_data.h"
#include "modules/limboai/bt/bt_task.h"
#include "modules/limboai/util/limbo_utility.h"
#include "core/math/color.h"
#include "core/math/math_defs.h"
#include "core/object/callable_method_pointer.h"
#include "core/typedefs.h"
#include "editor/editor_scale.h"
#include "modules/limboai/bt/bt_task.h"
#include "modules/limboai/limbo_utility.h"
#include "scene/resources/style_box.h"
void BehaviorTreeView::_draw_running_status(Object *p_obj, Rect2 p_rect) {

View File

@ -6,6 +6,7 @@
#define BEHAVIOR_TREE_VIEW_H
#include "behavior_tree_data.h"
#include "core/object/class_db.h"
#include "core/object/object.h"
#include "scene/gui/control.h"

View File

@ -1,11 +1,13 @@
/* limbo_debugger.cpp */
#include "limbo_debugger.h"
#include "behavior_tree_data.h"
#include "modules/limboai/bt/bt_task.h"
#include "core/debugger/engine_debugger.h"
#include "core/error/error_macros.h"
#include "core/string/node_path.h"
#include "modules/limboai/bt/bt_task.h"
#include "scene/main/scene_tree.h"
#include "scene/main/window.h"

View File

@ -3,10 +3,11 @@
#ifndef LIMBO_DEBUGGER_H
#define LIMBO_DEBUGGER_H
#include "modules/limboai/bt/bt_task.h"
#include "core/object/class_db.h"
#include "core/object/object.h"
#include "core/string/node_path.h"
#include "modules/limboai/bt/bt_task.h"
class LimboDebugger : public Object {
GDCLASS(LimboDebugger, Object);

View File

@ -3,6 +3,11 @@
#ifdef TOOLS_ENABLED
#include "limbo_debugger_plugin.h"
#include "limbo_debugger.h"
#include "modules/limboai/editor/debugger/behavior_tree_data.h"
#include "modules/limboai/editor/debugger/behavior_tree_view.h"
#include "core/debugger/engine_debugger.h"
#include "core/math/math_defs.h"
#include "core/object/callable_method_pointer.h"
@ -12,9 +17,6 @@
#include "core/variant/array.h"
#include "editor/editor_scale.h"
#include "editor/plugins/editor_debugger_plugin.h"
#include "limbo_debugger.h"
#include "modules/limboai/debugger/behavior_tree_data.h"
#include "modules/limboai/debugger/behavior_tree_view.h"
#include "scene/gui/box_container.h"
#include "scene/gui/control.h"
#include "scene/gui/item_list.h"

View File

@ -5,12 +5,13 @@
#ifndef LIMBO_DEBUGGER_PLUGIN_H
#define LIMBO_DEBUGGER_PLUGIN_H
#include "modules/limboai/editor/debugger/behavior_tree_data.h"
#include "modules/limboai/editor/debugger/behavior_tree_view.h"
#include "core/object/class_db.h"
#include "core/object/object.h"
#include "core/typedefs.h"
#include "editor/plugins/editor_debugger_plugin.h"
#include "modules/limboai/debugger/behavior_tree_data.h"
#include "modules/limboai/debugger/behavior_tree_view.h"
#include "scene/gui/box_container.h"
#include "scene/gui/item_list.h"
#include "scene/gui/panel_container.h"

View File

@ -4,6 +4,15 @@
#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/editor/debugger/limbo_debugger_plugin.h"
#include "modules/limboai/util/limbo_utility.h"
#include "core/config/project_settings.h"
#include "core/error/error_list.h"
#include "core/error/error_macros.h"
@ -41,14 +50,6 @@
#include "editor/editor_undo_redo_manager.h"
#include "editor/inspector_dock.h"
#include "editor/plugins/script_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/debugger/limbo_debugger_plugin.h"
#include "modules/limboai/limbo_utility.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
#include "scene/gui/control.h"

View File

@ -4,13 +4,14 @@
#ifndef LIMBO_AI_EDITOR_PLUGIN_H
#define LIMBO_AI_EDITOR_PLUGIN_H
#include "modules/limboai/bt/behavior_tree.h"
#include "modules/limboai/bt/bt_task.h"
#include "core/object/class_db.h"
#include "core/object/object.h"
#include "core/templates/hash_set.h"
#include "editor/editor_node.h"
#include "editor/editor_plugin.h"
#include "modules/limboai/bt/behavior_tree.h"
#include "modules/limboai/bt/bt_task.h"
#include "scene/gui/box_container.h"
#include "scene/gui/control.h"
#include "scene/gui/file_dialog.h"

View File

@ -2,6 +2,10 @@
#include "limbo_hsm.h"
#include "modules/limboai/blackboard/blackboard.h"
#include "modules/limboai/hsm/limbo_state.h"
#include "modules/limboai/util/limbo_string_names.h"
#include "core/config/engine.h"
#include "core/error/error_macros.h"
#include "core/object/class_db.h"
@ -9,9 +13,6 @@
#include "core/typedefs.h"
#include "core/variant/callable.h"
#include "core/variant/variant.h"
#include "modules/limboai/blackboard.h"
#include "modules/limboai/limbo_state.h"
#include "modules/limboai/limbo_string_names.h"
VARIANT_ENUM_CAST(LimboHSM::UpdateMode);

View File

@ -3,9 +3,10 @@
#ifndef LIMBO_HSM_H
#define LIMBO_HSM_H
#include "limbo_state.h"
#include "core/object/object.h"
#include "core/templates/hash_map.h"
#include "limbo_state.h"
class LimboHSM : public LimboState {
GDCLASS(LimboHSM, LimboState);

Some files were not shown because too many files have changed in this diff Show More