Add an additional input stage after physics picking

Allow handling events, that were not used during physics picking.

(cherry picked from commit d14035edccae40020226f3dced26969647e73a15)

1 files changed, 42 insertions, 0 deletions

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 06f912243a..37743d38cb 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -216,6 +216,10 @@ void Node::_notification(int p_notification) {
 				set_process_unhandled_key_input(true);
 			}
 
+			if (GDVIRTUAL_IS_OVERRIDDEN(_unhandled_picking_input)) {
+				set_process_unhandled_picking_input(true);
+			}
+
 			if (GDVIRTUAL_IS_OVERRIDDEN(_process)) {
 				set_process(true);
 			}
@@ -1280,6 +1284,27 @@ bool Node::is_processing_unhandled_key_input() const {
 	return data.unhandled_key_input;
 }
 
+void Node::set_process_unhandled_picking_input(bool p_enable) {
+	ERR_THREAD_GUARD
+	if (p_enable == data.unhandled_picking_input) {
+		return;
+	}
+	data.unhandled_picking_input = p_enable;
+	if (!is_inside_tree()) {
+		return;
+	}
+
+	if (p_enable) {
+		add_to_group("_vp_unhandled_picking_input" + itos(get_viewport()->get_instance_id()));
+	} else {
+		remove_from_group("_vp_unhandled_picking_input" + itos(get_viewport()->get_instance_id()));
+	}
+}
+
+bool Node::is_processing_unhandled_picking_input() const {
+	return data.unhandled_picking_input;
+}
+
 void Node::set_auto_translate_mode(AutoTranslateMode p_mode) {
 	ERR_THREAD_GUARD
 	if (data.auto_translate_mode == p_mode) {
@@ -3457,6 +3482,16 @@ void Node::_call_unhandled_key_input(const Ref<InputEvent> &p_event) {
 	unhandled_key_input(p_event);
 }
 
+void Node::_call_unhandled_picking_input(const Ref<InputEvent> &p_event) {
+	if (p_event->get_device() != InputEvent::DEVICE_ID_INTERNAL) {
+		GDVIRTUAL_CALL(_unhandled_picking_input, p_event);
+	}
+	if (!is_inside_tree() || !get_viewport() || get_viewport()->is_input_handled()) {
+		return;
+	}
+	unhandled_key_input(p_event);
+}
+
 void Node::_validate_property(PropertyInfo &p_property) const {
 	if ((p_property.name == "process_thread_group_order" || p_property.name == "process_thread_messages") && data.process_thread_group == PROCESS_THREAD_GROUP_INHERIT) {
 		p_property.usage = 0;
@@ -3475,6 +3510,9 @@ void Node::unhandled_input(const Ref<InputEvent> &p_event) {
 void Node::unhandled_key_input(const Ref<InputEvent> &p_key_event) {
 }
 
+void Node::unhandled_picking_input(const Ref<InputEvent> &p_picking_event) {
+}
+
 Variant Node::_call_deferred_thread_group_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	if (p_argcount < 1) {
 		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
@@ -3628,6 +3666,8 @@ void Node::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_processing_unhandled_input"), &Node::is_processing_unhandled_input);
 	ClassDB::bind_method(D_METHOD("set_process_unhandled_key_input", "enable"), &Node::set_process_unhandled_key_input);
 	ClassDB::bind_method(D_METHOD("is_processing_unhandled_key_input"), &Node::is_processing_unhandled_key_input);
+	ClassDB::bind_method(D_METHOD("set_process_unhandled_picking_input", "enable"), &Node::set_process_unhandled_picking_input);
+	ClassDB::bind_method(D_METHOD("is_processing_unhandled_picking_input"), &Node::is_processing_unhandled_picking_input);
 	ClassDB::bind_method(D_METHOD("set_process_mode", "mode"), &Node::set_process_mode);
 	ClassDB::bind_method(D_METHOD("get_process_mode"), &Node::get_process_mode);
 	ClassDB::bind_method(D_METHOD("can_process"), &Node::can_process);
@@ -3867,6 +3907,7 @@ void Node::_bind_methods() {
 	GDVIRTUAL_BIND(_shortcut_input, "event");
 	GDVIRTUAL_BIND(_unhandled_input, "event");
 	GDVIRTUAL_BIND(_unhandled_key_input, "event");
+	GDVIRTUAL_BIND(_unhandled_picking_input, "event");
 }
 
 String Node::_get_name_num_separator() {
@@ -3901,6 +3942,7 @@ Node::Node() {
 	data.shortcut_input = false;
 	data.unhandled_input = false;
 	data.unhandled_key_input = false;
+	data.unhandled_picking_input = false;
 
 	data.physics_interpolated = true;
 	data.physics_interpolation_reset_requested = false;