Fix passive mouse hovering for physics #78017
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RandomShaper
reviewed
Jun 9, 2023
scene/main/viewport.cpp
Outdated
Comment on lines
704
to
707
| mm->set_alt_pressed(Input::get_singleton()->is_physical_key_pressed(Key::ALT)); | ||
| mm->set_shift_pressed(Input::get_singleton()->is_physical_key_pressed(Key::SHIFT)); | ||
| mm->set_ctrl_pressed(Input::get_singleton()->is_physical_key_pressed(Key::CMD_OR_CTRL)); | ||
| mm->set_meta_pressed(Input::get_singleton()->is_physical_key_pressed(Key::META)); |
There was a problem hiding this comment.
Suggested change
| mm->set_alt_pressed(Input::get_singleton()->is_physical_key_pressed(Key::ALT)); | |
| mm->set_shift_pressed(Input::get_singleton()->is_physical_key_pressed(Key::SHIFT)); | |
| mm->set_ctrl_pressed(Input::get_singleton()->is_physical_key_pressed(Key::CMD_OR_CTRL)); | |
| mm->set_meta_pressed(Input::get_singleton()->is_physical_key_pressed(Key::META)); | |
| mm->set_alt_pressed(Input::get_singleton()->is_key_pressed(Key::ALT)); | |
| mm->set_shift_pressed(Input::get_singleton()->is_key_pressed(Key::SHIFT)); | |
| mm->set_ctrl_pressed(Input::get_singleton()->is_key_pressed(Key::CTRL)); | |
| mm->set_meta_pressed(Input::get_singleton()->is_key_pressed(Key::META)); |
I'm not super sure. What do you think?
There was a problem hiding this comment.
I'm not versed in these difference between is_physical_key_pressed and is_key_pressed and their implications, so I will accept your changes.
Have tested these changes with the MPRs of both linked issues.
Currently mouse hovering doesn't update the state, when collision objects or the camera move. This PR fixes this problem by taking the mouse position from the viewport and not from a nonexistent previous event. Since previous events could potentially be a long time ago, their modifier-key state might be outdated. This PR fetches the current status of modifier-keys from `Input`. These changes allow the removal of some class-variables and making additional simplifications.
Sauermann
force-pushed
the
fix-physics-passive-hovering
branch
from
23fb1a7
to
543fdc1
Compare
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently mouse hovering doesn't update the state, when collision objects or the camera move.
This PR fixes this problem by taking the mouse position from the viewport and not from a nonexistent previous event.
Since previous events could potentially be a long time ago, their modifier-key state might be outdated. This PR fetches the current status of modifier-keys from
Input.These changes allow the removal of some class-variables and making additional simplifications.
resolve #69708
resolve #75711