diff options
author | Dennis Kobert <d-kobert@web.de> | 2019-06-02 06:28:36 +0200 |
---|---|---|
committer | Dennis Kobert <d-kobert@web.de> | 2019-06-02 06:28:36 +0200 |
commit | 0f3d7f629491c8c2f2d1796bef9024d0564fbe97 (patch) | |
tree | 8a18e2f9666ffc8bc5322c7d34d10605bc8ae17e /game_server/src/collide.rs | |
parent | 0f7da3a189085cd16f90b210d0bb06798f715a57 (diff) | |
parent | e576f0bf4d118ac5be9e8b45fbbc4270ce1fd287 (diff) |
Merge branch 'dennis_rust' into webhogg
Diffstat (limited to 'game_server/src/collide.rs')
-rw-r--r-- | game_server/src/collide.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/game_server/src/collide.rs b/game_server/src/collide.rs index 21ec99c..7439101 100644 --- a/game_server/src/collide.rs +++ b/game_server/src/collide.rs @@ -38,7 +38,7 @@ impl Collide<Vec2> for RBox { let day = other.y - self.pos.y; let dot = dax * da.x + day * da.y; - let px = self.pos.x + dx * dot; + let px = self.pos.x + da.x * dot; let py = self.pos.y + da.y * dot; let p = Vec2{x: px, y: py}; @@ -55,7 +55,7 @@ impl Collide<Vec2> for RBox { } impl Collide<AABox> for RBox { - fn collides(&self, other: &Box) -> bool { + fn collides(&self, other: &AABox) -> bool { self.collides(&other.pos) || self.collides(&(other.pos + Vec2{x: other.size.x, y: 0.0})) || self.collides(&(other.pos + Vec2{x: 0.0, y: other.size.y})) |