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

Merge pull request #91 from limbonaut/fix-bt-ticked-after-transition 

HSM: Delay state transition till update is finished
This commit is contained in:
Serhii Snitsaruk 2024-04-20 21:50:46 +02:00 committed by GitHub
parent 24382d3fd1 c4df916bdf
commit 1a37540797
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bt/bt_state.cpp
View File

@ -63,13 +63,20 @@ void BTState::_setup() {
} }
void BTState::_exit() { void BTState::_exit() {
LimboState::_exit(); if (tree_instance.is_valid()) {
ERR_FAIL_NULL(tree_instance);
tree_instance->abort(); tree_instance->abort();
} else {
ERR_PRINT_ONCE("BTState: BehaviorTree is not assigned.");
}
LimboState::_exit();
} }
void BTState::_update(double p_delta) { void BTState::_update(double p_delta) {
VCALL_ARGS(_update, p_delta); VCALL_ARGS(_update, p_delta);
if (!active) {
// Bail out if a transition happened in the meantime.
return;
}
ERR_FAIL_NULL(tree_instance); ERR_FAIL_NULL(tree_instance);
int status = tree_instance->execute(p_delta); int status = tree_instance->execute(p_delta);
if (status == BTTask::SUCCESS) { if (status == BTTask::SUCCESS) {

12
hsm/limbo_hsm.cpp
View File

@ -88,7 +88,13 @@ void LimboHSM::_update(double p_delta) {
} }
void LimboHSM::update(double p_delta) { void LimboHSM::update(double p_delta) {
updating = true;
_update(p_delta); _update(p_delta);
updating = false;
if (next_active) {
_change_state(next_active);
next_active = nullptr;
}
} }
void LimboHSM::add_transition(LimboState *p_from_state, LimboState *p_to_state, const StringName &p_event) { void LimboHSM::add_transition(LimboState *p_from_state, LimboState *p_to_state, const StringName &p_event) {
@ -170,7 +176,12 @@ bool LimboHSM::_dispatch(const StringName &p_event, const Variant &p_cargo) {
} }
} }
if (permitted) { if (permitted) {
if (!updating) {
_change_state(to_state); _change_state(to_state);
} else if (!next_active) {
// Only set next_active if we are not already in the process of changing states.
next_active = to_state;
}
event_consumed = true; event_consumed = true;
} }
} }
@ -263,5 +274,6 @@ LimboHSM::LimboHSM() {
update_mode = UpdateMode::PHYSICS; update_mode = UpdateMode::PHYSICS;
active_state = nullptr; active_state = nullptr;
previous_active = nullptr; previous_active = nullptr;
next_active = nullptr;
initial_state = nullptr; initial_state = nullptr;
} }

2
hsm/limbo_hsm.h
View File

@ -29,7 +29,9 @@ private:
LimboState *initial_state; LimboState *initial_state;
LimboState *active_state; LimboState *active_state;
LimboState *previous_active; LimboState *previous_active;
LimboState *next_active;
HashMap<uint64_t, LimboState *> transitions; HashMap<uint64_t, LimboState *> transitions;
bool updating = false;
_FORCE_INLINE_ uint64_t _get_transition_key(LimboState *p_from_state, const StringName &p_event) { _FORCE_INLINE_ uint64_t _get_transition_key(LimboState *p_from_state, const StringName &p_event) {
uint64_t key = hash_djb2_one_64(Variant::OBJECT); uint64_t key = hash_djb2_one_64(Variant::OBJECT);