asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8073 from Hinsbart/bind_parse_ev

Browse source 
Input: bind parse_input_event() [2.1]
This commit is contained in:
Rémi Verschelde 2017-03-19 10:00:00 +01:00 committed by GitHub
commit f4f0a6c609
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/os/input.cpp
View file

@ -81,6 +81,7 @@ void Input::_bind_methods() {
ObjectTypeDB::bind_method(_MD("action_press", "action"), &Input::action_press); ObjectTypeDB::bind_method(_MD("action_press", "action"), &Input::action_press);
ObjectTypeDB::bind_method(_MD("action_release", "action"), &Input::action_release); ObjectTypeDB::bind_method(_MD("action_release", "action"), &Input::action_release);
ObjectTypeDB::bind_method(_MD("set_custom_mouse_cursor", "image:Texture", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(Vector2())); ObjectTypeDB::bind_method(_MD("set_custom_mouse_cursor", "image:Texture", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(Vector2()));
ObjectTypeDB::bind_method(_MD("parse_input_event", "event"), &Input::parse_input_event);
BIND_CONSTANT(MOUSE_MODE_VISIBLE); BIND_CONSTANT(MOUSE_MODE_VISIBLE);
BIND_CONSTANT(MOUSE_MODE_HIDDEN); BIND_CONSTANT(MOUSE_MODE_HIDDEN);

2
core/os/input.h
View file

@ -99,6 +99,8 @@ public:
virtual int get_joy_button_index_from_string(String p_button) = 0; virtual int get_joy_button_index_from_string(String p_button) = 0;
virtual int get_joy_axis_index_from_string(String p_axis) = 0; virtual int get_joy_axis_index_from_string(String p_axis) = 0;
virtual void parse_input_event(const InputEvent &p_event) = 0;
Input(); Input();
}; };

3
main/input_default.h
View file

@ -185,7 +185,8 @@ public:
virtual void warp_mouse_pos(const Vector2 &p_to); virtual void warp_mouse_pos(const Vector2 &p_to);
void parse_input_event(const InputEvent &p_event); virtual void parse_input_event(const InputEvent &p_event);
void set_gravity(const Vector3 &p_gravity); void set_gravity(const Vector3 &p_gravity);
void set_accelerometer(const Vector3 &p_accel); void set_accelerometer(const Vector3 &p_accel);
void set_magnetometer(const Vector3 &p_magnetometer); void set_magnetometer(const Vector3 &p_magnetometer);