godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix physics passive hovering for some cases

Browse Source 
When the parent `SubViewportContainer` ignores mouse with
`MOUSE_FILTER_IGNORE` and also when the mouse is over a `Control`-node,
then the `SubViewport` shouldn't create mouse-move-events for passive
hovering.
This commit is contained in:
Markus Sauermann 2023-07-13 23:23:08 +02:00
parent 60f3b7967c
commit b408b05d7d
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scene/main/viewport.cpp
View File

@ -689,17 +689,26 @@ void Viewport::_process_picking() {
PhysicsDirectSpaceState2D *ss2d = PhysicsServer2D::get_singleton()->space_get_direct_state(find_world_2d()->get_space()); PhysicsDirectSpaceState2D *ss2d = PhysicsServer2D::get_singleton()->space_get_direct_state(find_world_2d()->get_space());
bool has_mouse_event = false; SubViewportContainer *parent_svc = Object::cast_to<SubViewportContainer>(get_parent());
for (const Ref<InputEvent> &e : physics_picking_events) { bool parent_ignore_mouse = (parent_svc && parent_svc->get_mouse_filter() == Control::MOUSE_FILTER_IGNORE);
Ref<InputEventMouse> m = e; bool create_passive_hover_event = true;
if (m.is_valid()) { if (gui.mouse_over || parent_ignore_mouse) {
has_mouse_event = true; // When the mouse is over a Control node, passive hovering would cause input events for Colliders, that are behind Control nodes.
break; // When parent SubViewportContainer ignores mouse, that setting should be respected.
create_passive_hover_event = false;
} else {
for (const Ref<InputEvent> &e : physics_picking_events) {
Ref<InputEventMouse> m = e;
if (m.is_valid()) {
// A mouse event exists, so passive hovering isn't necessary.
create_passive_hover_event = false;
break;
}
} }
} }
if (!has_mouse_event) { if (create_passive_hover_event) {
// If no mouse event exists, create a motion one. This is necessary because objects or camera may have moved. // Create a mouse motion event. This is necessary because objects or camera may have moved.
// While this extra event is sent, it is checked if both camera and last object and last ID did not move. // While this extra event is sent, it is checked if both camera and last object and last ID did not move.
// If nothing changed, the event is discarded to avoid flooding with unnecessary motion events every frame. // If nothing changed, the event is discarded to avoid flooding with unnecessary motion events every frame.
Ref<InputEventMouseMotion> mm; Ref<InputEventMouseMotion> mm;