summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkonsumlamm <konsumlamm@gmail.com>2019-06-21 20:56:58 +0200
committerkonsumlamm <konsumlamm@gmail.com>2019-06-21 20:56:58 +0200
commit36c89240a87ecb826cf09bc7b3069aa636c9f2f1 (patch)
tree208ca957394d4d736892629273bcfe4b9e63adf6
parent4392c7fca245b8702932fbc5e0ed011bc0c6f00c (diff)
update maths to math
-rw-r--r--webhogg/game_server/src/collide.rs4
-rw-r--r--webhogg/game_server/src/main.rs2
-rw-r--r--webhogg/game_server/src/webhogg_game.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/webhogg/game_server/src/collide.rs b/webhogg/game_server/src/collide.rs
index 16b5357..44ab311 100644
--- a/webhogg/game_server/src/collide.rs
+++ b/webhogg/game_server/src/collide.rs
@@ -1,4 +1,4 @@
-use crate::maths::{Vec2, AABox, RBox};
+use crate::math::{Vec2, AABox, RBox};
pub trait Collide<Rhs> {
fn collides(&self, other: &Rhs) -> bool;
@@ -12,7 +12,7 @@ impl Collide<Vec2> for Vec2 {
impl Collide<Vec2> for AABox {
fn collides(&self, other: &Vec2) -> bool {
- self.pos < *other && other < &(self.pos + self.size)
+ self.pos < *other && other < &(self.pos + self.size)
}
}
diff --git a/webhogg/game_server/src/main.rs b/webhogg/game_server/src/main.rs
index cfd9787..2db757b 100644
--- a/webhogg/game_server/src/main.rs
+++ b/webhogg/game_server/src/main.rs
@@ -1,5 +1,5 @@
mod group;
-mod maths;
+mod math;
mod scribble_group;
mod webhogg_group;
mod webhogg_game;
diff --git a/webhogg/game_server/src/webhogg_game.rs b/webhogg/game_server/src/webhogg_game.rs
index 7b94fcb..b3f35cc 100644
--- a/webhogg/game_server/src/webhogg_game.rs
+++ b/webhogg/game_server/src/webhogg_game.rs
@@ -1,4 +1,4 @@
-use crate::maths::Vec2;
+use crate::math::Vec2;
pub struct WebhoggPlayer {
pos: Vec2,