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

Remove blackboard management from BTState

This commit is contained in:
Serhii Snitsaruk 2022-10-19 23:41:56 +02:00
parent bc0f0b61d1
commit 36ff3a724f
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bt/bt_state.cpp
View File

@ -1,13 +1,18 @@
/* bt_state.cpp */ /* bt_state.cpp */
#include "bt_state.h" #include "bt_state.h"
#include "core/class_db.h"
#include "core/variant.h" #include "core/variant.h"
#include "modules/limboai/bt/bt_task.h" #include "modules/limboai/bt/bt_task.h"
#include "modules/limboai/limbo_state.h"
// void BTState::initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard) {
void BTState::_setup() { void BTState::_setup() {
blackboard->prefetch_nodepath_vars(this); // blackboard->prefetch_nodepath_vars(this);
root_task = behavior_tree->instance(get_owner(), blackboard); // blackboard->set_parent_scope(p_blackboard);
root_task->initialize(get_owner(), blackboard); root_task = behavior_tree->instance(get_agent(), get_blackboard());
// LimboState::initialize(p_agent, blackboard);
} }
void BTState::_exit() { void BTState::_exit() {
@ -26,9 +31,13 @@ void BTState::_update(float p_delta) {
void BTState::_bind_methods() { void BTState::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_behavior_tree", "p_value"), &BTState::set_behavior_tree); ClassDB::bind_method(D_METHOD("set_behavior_tree", "p_value"), &BTState::set_behavior_tree);
ClassDB::bind_method(D_METHOD("get_behavior_tree"), &BTState::get_behavior_tree); ClassDB::bind_method(D_METHOD("get_behavior_tree"), &BTState::get_behavior_tree);
// ClassDB::bind_method(D_METHOD("set_blackboard", "p_blackboard"), &BTState::set_blackboard); // ClassDB::bind_method(D_METHOD("_get_blackboard_data"), &BTState::_get_blackboard_data);
ClassDB::bind_method(D_METHOD("get_blackboard"), &BTState::get_blackboard); // ClassDB::bind_method(D_METHOD("_set_blackboard_data", "p_data"), &BTState::_set_blackboard_data);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "behavior_tree", PROPERTY_HINT_RESOURCE_TYPE, "BehaviorTree"), "set_behavior_tree", "get_behavior_tree"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "behavior_tree", PROPERTY_HINT_RESOURCE_TYPE, "BehaviorTree"), "set_behavior_tree", "get_behavior_tree");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard", PROPERTY_HINT_NONE, "Blackboard", 0), "", "get_blackboard"); ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "blackboard_data"), "_set_blackboard_data", "_get_blackboard_data");
}
BTState::BTState() {
// blackboard = Ref<Blackboard>(memnew(Blackboard));
} }

13
bt/bt_state.h
View File

@ -13,22 +13,27 @@ class BTState : public LimboState {
private: private:
Ref<BehaviorTree> behavior_tree; Ref<BehaviorTree> behavior_tree;
Ref<Blackboard> blackboard; // Ref<Blackboard> blackboard;
Ref<BTTask> root_task; Ref<BTTask> root_task;
protected: protected:
static void _bind_methods(); static void _bind_methods();
virtual void _setup(); virtual void _setup();
// virtual void _enter() {} virtual void _enter() {}
virtual void _exit(); virtual void _exit();
virtual void _update(float p_delta); virtual void _update(float p_delta);
// void _set_blackboard_data(Dictionary p_value) { blackboard->set_data(p_value); }
// Dictionary _get_blackboard_data() const { return blackboard->get_data(); }
public: public:
void set_behavior_tree(const Ref<BehaviorTree> &p_value) { behavior_tree = p_value; } void set_behavior_tree(const Ref<BehaviorTree> &p_value) { behavior_tree = p_value; }
Ref<BehaviorTree> get_behavior_tree() const { return behavior_tree; } Ref<BehaviorTree> get_behavior_tree() const { return behavior_tree; }
// void set_blackboard(const Ref<Blackboard> &p_value) { blackboard = p_value; }
Ref<Blackboard> get_blackboard() const { return blackboard; } // virtual void initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard);
BTState();
}; };
#endif // BT_STATE_H #endif // BT_STATE_H