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

Add ANYSTATE transitions

This commit is contained in:
Serhii Snitsaruk 2022-10-12 14:02:39 +02:00
parent 9937f2463b
commit 4f06bb5a3e
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
limbo_hsm.cpp
View File

@ -2,6 +2,7 @@
#include "limbo_hsm.h" #include "limbo_hsm.h"
#include "core/class_db.h"
#include "core/engine.h" #include "core/engine.h"
#include "core/error_macros.h" #include "core/error_macros.h"
#include "core/object.h" #include "core/object.h"
@ -88,9 +89,9 @@ void LimboHSM::_update(float p_delta) {
} }
void LimboHSM::add_transition(Node *p_from_state, Node *p_to_state, const String &p_event) { void LimboHSM::add_transition(Node *p_from_state, Node *p_to_state, const String &p_event) {
ERR_FAIL_COND(p_from_state == nullptr); // ERR_FAIL_COND(p_from_state == nullptr);
ERR_FAIL_COND(p_from_state->get_parent() != this); ERR_FAIL_COND(p_from_state != nullptr && p_from_state->get_parent() != this);
ERR_FAIL_COND(!p_from_state->is_class("LimboState")); ERR_FAIL_COND(p_from_state != nullptr && !p_from_state->is_class("LimboState"));
ERR_FAIL_COND(p_to_state == nullptr); ERR_FAIL_COND(p_to_state == nullptr);
ERR_FAIL_COND(p_to_state->get_parent() != this); ERR_FAIL_COND(p_to_state->get_parent() != this);
ERR_FAIL_COND(!p_to_state->is_class("LimboState")); ERR_FAIL_COND(!p_to_state->is_class("LimboState"));
@ -127,8 +128,18 @@ bool LimboHSM::dispatch(const String &p_event, const Variant &p_cargo) {
if (!event_consumed && active_state) { if (!event_consumed && active_state) {
uint64_t key = _get_transition_key(active_state, p_event); uint64_t key = _get_transition_key(active_state, p_event);
LimboState *to_state = nullptr;
if (transitions.has(key)) { if (transitions.has(key)) {
LimboState *to_state = transitions[key]; to_state = transitions[key];
}
if (to_state == nullptr) {
// Get ANYSTATE transition.
key = _get_transition_key(nullptr, p_event);
if (transitions.has(key)) {
to_state = transitions[key];
}
}
if (to_state != nullptr) {
bool permitted = true; bool permitted = true;
if (to_state->guard.obj != nullptr) { if (to_state->guard.obj != nullptr) {
Variant result = to_state->guard.obj->callv(to_state->guard.func, to_state->guard.binds); Variant result = to_state->guard.obj->callv(to_state->guard.func, to_state->guard.binds);
@ -203,12 +214,14 @@ void LimboHSM::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_active", "p_active"), &LimboHSM::set_active); ClassDB::bind_method(D_METHOD("set_active", "p_active"), &LimboHSM::set_active);
ClassDB::bind_method(D_METHOD("update", "p_delta"), &LimboHSM::update); ClassDB::bind_method(D_METHOD("update", "p_delta"), &LimboHSM::update);
ClassDB::bind_method(D_METHOD("add_transition", "p_from_state", "p_to_state", "p_event"), &LimboHSM::add_transition); ClassDB::bind_method(D_METHOD("add_transition", "p_from_state", "p_to_state", "p_event"), &LimboHSM::add_transition);
ClassDB::bind_method(D_METHOD("anystate"), &LimboHSM::anystate);
BIND_ENUM_CONSTANT(IDLE); BIND_ENUM_CONSTANT(IDLE);
BIND_ENUM_CONSTANT(PHYSICS); BIND_ENUM_CONSTANT(PHYSICS);
BIND_ENUM_CONSTANT(MANUAL); BIND_ENUM_CONSTANT(MANUAL);
ADD_PROPERTY(PropertyInfo(Variant::INT, "update_mode", PROPERTY_HINT_ENUM, "Idle, Physics, Manual"), "set_update_mode", "get_update_mode"); ADD_PROPERTY(PropertyInfo(Variant::INT, "update_mode", PROPERTY_HINT_ENUM, "Idle, Physics, Manual"), "set_update_mode", "get_update_mode");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "ANYSTATE"), "", "anystate");
ADD_SIGNAL(MethodInfo("state_changed", PropertyInfo(Variant::OBJECT, "p_state", PROPERTY_HINT_NONE, "", 0, "LimboState"))); ADD_SIGNAL(MethodInfo("state_changed", PropertyInfo(Variant::OBJECT, "p_state", PROPERTY_HINT_NONE, "", 0, "LimboState")));
} }
@ -217,4 +230,4 @@ LimboHSM::LimboHSM() {
update_mode = UpdateMode::IDLE; update_mode = UpdateMode::IDLE;
active_state = nullptr; active_state = nullptr;
initial_state = nullptr; initial_state = nullptr;
} }

1
limbo_hsm.h
View File

@ -53,6 +53,7 @@ public:
void update(float p_delta) { _update(p_delta); } void update(float p_delta) { _update(p_delta); }
void add_transition(Node *p_from_state, Node *p_to_state, const String &p_event); void add_transition(Node *p_from_state, Node *p_to_state, const String &p_event);
LimboState *anystate() const { return nullptr; };
LimboHSM(); LimboHSM();
}; };

2
limbo_state.cpp
View File

@ -157,6 +157,8 @@ void LimboState::_bind_methods() {
BIND_VMETHOD(MethodInfo("_exit")); BIND_VMETHOD(MethodInfo("_exit"));
BIND_VMETHOD(MethodInfo("_update", PropertyInfo(Variant::REAL, "p_delta"))); BIND_VMETHOD(MethodInfo("_update", PropertyInfo(Variant::REAL, "p_delta")));
ADD_PROPERTY(PropertyInfo(Variant::STRING, "EVENT_FINISHED"), "", "event_finished");
ADD_SIGNAL(MethodInfo("setup")); ADD_SIGNAL(MethodInfo("setup"));
ADD_SIGNAL(MethodInfo("entered")); ADD_SIGNAL(MethodInfo("entered"));
ADD_SIGNAL(MethodInfo("exited")); ADD_SIGNAL(MethodInfo("exited"));