godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 17:36:07 +00:00
Code Releases Wiki Activity

Optimize InputMap::get_actions.

Browse Source
This commit is contained in:
Yufeng Ying
2025-01-07 18:28:51 +08:00
parent 19bb18716e
commit 55a61cbd4a
3 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/input/input_map.cpp
View File

@@ -39,7 +39,7 @@
void InputMap::_bind_methods() { void InputMap::_bind_methods() {
ClassDB::bind_method(D_METHOD("has_action", "action"), &InputMap::has_action); ClassDB::bind_method(D_METHOD("has_action", "action"), &InputMap::has_action);
ClassDB::bind_method(D_METHOD("get_actions"), &InputMap::_get_actions); ClassDB::bind_method(D_METHOD("get_actions"), &InputMap::get_actions);
ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(DEFAULT_DEADZONE)); ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(DEFAULT_DEADZONE));
ClassDB::bind_method(D_METHOD("erase_action", "action"), &InputMap::erase_action); ClassDB::bind_method(D_METHOD("erase_action", "action"), &InputMap::erase_action);
@@ -61,16 +61,15 @@ void InputMap::_bind_methods() {
* matching action name (if possible). * matching action name (if possible).
*/ */
String InputMap::suggest_actions(const StringName &p_action) const { String InputMap::suggest_actions(const StringName &p_action) const {
List<StringName> actions = get_actions();
StringName closest_action; StringName closest_action;
float closest_similarity = 0.0; float closest_similarity = 0.0;
// Find the most action with the most similar name. // Find the most action with the most similar name.
for (const StringName &action : actions) { for (const KeyValue<StringName, Action> &kv : input_map) {
const float similarity = String(action).similarity(p_action); const float similarity = String(kv.key).similarity(p_action);
if (similarity > closest_similarity) { if (similarity > closest_similarity) {
closest_action = action; closest_action = kv.key;
closest_similarity = similarity; closest_similarity = similarity;
} }
} }
@@ -128,33 +127,20 @@ void InputMap::erase_action(const StringName &p_action) {
input_map.erase(p_action); input_map.erase(p_action);
} }
TypedArray<StringName> InputMap::_get_actions() { TypedArray<StringName> InputMap::get_actions() {
TypedArray<StringName> ret; TypedArray<StringName> ret;
List<StringName> actions = get_actions();
if (actions.is_empty()) {
return ret;
}
for (const StringName &E : actions) { ret.resize(input_map.size());
ret.push_back(E);
uint32_t i = 0;
for (const KeyValue<StringName, Action> &kv : input_map) {
ret[i] = kv.key;
i++;
} }
return ret; return ret;
} }
List<StringName> InputMap::get_actions() const {
List<StringName> actions = List<StringName>();
if (input_map.is_empty()) {
return actions;
}
for (const KeyValue<StringName, Action> &E : input_map) {
actions.push_back(E.key);
}
return actions;
}
List<Ref<InputEvent>>::Element *InputMap::_find_event(Action &p_action, const Ref<InputEvent> &p_event, bool p_exact_match, bool *r_pressed, float *r_strength, float *r_raw_strength, int *r_event_index) const { List<Ref<InputEvent>>::Element *InputMap::_find_event(Action &p_action, const Ref<InputEvent> &p_event, bool p_exact_match, bool *r_pressed, float *r_strength, float *r_raw_strength, int *r_event_index) const {
ERR_FAIL_COND_V(p_event.is_null(), nullptr); ERR_FAIL_COND_V(p_event.is_null(), nullptr);

4
core/input/input_map.h
View File

@@ -31,7 +31,6 @@
#pragma once #pragma once
#include "core/input/input_event.h" #include "core/input/input_event.h"
#include "core/object/class_db.h"
#include "core/object/object.h" #include "core/object/object.h"
#include "core/templates/hash_map.h" #include "core/templates/hash_map.h"
@@ -67,7 +66,6 @@ private:
List<Ref<InputEvent>>::Element *_find_event(Action &p_action, const Ref<InputEvent> &p_event, bool p_exact_match = false, bool *r_pressed = nullptr, float *r_strength = nullptr, float *r_raw_strength = nullptr, int *r_event_index = nullptr) const; List<Ref<InputEvent>>::Element *_find_event(Action &p_action, const Ref<InputEvent> &p_event, bool p_exact_match = false, bool *r_pressed = nullptr, float *r_strength = nullptr, float *r_raw_strength = nullptr, int *r_event_index = nullptr) const;
TypedArray<InputEvent> _action_get_events(const StringName &p_action); TypedArray<InputEvent> _action_get_events(const StringName &p_action);
TypedArray<StringName> _get_actions();
protected: protected:
static void _bind_methods(); static void _bind_methods();
@@ -81,7 +79,7 @@ public:
static _FORCE_INLINE_ InputMap *get_singleton() { return singleton; } static _FORCE_INLINE_ InputMap *get_singleton() { return singleton; }
bool has_action(const StringName &p_action) const; bool has_action(const StringName &p_action) const;
List<StringName> get_actions() const; TypedArray<StringName> get_actions();
void add_action(const StringName &p_action, float p_deadzone = DEFAULT_DEADZONE); void add_action(const StringName &p_action, float p_deadzone = DEFAULT_DEADZONE);
void erase_action(const StringName &p_action); void erase_action(const StringName &p_action);

2
editor/editor_settings.cpp
View File

@@ -2166,7 +2166,7 @@ void EditorSettings::get_argument_options(const StringName &p_function, int p_id
r_options->push_back(section.quote()); r_options->push_back(section.quote());
} }
} else if (pf == "set_builtin_action_override") { } else if (pf == "set_builtin_action_override") {
for (const StringName &action : InputMap::get_singleton()->get_actions()) { for (const Variant &action : InputMap::get_singleton()->get_actions()) {
r_options->push_back(String(action).quote()); r_options->push_back(String(action).quote());
} }
} }