1 files changed, 78 insertions, 9 deletions

diff --git a/game_server/src/maths.rs b/game_server/src/maths.rs
index 635eed6..a55c5ce 100644
--- a/game_server/src/maths.rs
+++ b/game_server/src/maths.rs
@@ -1,3 +1,4 @@
+#[derive(Clone, Copy)]
 pub struct Vec2 {
     pub x: f32,
     pub y: f32,
@@ -7,8 +8,8 @@ impl std::ops::Add for Vec2 {
     type Output = Self;
     fn add(self, other: Self) -> Self {
         Self {
-            x: x + other.x,
-            y: y + other.y
+            x: self.x + other.x,
+            y: self.y + other.y
         }
     }
 }
@@ -17,24 +18,35 @@ impl std::ops::Sub for Vec2 {
     type Output = Self;
     fn sub(self, other: Self) -> Self {
         Self {
-            x: x - other.x,
-            y: y - other.y
+            x: self.x - other.x,
+            y: self.y - other.y
         }
     }
 }
 
 impl std::ops::Neg for Vec2 {
     type Output = Self;
-    fn sub(self) -> Self {
+    fn neg(self) -> Self {
         Self {
-            x: -x,
-            y: -y
+            x: -self.x,
+            y: -self.y
         }
     }
 }
 
+impl std::cmp::PartialOrd for Vec2 {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(if self.x < other.x && self.y < other.y {
+            std::cmp::Ordering::Less
+        } else if self.x > other.x && self.y > other.y {
+            std::cmp::Ordering::Greater
+        } else {
+            std::cmp::Ordering::Equal
+        })
+    }
+}
+
 impl std::cmp::PartialEq for Vec2 {
-    type Output = bool;
     fn eq(&self, other: &Self) -> bool {
         f32::abs(self.x - other.x) < 1e-8
         && f32::abs(self.y - other.y) < 1e-8
@@ -45,10 +57,67 @@ impl std::cmp::Eq for Vec2 {}
 
 impl Vec2 {
     pub fn distance(&self) -> f32 {
-        f32::sqrt(self.distance2)
+        f32::sqrt(self.distance2())
     }
 
     pub fn distance2(&self) -> f32 {
         self.x * self.x + self.y * self.y
     }
 }
+
+pub struct Box {
+    pub pos: Vec2,
+    /// the size may not be smaller than zero
+    pub size: Vec2, 
+}
+
+impl std::ops::Add<Vec2> for Box {
+    type Output = Self;
+    fn add(self, other: Vec2) -> Self {
+        Self {
+            p1: self.p1 + other,
+            p2: self.p2 + other,
+        }
+    }
+}
+
+impl std::ops::Sub<Vec2> for Box {
+    type Output = Self;
+    fn sub(self, other: Vec2) -> Self {
+        Self {
+            pos: self.pos + other,
+            size: self.size + other
+        }
+    }
+}
+
+pub struct RBox {
+    /// Point 1
+    pub pos: Vec2,
+    /// Point 2
+    pub size: Vec2, 
+    /// Width Attention manhatten distance!!!
+    pub w: f32,
+}
+
+impl std::ops::Add<Vec2> for RBox {
+    type Output = Self;
+    fn add(self, other: Vec2) -> Self {
+        Self {
+            pos: self.p1 + other,
+            size: self.p2 + other,
+            w: self.w,
+        }
+    }
+}
+
+impl std::ops::Sub<Vec2> for RBox {
+    type Output = Self;
+    fn sub(self, other: Vec2) -> Self {
+        Self {
+            pos: self.p1 + other,
+            size: self.p2 + other,
+            w: self.w,
+        }
+    }
+}