From 46fa862e04bc43311ba79ef3db70abf9014b9104 Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Sun, 3 Feb 2019 05:45:35 -0600
Subject: bringing to 2018

---
 src/modules/engines.rs | 66 ++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 37 deletions(-)

(limited to 'src/modules/engines.rs')

diff --git a/src/modules/engines.rs b/src/modules/engines.rs
index 4741a03..a930847 100644
--- a/src/modules/engines.rs
+++ b/src/modules/engines.rs
@@ -1,14 +1,14 @@
-use mass::Mass;
+use crate::mass::Mass;
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct Engines {
-    acceleration : (f64, f64, f64),
+    acceleration: (f64, f64, f64),
 }
 
 impl Engines {
     pub fn new() -> Engines {
         Engines {
-            acceleration : (0.0, 0.0, 0.0)
+            acceleration: (0.0, 0.0, 0.0),
         }
     }
 
@@ -18,7 +18,7 @@ impl Engines {
         acceleration
     }
 
-    pub fn give_client_data(&mut self, ship : &Mass, target : Option<&Mass>, data : String) {
+    pub fn give_client_data(&mut self, ship: &Mass, target: Option<&Mass>, data: String) {
         let mut acceleration = (0.0, 0.0, 0.0);
         match data.as_bytes() {
             b"5\n" => acceleration.0 += 0.1,
@@ -29,46 +29,38 @@ impl Engines {
             b"6\n" => acceleration.2 -= 0.1,
             b"+\n" => {
                 let m_v = ship.velocity;
-                acceleration = (m_v.0 * 0.05,
-                                m_v.1 * 0.05,
-                                m_v.2 * 0.05);
-            },
+                acceleration = (m_v.0 * 0.05, m_v.1 * 0.05, m_v.2 * 0.05);
+            }
             b"-\n" => {
                 let m_v = ship.velocity;
-                acceleration = (-1.0 * m_v.0 * 0.05,
-                                -1.0 * m_v.1 * 0.05,
-                                -1.0 * m_v.2 * 0.05);
-            },
+                acceleration = (
+                    -1.0 * m_v.0 * 0.05,
+                    -1.0 * m_v.1 * 0.05,
+                    -1.0 * m_v.2 * 0.05,
+                );
+            }
             b"s\n" => {
                 let m_v = ship.velocity;
-                acceleration = (-1.0 * m_v.0,
-                                -1.0 * m_v.1,
-                                -1.0 * m_v.2);
-            },
+                acceleration = (-1.0 * m_v.0, -1.0 * m_v.1, -1.0 * m_v.2);
+            }
             b"c\n" => {
-                match target {
-                    Some(target) => {
-                        let d_v = target.velocity;
-                        let m_v = ship.velocity;
-                        acceleration = (d_v.0 - m_v.0,
-                                        d_v.1 - m_v.1,
-                                        d_v.2 - m_v.2);
-                    },
-                    None => (),
+                if let Some(target) = target {
+                    let d_v = target.velocity;
+                    let m_v = ship.velocity;
+                    acceleration = (d_v.0 - m_v.0, d_v.1 - m_v.1, d_v.2 - m_v.2);
                 }
-            },
+            }
             b"t\n" => {
-                match target {
-                    Some(target) => {
-                        let d_p = target.position;
-                        let m_p = ship.position;
-                        acceleration = ((d_p.0 - m_p.0) * 0.01,
-                                        (d_p.1 - m_p.1) * 0.01,
-                                        (d_p.2 - m_p.2) * 0.01);
-                    },
-                    None => (),
+                if let Some(target) = target {
+                    let d_p = target.position;
+                    let m_p = ship.position;
+                    acceleration = (
+                        (d_p.0 - m_p.0) * 0.01,
+                        (d_p.1 - m_p.1) * 0.01,
+                        (d_p.2 - m_p.2) * 0.01,
+                    );
                 }
-            },
+            }
             _ => (),
         }
         self.acceleration = acceleration;
-- 
cgit v1.2.3