Fix check that cursor position is within window bounds #9662
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
|
A fix (for the first issue you mentioned) was just merged: #9657 |
|
Should I open a new PR for the second issue (and close this one)? |
|
Feel free to modify this PR. Just making sure you know that the code just changed underneath you. |
|
I modified the commit and the PR description accordingly. |
alice-i-cecile
added
C-Bug
alice-i-cecile
requested changes
Aug 31, 2023
|
Tests added. |
alice-i-cecile
approved these changes
Sep 1, 2023
alice-i-cecile
added
the
S-Ready-For-Final-Review
rdrpenguin04
pushed a commit
to rdrpenguin04/bevy
that referenced
this pull request
Jan 9, 2024
# Objective The recently introduced check that the cursor position returned by `Window::cursor_position()` is within the bounds of the window (bevyengine@3cf94e7) has the following issue: If *w* is the window width, points within the window satisfy the condition 0 ≤ *x* < *w*, but the code assumes the condition 0 ≤ *x* ≤ *w*. In other words, if *x* = *w*, the point is not within the window bounds. Likewise for the height. This program demonstrates the issue: ```rust use bevy::{prelude::*, window::WindowResolution}; fn main() { let mut window = Window { resolution: WindowResolution::new(100.0, 100.0), ..default() }; window.set_cursor_position(Some(Vec2::new(100.0, 0.0))); println!("{:?}", window.cursor_position()); } ``` It prints `Some(Vec2(100.0, 0.0))` instead of the expected `None`. ## Solution - Exclude the upper bound, i.e., the window width for the *x* position and the window height for the *y* position.
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.
Objective
The recently introduced check that the cursor position returned by
Window::cursor_position()is within the bounds of the window (3cf94e7) has the following issue:If w is the window width, points within the window satisfy the condition 0 ≤ x < w, but the code assumes the condition 0 ≤ x ≤ w. In other words, if x = w, the point is not within the window bounds. Likewise for the height. This program demonstrates the issue:
It prints
Some(Vec2(100.0, 0.0))instead of the expectedNone.Solution