fix rect intersection #436
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
This fixes the intersection test for Rect when `self` is contained wholly within `arg` - it was already working for when `arg` was within `self`. Also simplifies math - rather than doing min+width, we can just use max.
michaelkirk
commented
Apr 1, 2020
| let x_overlap = value_in_range( | ||
| self.min().x, | ||
| bounding_rect.min().x, | ||
| bounding_rect.max().x |
There was a problem hiding this comment.
Simplified this math a bit.
width is computed as self.max().x - self.min().x
So this:
self.min().x + self.width()
previously expanded as:
self.min().x + self.max().x - self.min().x
Which is more simply self.max().x
michaelkirk
commented
Apr 1, 2020
| @@ -211,32 +211,27 @@ where | |||
| T: Float, | |||
| { | |||
| fn intersects(&self, bounding_rect: &Rect<T>) -> bool { | |||
| // line intersects inner or outer polygon edge | |||
| if bounding_rect.contains(self) { | |||
| false | |||
There was a problem hiding this comment.
This contains check is backwards. If a contains b then we should always consider the rects to intersect.
We could fix it by changing this to return true, but it's wholly redundant with the subsequent check for overlap, so I removed it altogether.
frewsxcv
approved these changes
Apr 2, 2020
|
bors r+ |
Build succeeded |
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.
Addendum to #420
This fixes the intersection test for Rect when
selfis containedwholly within
arg- it was already working for whenargwas withinselfas of #420