Add rectangle containment check for points.

This commit is contained in:
Nolan Darilek 2022-03-14 17:14:54 -05:00
parent 7bb972c7b4
commit 20a14de05d

View File

@ -50,11 +50,16 @@ impl Rect {
Rect::new(x as usize, y as usize, width as usize, height as usize)
}
/// Returns true if this overlaps with other
/// Returns `true` if this overlaps with `other`
pub fn intersect(&self, other: &Rect) -> bool {
self.x1 <= other.x2 && self.x2 >= other.x1 && self.y1 <= other.y2 && self.y2 >= other.y1
}
/// Returns `true` if this contains `point`
pub fn contains(self, point: &Point) -> bool {
point.x > self.x1 && point.x < self.x2 && point.y > self.y1 && point.y < self.y2
}
pub fn center(&self) -> Point {
Point::new((self.x1 + self.x2) / 2, (self.y1 + self.y2) / 2)
}
@ -114,6 +119,18 @@ mod tests {
assert!(rect1.intersect(&rect2));
}
#[test]
fn test_contains() {
let rect = Rect::new(10, 10, 5, 5);
assert!(rect.contains(&rect.center()));
let p = Point::new(5, 5);
assert!(!rect.contains(&p));
let p = Point::new(10, 10);
assert!(!rect.contains(&p));
let p = Point::new(11, 11);
assert!(rect.contains(&p));
}
#[test]
fn test_size() {
let rect1 = Rect::new(10, 10, 40, 30);