From f617213b4a48d73acd245580f8551a7c37ce9ad8 Mon Sep 17 00:00:00 2001 From: tom barrett Date: Sun, 10 Feb 2019 03:55:05 -0600 Subject: added vector math and tractorbeam module --- src/server/navigation.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/server/navigation.rs') diff --git a/src/server/navigation.rs b/src/server/navigation.rs index eb9095d..5143667 100644 --- a/src/server/navigation.rs +++ b/src/server/navigation.rs @@ -5,7 +5,6 @@ use std::io::BufRead; use std::io::Write; use crate::mass::{Mass, MassType}; -use crate::math::distance; use crate::server::connection::ServerConnection; impl ServerConnection { @@ -18,11 +17,11 @@ impl ServerConnection { } = ship.mass_type { let navigation = navigation.as_mut().unwrap(); - navigation.verify_target(ship_clone.position, &masses); + navigation.verify_target(ship_clone.position.clone(), &masses); let mut within_range: HashMap<&String, &Mass> = masses .iter() .filter(|&(_, mass)| { - distance(ship_clone.position, mass.position) < navigation.range + ship_clone.position.distance_from(mass.position.clone()) < navigation.range }) .collect(); within_range.insert(&self.name, &ship_clone); -- cgit v1.2.3