diff options
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | Cargo.toml | 21 | ||||
| -rw-r--r-- | src/client_main.rs (renamed from src/client.rs) | 5 | ||||
| -rw-r--r-- | src/server_main.rs (renamed from src/server.rs) | 0 |
4 files changed, 21 insertions, 25 deletions
@@ -69,9 +69,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "cc" -version = "1.0.61" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" [[package]] name = "cfg-if" @@ -81,9 +81,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cmake" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb" +checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" dependencies = [ "cc", ] @@ -388,9 +388,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "raylib" -version = "3.0.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b222dc0fecd87b6a4272b2ebd80ca8c5435f5c0360c38ed2a2b2b3f6bd2c1f13" +checksum = "7d3df0dcf9b202552b74c715028224a04ca89443a1e4706382798aa6b13c85a0" dependencies = [ "lazy_static", "libc", @@ -399,9 +399,9 @@ dependencies = [ [[package]] name = "raylib-sys" -version = "3.0.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6909eb526b5f7a3f6f8b3904dc7acc4f433f4f8bd071a342b5139bab913fe7" +checksum = "0e2a71751cbdfb2beaa9ca806ec223525c182778e6ef123378898f99f1b1b30c" dependencies = [ "cc", "cmake", @@ -597,9 +597,9 @@ checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" [[package]] name = "xmltree" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76badaccb0313f1f0cb6582c2973f2dd0620f9652eb7a5ff6ced0cc3ac922b3" +checksum = "d046fd42d4137234742eae0d05b4fb6fbdda9aed7c78e523ae890fd87c7e11dd" dependencies = [ "xml-rs", ] @@ -5,27 +5,24 @@ authors = ["Arne Dußin <arne.dussin@gmail.com>"] edition = "2018" default-run = "client" -[build] -target = "client" - [[bin]] name = "client" -path = "src/client.rs" +path = "src/client_main.rs" [[bin]] name = "server" -path = "src/server.rs" +path = "src/server_main.rs" [dependencies] +alga = "*" +float-cmp = "*" +log = "*" +nalgebra = "*" +num-traits = "*" +pretty_env_logger = "*" raylib = "3.0.0" ron = "*" serde = "*" -nalgebra = "*" -alga = "*" -num-traits = "*" svgtypes = "*" -xmltree = "*" -pretty_env_logger = "*" -log = "*" thiserror = "*" -float-cmp = "*" +xmltree = "*" diff --git a/src/client.rs b/src/client_main.rs index 4ed5581..22251c3 100644 --- a/src/client.rs +++ b/src/client_main.rs @@ -30,7 +30,6 @@ pub mod gui; pub mod input; pub mod map; pub mod math; -pub mod server; pub mod snapping; pub mod stable_vec; pub mod svg; @@ -123,9 +122,9 @@ fn main() { last_mouse_pos = rl.get_mouse_position(); let mouse_wheel_move = rl.get_mouse_wheel_move(); - if mouse_wheel_move != 0 { + if mouse_wheel_move != 0. { // Zoom in for positive and zoom out for negative mouse wheel rotations. - let scale_factor = if mouse_wheel_move > 0 { 1.2 } else { 1. / 1.2 }; + let scale_factor = if mouse_wheel_move > 0. { 1.2 } else { 1. / 1.2 }; transform.try_zoom( &rl.get_mouse_position().into(), mouse_wheel_move.abs() as f64 * scale_factor, diff --git a/src/server.rs b/src/server_main.rs index e69de29..e69de29 100644 --- a/src/server.rs +++ b/src/server_main.rs |