diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /core/input_map.h | |
parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
download | redot-engine-5dbf1809c6e3e905b94b8764e99491e608122261.tar.gz |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'core/input_map.h')
-rw-r--r-- | core/input_map.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/core/input_map.h b/core/input_map.h index 6ccd24f29c..25d0c3e1b9 100644 --- a/core/input_map.h +++ b/core/input_map.h @@ -29,51 +29,50 @@ #ifndef INPUT_MAP_H #define INPUT_MAP_H - #include "object.h" class InputMap : public Object { - GDCLASS( InputMap, Object ); + GDCLASS(InputMap, Object); + public: struct Action { int id; List<InputEvent> inputs; }; + private: static InputMap *singleton; mutable Map<StringName, Action> input_map; - mutable Map<int,StringName> input_id_map; + mutable Map<int, StringName> input_id_map; - List<InputEvent>::Element *_find_event(List<InputEvent> &p_list,const InputEvent& p_event, bool p_action_test=false) const; + List<InputEvent>::Element *_find_event(List<InputEvent> &p_list, const InputEvent &p_event, bool p_action_test = false) const; - Array _get_action_list(const StringName& p_action); + Array _get_action_list(const StringName &p_action); Array _get_actions(); protected: - static void _bind_methods(); -public: +public: static _FORCE_INLINE_ InputMap *get_singleton() { return singleton; } - - bool has_action(const StringName& p_action) const; - int get_action_id(const StringName& p_action) const; + 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); + void add_action(const StringName &p_action); + void erase_action(const StringName &p_action); - void action_add_event(const StringName& p_action,const InputEvent& p_event); - bool action_has_event(const StringName& p_action,const InputEvent& p_event); - void action_erase_event(const StringName& p_action,const InputEvent& p_event); + void action_add_event(const StringName &p_action, const InputEvent &p_event); + bool action_has_event(const StringName &p_action, const InputEvent &p_event); + void action_erase_event(const StringName &p_action, const InputEvent &p_event); - const List<InputEvent> *get_action_list(const StringName& p_action); - bool event_is_action(const InputEvent& p_event, const StringName& p_action) const; + const List<InputEvent> *get_action_list(const StringName &p_action); + bool event_is_action(const InputEvent &p_event, const StringName &p_action) const; - const Map<StringName, Action>& get_action_map() const; + const Map<StringName, Action> &get_action_map() const; void load_from_globals(); void load_default(); |