Add command-line arguments parsing, --server (#90) (#114)

* Add structopt dependency

* Add command-line --server argument to connect to server on startup

* Don't show login/server screen (which pings servers) when connecting to a server from command-line

Author: iceiix

Cargo.lock

@@ -38,6 +38,7 @@ collision = "0.19.0"
 aes = "0.3.2"
 cfb8 = "0.3.2"
 rsa_public_encrypt_pkcs1 = "0.2.0"
+structopt = "0.2.14"
 clipboard = { git = "https://github.com/aweinstock314/rust-clipboard", rev = "07d080be58a361a5bbdb548fafe9449843d968be" }
 # clippy = "*"
 

Cargo.toml

@@ -18,6 +18,8 @@ use std::time::{Instant, Duration};
 use log::{info, warn};
 extern crate steven_shared as shared;
 
+use structopt::StructOpt;
+
 #[macro_use]
 pub mod macros;
 
@@ -163,6 +165,14 @@ impl Game {
     }
 }
 
+#[derive(StructOpt, Debug)]
+#[structopt(name = "basic")]
+struct Opt {
+    /// Server to connect to
+    #[structopt(short = "s", long = "server")]
+    server: Option<String>,
+}
+
 cfg_if! {
     if #[cfg(target_arch = "wasm32")] {
         extern crate console_error_panic_hook;
@@ -175,6 +185,8 @@ cfg_if! {
 
 #[wasm_bindgen]
 pub fn main() {
+    let opt = Opt::from_args();
+
     set_panic_hook();
     std::env::set_var("RUST_BACKTRACE", "1");
 
@@ -226,14 +238,16 @@ pub fn main() {
     let frame_time = 1e9f64 / 60.0;
 
     let mut screen_sys = screen::ScreenSystem::new();
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        screen_sys.add_screen(Box::new(screen::Login::new(vars.clone())));
-    }
+    if opt.server.is_none() {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            screen_sys.add_screen(Box::new(screen::Login::new(vars.clone())));
+        }
 
-    #[cfg(target_arch = "wasm32")]
-    {
-        screen_sys.add_screen(Box::new(screen::ServerList::new(None)));
+        #[cfg(target_arch = "wasm32")]
+        {
+            screen_sys.add_screen(Box::new(screen::ServerList::new(None)));
+        }
     }
 
     let textures = renderer.get_textures();
@@ -259,6 +273,10 @@ pub fn main() {
     };
     game.renderer.camera.pos = cgmath::Point3::new(0.5, 13.2, 0.5);
 
+    if opt.server.is_some() {
+        game.connect_to(&opt.server.unwrap());
+    }
+
     let mut last_resource_version = 0;
     while !game.should_close {