botaccount
/
limboai
mirror of https://github.com/limbonaut/limboai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganize task categories

This commit is contained in:
Serhii Snitsaruk 2023-08-28 13:22:23 +02:00
parent e73d4b0959
commit 25246a1c77
35 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SCsub
View File

@ -10,10 +10,12 @@ 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, "blackboard/bb_param/*.cpp")
module_env.add_source_files(env.modules_sources, "bt/*.cpp") module_env.add_source_files(env.modules_sources, "bt/*.cpp")
module_env.add_source_files(env.modules_sources, "bt/tasks/*.cpp") module_env.add_source_files(env.modules_sources, "bt/tasks/*.cpp")
module_env.add_source_files(env.modules_sources, "bt/tasks/blackboard/*.cpp")
module_env.add_source_files(env.modules_sources, "bt/tasks/composites/*.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/decorators/*.cpp")
module_env.add_source_files(env.modules_sources, "bt/tasks/conditions/*.cpp") module_env.add_source_files(env.modules_sources, "bt/tasks/misc/*.cpp")
module_env.add_source_files(env.modules_sources, "bt/tasks/scene/*.cpp")
module_env.add_source_files(env.modules_sources, "bt/tasks/utility/*.cpp")
if env.editor_build: if env.editor_build:
module_env.add_source_files(env.modules_sources, "editor/*.cpp") 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, "editor/debugger/*.cpp")

0
bt/tasks/conditions/bt_check_trigger.cpp → bt/tasks/blackboard/bt_check_trigger.cpp
View File

2
bt/tasks/conditions/bt_check_trigger.h → bt/tasks/blackboard/bt_check_trigger.h
View File

@ -18,7 +18,7 @@
class BTCheckTrigger : public BTCondition { class BTCheckTrigger : public BTCondition {
GDCLASS(BTCheckTrigger, BTCondition); GDCLASS(BTCheckTrigger, BTCondition);
TASK_CATEGORY(Conditions); TASK_CATEGORY(Blackboard);
private: private:
String variable; String variable;

0
bt/tasks/conditions/bt_check_var.cpp → bt/tasks/blackboard/bt_check_var.cpp
View File

2
bt/tasks/conditions/bt_check_var.h → bt/tasks/blackboard/bt_check_var.h
View File

@ -19,7 +19,7 @@
class BTCheckVar : public BTCondition { class BTCheckVar : public BTCondition {
GDCLASS(BTCheckVar, BTCondition); GDCLASS(BTCheckVar, BTCondition);
TASK_CATEGORY(Conditions); TASK_CATEGORY(Blackboard);
private: private:
String variable; String variable;

0
bt/tasks/actions/bt_set_var.cpp → bt/tasks/blackboard/bt_set_var.cpp
View File

2
bt/tasks/actions/bt_set_var.h → bt/tasks/blackboard/bt_set_var.h
View File

@ -20,7 +20,7 @@
class BTSetVar : public BTAction { class BTSetVar : public BTAction {
GDCLASS(BTSetVar, BTAction); GDCLASS(BTSetVar, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Blackboard);
private: private:
String variable; String variable;

3
bt/tasks/bt_comment.h
View File

@ -16,10 +16,9 @@
class BTComment : public BTTask { class BTComment : public BTTask {
GDCLASS(BTComment, BTTask); GDCLASS(BTComment, BTTask);
TASK_CATEGORY(Utility);
public: public:
static _FORCE_INLINE_ String get_task_category() { return LimboTaskDB::get_misc_category(); }
virtual Ref<BTTask> clone() const override; virtual Ref<BTTask> clone() const override;
virtual PackedStringArray get_configuration_warnings() const override; virtual PackedStringArray get_configuration_warnings() const override;
}; };

2
bt/tasks/decorators/bt_new_scope.h
View File

@ -16,7 +16,7 @@
class BTNewScope : public BTDecorator { class BTNewScope : public BTDecorator {
GDCLASS(BTNewScope, BTDecorator); GDCLASS(BTNewScope, BTDecorator);
TASK_CATEGORY(Actions); TASK_CATEGORY(Decorators);
private: private:
Dictionary blackboard_data; Dictionary blackboard_data;

2
bt/tasks/decorators/bt_subtree.h
View File

@ -18,7 +18,7 @@
class BTSubtree : public BTNewScope { class BTSubtree : public BTNewScope {
GDCLASS(BTSubtree, BTNewScope); GDCLASS(BTSubtree, BTNewScope);
TASK_CATEGORY(Actions); TASK_CATEGORY(Decorators);
private: private:
Ref<BehaviorTree> subtree; Ref<BehaviorTree> subtree;

0
bt/tasks/actions/bt_await_animation.cpp → bt/tasks/scene/bt_await_animation.cpp
View File

2
bt/tasks/actions/bt_await_animation.h → bt/tasks/scene/bt_await_animation.h
View File

@ -20,7 +20,7 @@
class BTAwaitAnimation : public BTAction { class BTAwaitAnimation : public BTAction {
GDCLASS(BTAwaitAnimation, BTAction); GDCLASS(BTAwaitAnimation, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Scene);
private: private:
Ref<BBNode> animation_player_param; Ref<BBNode> animation_player_param;

0
bt/tasks/actions/bt_call_method.cpp → bt/tasks/scene/bt_call_method.cpp
View File

2
bt/tasks/actions/bt_call_method.h → bt/tasks/scene/bt_call_method.h
View File

@ -18,7 +18,7 @@
class BTCallMethod : public BTAction { class BTCallMethod : public BTAction {
GDCLASS(BTCallMethod, BTAction); GDCLASS(BTCallMethod, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Scene);
private: private:
StringName method_name; StringName method_name;

0
bt/tasks/conditions/bt_check_agent_property.cpp → bt/tasks/scene/bt_check_agent_property.cpp
View File

2
bt/tasks/conditions/bt_check_agent_property.h → bt/tasks/scene/bt_check_agent_property.h
View File

@ -21,7 +21,7 @@
class BTCheckAgentProperty : public BTCondition { class BTCheckAgentProperty : public BTCondition {
GDCLASS(BTCheckAgentProperty, BTCondition); GDCLASS(BTCheckAgentProperty, BTCondition);
TASK_CATEGORY(Conditions); TASK_CATEGORY(Scene);
private: private:
StringName property; StringName property;

0
bt/tasks/actions/bt_pause_animation.cpp → bt/tasks/scene/bt_pause_animation.cpp
View File

2
bt/tasks/actions/bt_pause_animation.h → bt/tasks/scene/bt_pause_animation.h
View File

@ -20,7 +20,7 @@
class BTPauseAnimation : public BTAction { class BTPauseAnimation : public BTAction {
GDCLASS(BTPauseAnimation, BTAction); GDCLASS(BTPauseAnimation, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Scene);
private: private:
Ref<BBNode> animation_player_param; Ref<BBNode> animation_player_param;

0
bt/tasks/actions/bt_play_animation.cpp → bt/tasks/scene/bt_play_animation.cpp
View File

2
bt/tasks/actions/bt_play_animation.h → bt/tasks/scene/bt_play_animation.h
View File

@ -20,7 +20,7 @@
class BTPlayAnimation : public BTAction { class BTPlayAnimation : public BTAction {
GDCLASS(BTPlayAnimation, BTAction); GDCLASS(BTPlayAnimation, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Scene);
private: private:
Ref<BBNode> animation_player_param; Ref<BBNode> animation_player_param;

0
bt/tasks/actions/bt_set_agent_property.cpp → bt/tasks/scene/bt_set_agent_property.cpp
View File

2
bt/tasks/actions/bt_set_agent_property.h → bt/tasks/scene/bt_set_agent_property.h
View File

@ -18,7 +18,7 @@
class BTSetAgentProperty : public BTAction { class BTSetAgentProperty : public BTAction {
GDCLASS(BTSetAgentProperty, BTAction); GDCLASS(BTSetAgentProperty, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Scene);
private: private:
StringName property; StringName property;

0
bt/tasks/actions/bt_stop_animation.cpp → bt/tasks/scene/bt_stop_animation.cpp
View File

2
bt/tasks/actions/bt_stop_animation.h → bt/tasks/scene/bt_stop_animation.h
View File

@ -20,7 +20,7 @@
class BTStopAnimation : public BTAction { class BTStopAnimation : public BTAction {
GDCLASS(BTStopAnimation, BTAction); GDCLASS(BTStopAnimation, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Scene);
private: private:
Ref<BBNode> animation_player_param; Ref<BBNode> animation_player_param;

0
bt/tasks/actions/bt_console_print.cpp → bt/tasks/utility/bt_console_print.cpp
View File

2
bt/tasks/actions/bt_console_print.h → bt/tasks/utility/bt_console_print.h
View File

@ -18,7 +18,7 @@
class BTConsolePrint : public BTAction { class BTConsolePrint : public BTAction {
GDCLASS(BTConsolePrint, BTAction); GDCLASS(BTConsolePrint, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Utility);
private: private:
String text; String text;

0
bt/tasks/actions/bt_fail.cpp → bt/tasks/utility/bt_fail.cpp
View File

2
bt/tasks/actions/bt_fail.h → bt/tasks/utility/bt_fail.h
View File

@ -16,7 +16,7 @@
class BTFail : public BTAction { class BTFail : public BTAction {
GDCLASS(BTFail, BTAction); GDCLASS(BTFail, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Utility);
protected: protected:
virtual int _tick(double p_delta) override; virtual int _tick(double p_delta) override;

0
bt/tasks/actions/bt_random_wait.cpp → bt/tasks/utility/bt_random_wait.cpp
View File

2
bt/tasks/actions/bt_random_wait.h → bt/tasks/utility/bt_random_wait.h
View File

@ -16,7 +16,7 @@
class BTRandomWait : public BTAction { class BTRandomWait : public BTAction {
GDCLASS(BTRandomWait, BTAction); GDCLASS(BTRandomWait, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Utility);
private: private:
double min_duration = 1.0; double min_duration = 1.0;

0
bt/tasks/actions/bt_wait.cpp → bt/tasks/utility/bt_wait.cpp
View File

2
bt/tasks/actions/bt_wait.h → bt/tasks/utility/bt_wait.h
View File

@ -16,7 +16,7 @@
class BTWait : public BTAction { class BTWait : public BTAction {
GDCLASS(BTWait, BTAction); GDCLASS(BTWait, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Utility);
private: private:
double duration = 1.0; double duration = 1.0;

0
bt/tasks/actions/bt_wait_ticks.cpp → bt/tasks/utility/bt_wait_ticks.cpp
View File

2
bt/tasks/actions/bt_wait_ticks.h → bt/tasks/utility/bt_wait_ticks.h
View File

@ -16,7 +16,7 @@
class BTWaitTicks : public BTAction { class BTWaitTicks : public BTAction {
GDCLASS(BTWaitTicks, BTAction); GDCLASS(BTWaitTicks, BTAction);
TASK_CATEGORY(Actions); TASK_CATEGORY(Utility);
private: private:
int num_ticks = 1; int num_ticks = 1;

30
register_types.cpp
View File

@ -47,18 +47,9 @@
#include "bt/behavior_tree.h" #include "bt/behavior_tree.h"
#include "bt/bt_player.h" #include "bt/bt_player.h"
#include "bt/bt_state.h" #include "bt/bt_state.h"
#include "bt/tasks/actions/bt_await_animation.h" #include "bt/tasks/blackboard/bt_check_trigger.h"
#include "bt/tasks/actions/bt_call_method.h" #include "bt/tasks/blackboard/bt_check_var.h"
#include "bt/tasks/actions/bt_console_print.h" #include "bt/tasks/blackboard/bt_set_var.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_action.h"
#include "bt/tasks/bt_comment.h" #include "bt/tasks/bt_comment.h"
#include "bt/tasks/bt_composite.h" #include "bt/tasks/bt_composite.h"
@ -72,9 +63,6 @@
#include "bt/tasks/composites/bt_random_sequence.h" #include "bt/tasks/composites/bt_random_sequence.h"
#include "bt/tasks/composites/bt_selector.h" #include "bt/tasks/composites/bt_selector.h"
#include "bt/tasks/composites/bt_sequence.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_fail.h"
#include "bt/tasks/decorators/bt_always_succeed.h" #include "bt/tasks/decorators/bt_always_succeed.h"
#include "bt/tasks/decorators/bt_cooldown.h" #include "bt/tasks/decorators/bt_cooldown.h"
@ -89,6 +77,18 @@
#include "bt/tasks/decorators/bt_run_limit.h" #include "bt/tasks/decorators/bt_run_limit.h"
#include "bt/tasks/decorators/bt_subtree.h" #include "bt/tasks/decorators/bt_subtree.h"
#include "bt/tasks/decorators/bt_time_limit.h" #include "bt/tasks/decorators/bt_time_limit.h"
#include "bt/tasks/scene/bt_await_animation.h"
#include "bt/tasks/scene/bt_call_method.h"
#include "bt/tasks/scene/bt_check_agent_property.h"
#include "bt/tasks/scene/bt_pause_animation.h"
#include "bt/tasks/scene/bt_play_animation.h"
#include "bt/tasks/scene/bt_set_agent_property.h"
#include "bt/tasks/scene/bt_stop_animation.h"
#include "bt/tasks/utility/bt_console_print.h"
#include "bt/tasks/utility/bt_fail.h"
#include "bt/tasks/utility/bt_random_wait.h"
#include "bt/tasks/utility/bt_wait.h"
#include "bt/tasks/utility/bt_wait_ticks.h"
#include "editor/debugger/limbo_debugger.h" #include "editor/debugger/limbo_debugger.h"
#include "hsm/limbo_hsm.h" #include "hsm/limbo_hsm.h"
#include "hsm/limbo_state.h" #include "hsm/limbo_state.h"