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

Refactor BTCheckVar

This commit is contained in:
Serhii Snitsaruk 2023-08-10 13:12:13 +02:00
parent 605444ee0f
commit d3d5a0c50e
2 changed files with 11 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bt/conditions/bt_check_var.cpp
View File

@ -15,14 +15,12 @@
#include "core/variant/callable.h" #include "core/variant/callable.h"
VARIANT_ENUM_CAST(BTCheckVar::CheckType);
void BTCheckVar::set_variable(String p_variable) { void BTCheckVar::set_variable(String p_variable) {
variable = p_variable; variable = p_variable;
emit_changed(); emit_changed();
} }
void BTCheckVar::set_check_type(CheckType p_check_type) { void BTCheckVar::set_check_type(LimboUtility::CheckType p_check_type) {
check_type = p_check_type; check_type = p_check_type;
emit_changed(); emit_changed();
} }
@ -54,64 +52,21 @@ String BTCheckVar::_generate_name() const {
return "CheckVar ???"; return "CheckVar ???";
} }
String check_str = "?"; return vformat("Check if: %s %s %s", LimboUtility::get_singleton()->decorate_var(variable),
switch (check_type) { LimboUtility::get_singleton()->get_check_operator_string(check_type),
case CheckType::CHECK_EQUAL: {
check_str = "==";
} break;
case CheckType::CHECK_LESS_THAN: {
check_str = "<";
} break;
case CheckType::CHECK_LESS_THAN_OR_EQUAL: {
check_str = "<=";
} break;
case CheckType::CHECK_GREATER_THAN: {
check_str = ">";
} break;
case CheckType::CHECK_GREATER_THAN_OR_EQUAL: {
check_str = ">=";
} break;
case CheckType::CHECK_NOT_EQUAL: {
check_str = "!=";
} break;
}
return vformat("Check if %s %s %s", LimboUtility::get_singleton()->decorate_var(variable), check_str,
value.is_valid() ? Variant(value) : Variant("???")); value.is_valid() ? Variant(value) : Variant("???"));
} }
int BTCheckVar::_tick(double p_delta) { int BTCheckVar::_tick(double p_delta) {
ERR_FAIL_COND_V_MSG(variable.is_empty(), FAILURE, "BBCheckVar: `variable` is not set."); ERR_FAIL_COND_V_MSG(variable.is_empty(), FAILURE, "BTCheckVar: `variable` is not set.");
ERR_FAIL_COND_V_MSG(!value.is_valid(), FAILURE, "BBCheckVar: `value` is not set."); ERR_FAIL_COND_V_MSG(!value.is_valid(), FAILURE, "BTCheckVar: `value` is not set.");
ERR_FAIL_COND_V_MSG(!get_blackboard()->has_var(variable), FAILURE, vformat("BBCheckVar: Blackboard variable doesn't exist: \"%s\". Returning FAILURE.", variable)); ERR_FAIL_COND_V_MSG(!get_blackboard()->has_var(variable), FAILURE, vformat("BTCheckVar: Blackboard variable doesn't exist: \"%s\". Returning FAILURE.", variable));
Variant left_value = get_blackboard()->get_var(variable, Variant()); Variant left_value = get_blackboard()->get_var(variable, Variant());
Variant right_value = value->get_value(get_agent(), get_blackboard()); Variant right_value = value->get_value(get_agent(), get_blackboard());
switch (check_type) { return LimboUtility::get_singleton()->perform_check(check_type, left_value, right_value) ? SUCCESS : FAILURE;
case CheckType::CHECK_EQUAL: {
return Variant::evaluate(Variant::OP_EQUAL, left_value, right_value) ? SUCCESS : FAILURE;
} break;
case CheckType::CHECK_LESS_THAN: {
return Variant::evaluate(Variant::OP_LESS, left_value, right_value) ? SUCCESS : FAILURE;
} break;
case CheckType::CHECK_LESS_THAN_OR_EQUAL: {
return Variant::evaluate(Variant::OP_LESS_EQUAL, left_value, right_value) ? SUCCESS : FAILURE;
} break;
case CheckType::CHECK_GREATER_THAN: {
return Variant::evaluate(Variant::OP_GREATER, left_value, right_value) ? SUCCESS : FAILURE;
} break;
case CheckType::CHECK_GREATER_THAN_OR_EQUAL: {
return Variant::evaluate(Variant::OP_GREATER_EQUAL, left_value, right_value) ? SUCCESS : FAILURE;
} break;
case CheckType::CHECK_NOT_EQUAL: {
return Variant::evaluate(Variant::OP_NOT_EQUAL, left_value, right_value) ? SUCCESS : FAILURE;
} break;
default: {
return FAILURE;
} break;
}
} }
void BTCheckVar::_bind_methods() { void BTCheckVar::_bind_methods() {
@ -125,11 +80,4 @@ void BTCheckVar::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::STRING, "variable"), "set_variable", "get_variable"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "variable"), "set_variable", "get_variable");
ADD_PROPERTY(PropertyInfo(Variant::INT, "check_type", PROPERTY_HINT_ENUM, "Equal,Less Than,Less Than Or Equal,Greater Than,Greater Than Or Equal,Not Equal"), "set_check_type", "get_check_type"); ADD_PROPERTY(PropertyInfo(Variant::INT, "check_type", PROPERTY_HINT_ENUM, "Equal,Less Than,Less Than Or Equal,Greater Than,Greater Than Or Equal,Not Equal"), "set_check_type", "get_check_type");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "value", PROPERTY_HINT_RESOURCE_TYPE, "BBVariant"), "set_value", "get_value"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "value", PROPERTY_HINT_RESOURCE_TYPE, "BBVariant"), "set_value", "get_value");
BIND_ENUM_CONSTANT(CHECK_EQUAL);
BIND_ENUM_CONSTANT(CHECK_LESS_THAN);
BIND_ENUM_CONSTANT(CHECK_LESS_THAN_OR_EQUAL);
BIND_ENUM_CONSTANT(CHECK_GREATER_THAN);
BIND_ENUM_CONSTANT(CHECK_GREATER_THAN_OR_EQUAL);
BIND_ENUM_CONSTANT(CHECK_NOT_EQUAL);
} }

17
bt/conditions/bt_check_var.h
View File

@ -15,6 +15,7 @@
#include "bt_condition.h" #include "bt_condition.h"
#include "modules/limboai/blackboard/bb_param/bb_variant.h" #include "modules/limboai/blackboard/bb_param/bb_variant.h"
#include "modules/limboai/util/limbo_utility.h"
#include "core/object/class_db.h" #include "core/object/class_db.h"
#include "core/object/object.h" #include "core/object/object.h"
@ -22,19 +23,9 @@
class BTCheckVar : public BTCondition { class BTCheckVar : public BTCondition {
GDCLASS(BTCheckVar, BTCondition); GDCLASS(BTCheckVar, BTCondition);
public:
enum CheckType : unsigned int {
CHECK_EQUAL,
CHECK_LESS_THAN,
CHECK_LESS_THAN_OR_EQUAL,
CHECK_GREATER_THAN,
CHECK_GREATER_THAN_OR_EQUAL,
CHECK_NOT_EQUAL
};
private: private:
String variable; String variable;
CheckType check_type = CheckType::CHECK_EQUAL; LimboUtility::CheckType check_type = LimboUtility::CheckType::CHECK_EQUAL;
Ref<BBVariant> value; Ref<BBVariant> value;
protected: protected:
@ -49,8 +40,8 @@ public:
void set_variable(String p_variable); void set_variable(String p_variable);
String get_variable() const { return variable; } String get_variable() const { return variable; }
void set_check_type(CheckType p_check_type); void set_check_type(LimboUtility::CheckType p_check_type);
CheckType get_check_type() const { return check_type; } LimboUtility::CheckType get_check_type() const { return check_type; }
void set_value(Ref<BBVariant> p_value); void set_value(Ref<BBVariant> p_value);
Ref<BBVariant> get_value() const { return value; } Ref<BBVariant> get_value() const { return value; }