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

Merge pull request #158 from limbonaut/fix-bbplan-arrays 

Fix BlackboardPlan arrays shouldn't be shared between instanced agents
This commit is contained in:
Serhii Snitsaruk 2024-07-06 11:12:11 +02:00 committed by GitHub
parent 254a9ca943 3ceedbebad
commit 5f5e4a28cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blackboard/bb_variable.cpp
View File

@ -78,12 +78,16 @@ String BBVariable::get_hint_string() const {
return data->hint_string; return data->hint_string;
} }
BBVariable BBVariable::duplicate() const { BBVariable BBVariable::duplicate(bool p_deep) const {
BBVariable var; BBVariable var;
var.data->hint = data->hint; var.data->hint = data->hint;
var.data->hint_string = data->hint_string; var.data->hint_string = data->hint_string;
var.data->type = data->type; var.data->type = data->type;
if (p_deep) {
var.data->value = data->value.duplicate(p_deep);
} else {
var.data->value = data->value; var.data->value = data->value;
}
var.data->binding_path = data->binding_path; var.data->binding_path = data->binding_path;
var.data->bound_object = data->bound_object; var.data->bound_object = data->bound_object;
var.data->bound_property = data->bound_property; var.data->bound_property = data->bound_property;

2
blackboard/bb_variable.h
View File

@ -54,7 +54,7 @@ public:
void set_hint_string(const String &p_hint_string); void set_hint_string(const String &p_hint_string);
String get_hint_string() const; String get_hint_string() const;
BBVariable duplicate() const; BBVariable duplicate(bool p_deep = false) const;
_FORCE_INLINE_ bool is_value_changed() const { return data->value_changed; } _FORCE_INLINE_ bool is_value_changed() const { return data->value_changed; }
_FORCE_INLINE_ void reset_value_changed() { data->value_changed = false; } _FORCE_INLINE_ void reset_value_changed() { data->value_changed = false; }

4
blackboard/blackboard_plan.cpp
View File

@ -391,7 +391,7 @@ void BlackboardPlan::sync_with_base_plan() {
inline void bb_add_var_dup_with_prefetch(const Ref<Blackboard> &p_blackboard, const StringName &p_name, const BBVariable &p_var, bool p_prefetch, Node *p_node) { inline void bb_add_var_dup_with_prefetch(const Ref<Blackboard> &p_blackboard, const StringName &p_name, const BBVariable &p_var, bool p_prefetch, Node *p_node) {
if (unlikely(p_prefetch && p_var.get_type() == Variant::NODE_PATH)) { if (unlikely(p_prefetch && p_var.get_type() == Variant::NODE_PATH)) {
Node *n = p_node->get_node_or_null(p_var.get_value()); Node *n = p_node->get_node_or_null(p_var.get_value());
BBVariable var = p_var.duplicate(); BBVariable var = p_var.duplicate(true);
if (n != nullptr) { if (n != nullptr) {
var.set_value(n); var.set_value(n);
} else { } else {
@ -404,7 +404,7 @@ inline void bb_add_var_dup_with_prefetch(const Ref<Blackboard> &p_blackboard, co
} }
p_blackboard->assign_var(p_name, var); p_blackboard->assign_var(p_name, var);
} else { } else {
p_blackboard->assign_var(p_name, p_var.duplicate()); p_blackboard->assign_var(p_name, p_var.duplicate(true));
} }
} }