Update plan editor utilizing `StringName`
This commit is contained in:
parent
0bd52d9b18
commit
bea25049a0
|
@ -48,25 +48,25 @@ void BlackboardPlanEditor::_add_var() {
|
||||||
ERR_FAIL_NULL(plan);
|
ERR_FAIL_NULL(plan);
|
||||||
|
|
||||||
int suffix = 1;
|
int suffix = 1;
|
||||||
String name = default_var_name;
|
StringName var_name = default_var_name;
|
||||||
while (plan->has_var(name)) {
|
while (plan->has_var(var_name)) {
|
||||||
suffix += 1;
|
suffix += 1;
|
||||||
name = default_var_name + itos(suffix);
|
var_name = String(default_var_name) + itos(suffix);
|
||||||
}
|
}
|
||||||
|
|
||||||
BBVariable var(Variant::Type::FLOAT);
|
BBVariable var(Variant::Type::FLOAT);
|
||||||
plan->add_var(name, var);
|
plan->add_var(var_name, var);
|
||||||
_refresh();
|
_refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BlackboardPlanEditor::_trash_var(int p_index) {
|
void BlackboardPlanEditor::_trash_var(int p_index) {
|
||||||
ERR_FAIL_NULL(plan);
|
ERR_FAIL_NULL(plan);
|
||||||
String var_name = plan->get_var_by_index(p_index).first;
|
StringName var_name = plan->get_var_by_index(p_index).first;
|
||||||
plan->remove_var(var_name);
|
plan->remove_var(var_name);
|
||||||
_refresh();
|
_refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BlackboardPlanEditor::_rename_var(const String &p_new_name, int p_index) {
|
void BlackboardPlanEditor::_rename_var(const StringName &p_new_name, int p_index) {
|
||||||
ERR_FAIL_NULL(plan);
|
ERR_FAIL_NULL(plan);
|
||||||
|
|
||||||
LineEdit *name_edit = _get_name_edit(p_index);
|
LineEdit *name_edit = _get_name_edit(p_index);
|
||||||
|
@ -127,8 +127,8 @@ void BlackboardPlanEditor::edit_plan(const Ref<BlackboardPlan> &p_plan) {
|
||||||
_refresh();
|
_refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BlackboardPlanEditor::set_next_var_name(const String &p_name) {
|
void BlackboardPlanEditor::set_next_var_name(const StringName &p_name) {
|
||||||
if (p_name.is_valid_identifier()) {
|
if (String(p_name).is_valid_identifier()) {
|
||||||
default_var_name = p_name;
|
default_var_name = p_name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,7 +56,7 @@ private:
|
||||||
int drag_index = -1;
|
int drag_index = -1;
|
||||||
|
|
||||||
Ref<BlackboardPlan> plan;
|
Ref<BlackboardPlan> plan;
|
||||||
String default_var_name;
|
StringName default_var_name;
|
||||||
|
|
||||||
VBoxContainer *rows_vbox;
|
VBoxContainer *rows_vbox;
|
||||||
Button *add_var_tool;
|
Button *add_var_tool;
|
||||||
|
@ -69,7 +69,7 @@ private:
|
||||||
|
|
||||||
void _add_var();
|
void _add_var();
|
||||||
void _trash_var(int p_index);
|
void _trash_var(int p_index);
|
||||||
void _rename_var(const String &p_new_name, int p_index);
|
void _rename_var(const StringName &p_new_name, int p_index);
|
||||||
void _change_var_type(Variant::Type p_new_type, int p_index);
|
void _change_var_type(Variant::Type p_new_type, int p_index);
|
||||||
void _change_var_hint(PropertyHint p_new_hint, int p_index);
|
void _change_var_hint(PropertyHint p_new_hint, int p_index);
|
||||||
void _change_var_hint_string(const String &p_new_hint_string, int p_index);
|
void _change_var_hint_string(const String &p_new_hint_string, int p_index);
|
||||||
|
@ -95,7 +95,7 @@ public:
|
||||||
_FORCE_INLINE_ static BlackboardPlanEditor *get_singleton() { return singleton; }
|
_FORCE_INLINE_ static BlackboardPlanEditor *get_singleton() { return singleton; }
|
||||||
|
|
||||||
void edit_plan(const Ref<BlackboardPlan> &p_plan);
|
void edit_plan(const Ref<BlackboardPlan> &p_plan);
|
||||||
void set_next_var_name(const String &p_name);
|
void set_next_var_name(const StringName &p_name);
|
||||||
|
|
||||||
BlackboardPlanEditor();
|
BlackboardPlanEditor();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue