summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJ08nY <jancar.jj@gmail.com>2016-06-04 17:55:09 +0200
committerJ08nY <jancar.jj@gmail.com>2016-06-04 17:56:30 +0200
commit1a80b2a04a16f930e0d5cca4bdf322769d5a24f9 (patch)
tree998bf7301e1261cd06bbd6e1bf5d85e22d3ff1ff /core
parent280e3611b90c40fc26c7b7295430703f70f50f03 (diff)
Added InputMap.get_actions()
get_actions() lists all actions in the InputMap.
Diffstat (limited to 'core')
-rw-r--r--core/input_map.cpp30
-rw-r--r--core/input_map.h2
2 files changed, 32 insertions, 0 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp
index 17e98902a1..0506233116 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -36,6 +36,7 @@ void InputMap::_bind_methods() {
ObjectTypeDB::bind_method(_MD("has_action","action"),&InputMap::has_action);
ObjectTypeDB::bind_method(_MD("get_action_id","action"),&InputMap::get_action_id);
ObjectTypeDB::bind_method(_MD("get_action_from_id","id"),&InputMap::get_action_from_id);
+ ObjectTypeDB::bind_method(_MD("get_actions"),&InputMap::_get_actions);
ObjectTypeDB::bind_method(_MD("add_action","action"),&InputMap::add_action);
ObjectTypeDB::bind_method(_MD("erase_action","action"),&InputMap::erase_action);
@@ -75,6 +76,35 @@ StringName InputMap::get_action_from_id(int p_id) const {
return input_id_map[p_id];
}
+Array InputMap::_get_actions() {
+
+ Array ret;
+ List<StringName> actions = get_actions();
+ if(actions.empty())
+ return ret;
+
+ for(const List<StringName>::Element *E=actions.front();E;E=E->next()) {
+
+ ret.push_back(E->get());
+ }
+
+ return ret;
+}
+
+List<StringName> InputMap::get_actions() const {
+
+ List<StringName> actions = List<StringName>();
+ if(input_map.empty()){
+ return actions;
+ }
+
+ for (Map<StringName, Action>::Element *E=input_map.front();E;E=E->next()) {
+ actions.push_back(E->key());
+ }
+
+ return actions;
+}
+
List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const InputEvent& p_event) const {
for (List<InputEvent>::Element *E=p_list.front();E;E=E->next()) {
diff --git a/core/input_map.h b/core/input_map.h
index 5cd1e41922..82b650516e 100644
--- a/core/input_map.h
+++ b/core/input_map.h
@@ -47,6 +47,7 @@ class InputMap : public Object {
List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event) const;
Array _get_action_list(const StringName& p_action);
+ Array _get_actions();
protected:
@@ -59,6 +60,7 @@ public:
bool has_action(const StringName& p_action) const;
int get_action_id(const StringName& p_action) const;
StringName get_action_from_id(int p_id) const;
+ List<StringName> get_actions() const;
void add_action(const StringName& p_action);
void erase_action(const StringName& p_action);