Revert axis input changes

Author: MystMagus

core/input/input.cpp

@@ -1676,7 +1676,7 @@ void Input::joy_button(int p_device, JoyButton p_button, bool p_pressed) {
 	}
 
 	if (map.type == TYPE_AXIS) {
-		_axis_event(p_device, (JoyAxis)map.index, p_pressed ? map.value : 0.0, p_pressed ? 0.0 : map.value);
+		_axis_event(p_device, (JoyAxis)map.index, p_pressed ? map.value : 0.0);
 	}
 	// no event?
 }
@@ -1696,13 +1696,10 @@ void Input::joy_axis(int p_device, JoyAxis p_axis, float p_value) {
 		return;
 	}
 
-	float last_axis = joy.last_axis[(size_t)p_axis];
-	float last_val = last_axis;
 	joy.last_axis[(size_t)p_axis] = p_value;
-	float val = p_value;
 
 	if (joy.mapping == -1) {
-		_axis_event(p_device, p_axis, val, last_val);
+		_axis_event(p_device, p_axis, p_value);
 		return;
 	}
 
@@ -1753,7 +1750,7 @@ void Input::joy_axis(int p_device, JoyAxis p_axis, float p_value) {
 			value = 0.5f + value / 2.0f;
 		}
 #endif
-		_axis_event(p_device, axis, value, last_val);
+		_axis_event(p_device, axis, value);
 		return;
 	}
 }
@@ -1797,7 +1794,7 @@ void Input::joy_hat(int p_device, BitField<HatMask> p_val) {
 				_button_event(p_device, (JoyButton)map[hat_direction].index, (int)p_val & hat_mask);
 			}
 			if (map[hat_direction].type == TYPE_AXIS) {
-				_axis_event(p_device, (JoyAxis)map[hat_direction].index, ((int)p_val & hat_mask) ? map[hat_direction].value : 0.0, ((int)p_val & hat_mask) ? 0.0 : map[hat_direction].value);
+				_axis_event(p_device, (JoyAxis)map[hat_direction].index, ((int)p_val & hat_mask) ? map[hat_direction].value : 0.0);
 			}
 		}
 	}
@@ -1836,30 +1833,14 @@ void Input::_button_event(int p_device, JoyButton p_index, bool p_pressed) {
 	parse_input_event(ievent);
 }
 
-void Input::_axis_event(int p_device, JoyAxis p_axis, float p_value, float p_last_value) {
-	bool sign_diff = (p_last_value < 0) != (p_value < 0);
-	// Release event
-	if ((p_value == 0 && p_last_value != 0) || sign_diff) {
-		Ref<InputEventJoypadMotion> ievent;
-		ievent.instantiate();
-		ievent->set_device(p_device);
-		ievent->set_axis(p_axis);
-		ievent->set_axis_value(p_last_value < 0 ? -CMP_EPSILON : CMP_EPSILON);
-		ievent->set_axis_last_value(p_last_value);
-
-		parse_input_event(ievent);
-	}
-	// Active event
-	if (p_value != 0) {
-		Ref<InputEventJoypadMotion> ievent;
-		ievent.instantiate();
-		ievent->set_device(p_device);
-		ievent->set_axis(p_axis);
-		ievent->set_axis_value(p_value);
-		ievent->set_axis_last_value(!sign_diff ? p_last_value : 0);
+void Input::_axis_event(int p_device, JoyAxis p_axis, float p_value) {
+	Ref<InputEventJoypadMotion> ievent;
+	ievent.instantiate();
+	ievent->set_device(p_device);
+	ievent->set_axis(p_axis);
+	ievent->set_axis_value(p_value);
 
-		parse_input_event(ievent);
-	}
+	parse_input_event(ievent);
 }
 
 void Input::_update_action_cache(const StringName &p_action_name, ActionState &r_action_state) {

core/input/input.h

@@ -298,7 +298,7 @@ class Input : public Object {
 	JoyButton _get_output_button(const String &output);
 	JoyAxis _get_output_axis(const String &output);
 	void _button_event(int p_device, JoyButton p_index, bool p_pressed);
-	void _axis_event(int p_device, JoyAxis p_axis, float p_value, float p_last_value);
+	void _axis_event(int p_device, JoyAxis p_axis, float p_value);
 	void _update_action_cache(const StringName &p_action_name, ActionState &r_action_state);
 	void _update_joypad_features(int p_device);
 

core/input/input_event.cpp

@@ -1130,46 +1130,24 @@ float InputEventJoypadMotion::get_axis_value() const {
 	return axis_value;
 }
 
-void InputEventJoypadMotion::set_axis_last_value(float p_value) {
-
-	axis_last_value = p_value;
-}
-
-float InputEventJoypadMotion::get_axis_last_value() const {
-
-	return axis_last_value;
-}
-
-/*bool InputEventJoypadMotion::is_pressed() const {
-	return Math::abs(axis_value) >= 0.5f;
-}*/
-
-bool InputEventJoypadMotion::is_echo() const {
-	return Math::abs(axis_last_value) >= 0.5f;
-}
-
 bool InputEventJoypadMotion::action_match(const Ref<InputEvent> &p_event, bool p_exact_match, float p_deadzone, bool *r_pressed, float *r_strength, float *r_raw_strength) const {
 	Ref<InputEventJoypadMotion> jm = p_event;
 	if (jm.is_null()) {
 		return false;
 	}
 
+	// Matches even if not in the same direction, but returns a "not pressed" event.
 	bool match = axis == jm->axis;
 	if (p_exact_match) {
 		match &= (axis_value < 0) == (jm->axis_value < 0);
 	}
 	if (match) {
 		float jm_abs_axis_value = Math::abs(jm->get_axis_value());
-		bool same_direction = (((axis_value < 0) == (jm->axis_value < 0)) || (axis_value != 0 && jm->axis_value == 0));
-		if(!same_direction)
-			return false;
+		bool same_direction = (((axis_value < 0) == (jm->axis_value < 0)) || jm->axis_value == 0);
 		bool pressed_state = same_direction && jm_abs_axis_value >= p_deadzone;
 		if (r_pressed != nullptr) {
 			*r_pressed = pressed_state;
 		}
-		if(!pressed && Math::abs(jm->get_axis_last_value()) < p_deadzone) {
-			return false;
-		}
 		if (r_strength != nullptr) {
 			if (pressed_state) {
 				if (p_deadzone == 1.0f) {

core/input/input_event.h

@@ -313,7 +313,6 @@ class InputEventJoypadMotion : public InputEvent {
 	GDCLASS(InputEventJoypadMotion, InputEvent);
 	JoyAxis axis = (JoyAxis)0; ///< Joypad axis
 	float axis_value = 0; ///< -1 to 1
-	float axis_last_value = 0; ///< -1 to 1
 
 protected:
 	static void _bind_methods();
@@ -324,10 +323,6 @@ class InputEventJoypadMotion : public InputEvent {
 
 	void set_axis_value(float p_value);
 	float get_axis_value() const;
-	void set_axis_last_value(float p_value);
-	float get_axis_last_value() const;
-
-	virtual bool is_echo() const override;
 
 	virtual bool action_match(const Ref<InputEvent> &p_event, bool p_exact_match, float p_deadzone, bool *r_pressed, float *r_strength, float *r_raw_strength) const override;
 	virtual bool is_match(const Ref<InputEvent> &p_event, bool p_exact_match = true) const override;