Removal of InputEvent as built-in Variant type..

this might cause bugs I haven't found yet..

4 files changed, 24 insertions, 35 deletions

diff --git a/main/tests/test_image.cpp b/main/tests/test_image.cpp
index c2c742e75d..0b120f87d5 100644
--- a/main/tests/test_image.cpp
+++ b/main/tests/test_image.cpp
@@ -41,7 +41,7 @@ class TestMainLoop : public MainLoop {
 	bool quit;
 
 public:
-	virtual void input_event(const InputEvent &p_event) {
+	virtual void input_event(const Ref<InputEvent> &p_event) {
 	}
 
 	virtual void init() {
diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp
index d32756937a..5a233e818e 100644
--- a/main/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
@@ -263,18 +263,19 @@ protected:
 	}
 
 public:
-	virtual void input_event(const InputEvent &p_event) {
+	virtual void input_event(const Ref<InputEvent> &p_event) {
 
-		if (p_event.type == InputEvent::MOUSE_MOTION && p_event.mouse_motion.button_mask & 4) {
+		Ref<InputEventMouseMotion> mm = p_event;
+		if (mm.is_valid() && mm->get_button_mask() & 4) {
 
-			ofs_y -= p_event.mouse_motion.relative_y / 200.0;
-			ofs_x += p_event.mouse_motion.relative_x / 200.0;
+			ofs_y -= mm->get_relative().y / 200.0;
+			ofs_x += mm->get_relative().x / 200.0;
 		}
 
-		if (p_event.type == InputEvent::MOUSE_MOTION && p_event.mouse_motion.button_mask & 1) {
+		if (mm.is_valid() && mm->get_button_mask() & 1) {
 
-			float y = -p_event.mouse_motion.relative_y / 20.0;
-			float x = p_event.mouse_motion.relative_x / 20.0;
+			float y = -mm->get_relative().y / 20.0;
+			float x = mm->get_relative().x / 20.0;
 
 			if (mover.is_valid()) {
 
@@ -285,19 +286,6 @@ public:
 				ps->body_set_state(mover, PhysicsServer::BODY_STATE_TRANSFORM, t);
 			}
 		}
-
-		if (p_event.type == InputEvent::JOYPAD_MOTION) {
-
-			if (p_event.joy_motion.axis == 0) {
-
-				joy_direction.x = p_event.joy_motion.axis_value;
-			};
-
-			if (p_event.joy_motion.axis == 1) {
-
-				joy_direction.y = p_event.joy_motion.axis_value;
-			};
-		};
 	}
 
 	virtual void request_quit() {
diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
index d8a00a589a..5f57275503 100644
--- a/main/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
@@ -208,35 +208,36 @@ class TestPhysics2DMainLoop : public MainLoop {
 	}
 
 protected:
-	void input_event(const InputEvent &p_event) {
+	void input_event(const Ref<InputEvent> &p_event) {
 
-		if (p_event.type == InputEvent::MOUSE_BUTTON) {
+		Ref<InputEventMouseButton> mb = p_event;
 
-			const InputEventMouseButton &mb = p_event.mouse_button;
+		if (mb.is_valid()) {
 
-			if (mb.pressed) {
+			if (mb->is_pressed()) {
 
-				Point2 p(mb.x, mb.y);
+				Point2 p(mb->get_pos().x, mb->get_pos().y);
 
-				if (mb.button_index == 1) {
+				if (mb->get_button_index() == 1) {
 					ray_to = p;
 					_do_ray_query();
-				} else if (mb.button_index == 2) {
+				} else if (mb->get_button_index() == 2) {
 					ray_from = p;
 					_do_ray_query();
 				}
 			}
 		}
-		if (p_event.type == InputEvent::MOUSE_MOTION) {
 
-			const InputEventMouseMotion &mm = p_event.mouse_motion;
+		Ref<InputEventMouseMotion> mm = p_event;
 
-			Point2 p(mm.x, mm.y);
+		if (mm.is_valid()) {
 
-			if (mm.button_mask & BUTTON_MASK_LEFT) {
+			Point2 p = mm->get_pos();
+
+			if (mm->get_button_mask() & BUTTON_MASK_LEFT) {
 				ray_to = p;
 				_do_ray_query();
-			} else if (mm.button_mask & BUTTON_MASK_RIGHT) {
+			} else if (mm->get_button_mask() & BUTTON_MASK_RIGHT) {
 				ray_from = p;
 				_do_ray_query();
 			}
diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp
index 89bd5db60f..74f7453d1b 100644
--- a/main/tests/test_render.cpp
+++ b/main/tests/test_render.cpp
@@ -64,9 +64,9 @@ class TestMainLoop : public MainLoop {
 
 protected:
 public:
-	virtual void input_event(const InputEvent &p_event) {
+	virtual void input_event(const Ref<InputEvent> &p_event) {
 
-		if (p_event.type == InputEvent::KEY && p_event.key.pressed)
+		if (p_event->is_pressed())
 			quit = true;
 	}