alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 16:21:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

use copy implementation instead

Browse source
This commit is contained in:
Corwin 2022-10-31 20:31:37 +00:00
parent 2efddfc342
commit 44e0b633d9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agb-fixnum/src/lib.rs
View file

@ -819,7 +819,7 @@ impl<I: FixedWidthUnsignedInteger, const N: usize> From<Vector2D<I>> for Vector2
} }
} }
#[derive(Debug, PartialEq, Eq, Clone)] #[derive(Debug, PartialEq, Eq, Clone, Copy)]
/// A rectangle with a position in 2d space and a 2d size /// A rectangle with a position in 2d space and a 2d size
pub struct Rect<T: Number> { pub struct Rect<T: Number> {
/// The position of the rectangle /// The position of the rectangle
@ -875,7 +875,7 @@ impl<T: Number> Rect<T> {
/// let r2 = Rect::new(Vector2D::new(-10,-10), Vector2D::new(3,3)); /// let r2 = Rect::new(Vector2D::new(-10,-10), Vector2D::new(3,3));
/// assert!(!r.touches(r2)); /// assert!(!r.touches(r2));
/// ``` /// ```
pub fn touches(&self, other: &Rect<T>) -> bool { pub fn touches(&self, other: Rect<T>) -> bool {
self.position.x < other.position.x + other.size.x self.position.x < other.position.x + other.size.x
&& self.position.x + self.size.x > other.position.x && self.position.x + self.size.x > other.position.x
&& self.position.y < other.position.y + other.size.y && self.position.y < other.position.y + other.size.y
@ -900,7 +900,7 @@ impl<T: Number> Rect<T> {
/// ///
/// assert_eq!(r.overlapping_rect(r2), None); /// assert_eq!(r.overlapping_rect(r2), None);
/// ``` /// ```
pub fn overlapping_rect(&self, other: &Rect<T>) -> Option<Self> { pub fn overlapping_rect(&self, other: Rect<T>) -> Option<Self> {
if !self.touches(other) { if !self.touches(other) {
return None; return None;
} }