Browse Source

Merge pull request #8073 from Hinsbart/bind_parse_ev

Input: bind parse_input_event() [2.1]
Rémi Verschelde 8 years ago
parent
commit
f4f0a6c609
3 changed files with 5 additions and 1 deletions
  1. 1 0
      core/os/input.cpp
  2. 2 0
      core/os/input.h
  3. 2 1
      main/input_default.h

+ 1 - 0
core/os/input.cpp

@@ -81,6 +81,7 @@ void Input::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("action_press", "action"), &Input::action_press);
 	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("parse_input_event", "event"), &Input::parse_input_event);
 
 	BIND_CONSTANT(MOUSE_MODE_VISIBLE);
 	BIND_CONSTANT(MOUSE_MODE_HIDDEN);

+ 2 - 0
core/os/input.h

@@ -99,6 +99,8 @@ public:
 	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 void parse_input_event(const InputEvent &p_event) = 0;
+
 	Input();
 };
 

+ 2 - 1
main/input_default.h

@@ -185,7 +185,8 @@ public:
 
 	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_accelerometer(const Vector3 &p_accel);
 	void set_magnetometer(const Vector3 &p_magnetometer);