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/modules/navigation.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/modules/navigation.rs') diff --git a/src/modules/navigation.rs b/src/modules/navigation.rs index 11f3e94..03a9ca5 100644 --- a/src/modules/navigation.rs +++ b/src/modules/navigation.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use std::time::SystemTime; use crate::mass::Mass; -use crate::math::distance; +use crate::math::Vector; #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] pub enum NavigationStatus { @@ -52,14 +52,10 @@ impl Navigation { self.target_name = Some(target_name); } - pub fn verify_target( - &mut self, - ship_position: (f64, f64, f64), - masses: &HashMap, - ) { + pub fn verify_target(&mut self, ship_position: Vector, masses: &HashMap) { if let Some(name) = self.target_name.clone() { let target = masses.get(&name).unwrap(); - if distance(target.position, ship_position) > self.range { + if target.position.distance_from(ship_position) > self.range { self.target_name = None; self.status = NavigationStatus::None; } -- cgit v1.2.3