Fix mouse position with screen transform #77923
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 8, 2023
scene/main/viewport.cpp
Outdated
| @@ -1351,7 +1351,12 @@ Ref<InputEvent> Viewport::_make_input_local(const Ref<InputEvent> &ev) { | |||
|
|
|||
| Vector2 Viewport::get_mouse_position() const { | |||
| ERR_READ_THREAD_GUARD_V(Vector2()); | |||
| if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_MOUSE)) { | |||
| if (!is_inside_tree() || (Object::cast_to<SubViewport>(this) && !Object::cast_to<SubViewportContainer>(get_parent()))) { | |||
There was a problem hiding this comment.
I'm wondering if this condition can be rewritten based on some already existing is-attached-to-screen functionality or at least should be put in a new virtual bool is_attached_to_screen(), or the like.
Maybe not. It's that checking the type of this seems a bit odd.
There was a problem hiding this comment.
I am not aware of any existing functionality, that covers this.
is_attached_to_screen could be something like:
bool SubViewport::is_attached_to_screen() const {
return Object::cast_to<SubViewportContainer>(get_parent()) && get_parent()->get_viewport() && get_parent()->get_viewport()->is_attached_to_screen();
}
bool Window::is_attached_to_screen() const {
if (get_embedder()) {
return get_embedder()->is_attached_to_screen();
}
return is_inside_tree();
}Alternatively we could introduce a virtual function:
bool Viewport::is_window() const {
return true;
}
bool SubViewport::is_window() const {
return false;
}And replace Object::cast_to<SubViewport>(this) by !_is_window().
There was a problem hiding this comment.
I have updated the PR and introduced a is_directly_attached_to_screen method.
When a Viewport is not directly attached to the screen, the function `Viewport::get_mouse_position` can't rely on `get_screen_transform`, because that function is ambiguous in these situations. In these cases it is necessary to use the mouse position from the most recent mouse IputEvent.
Sauermann
force-pushed
the
fix-mouse-position-with-screen-transform
branch
from
90db2cf
to
d1fa284
Compare
RandomShaper
approved these changes
Jun 9, 2023
|
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.
When a Viewport is not in the scene tree or not a child of a
SubViewportContainer, the functionViewport::get_mouse_positioncan't rely onget_screen_transform, because that function is ambiguous in these situations.In these cases it is necessary to use the mouse position from the most recent mouse InputEvent.
resolve #74868