From 8e1fa5b1a2df63b2ce742bad30d12d6cbe4df6d5 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Thu, 23 Apr 2020 20:05:44 +0100 Subject: [PATCH] Downgraded minifb --- Cargo.lock | 134 +--------------------------------------- world/Cargo.toml | 2 +- world/examples/turb.rs | 2 +- world/examples/view.rs | 2 +- world/examples/water.rs | 2 +- 5 files changed, 6 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ebcf41d72..98cf25c4af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2589,23 +2589,17 @@ dependencies = [ [[package]] name = "minifb" -version = "0.16.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18d2987dac6afdd7f6d81101a3b422b7da3e6799d7f11863ad006d8ccd562b2" +checksum = "799c20458eb0dd69f48cea5014afe736b363818c86d7ca61dbb56e1c0585014c" dependencies = [ "cast", "cc", "orbclient", "raw-window-handle", - "tempfile", "time", - "wayland-client 0.25.0", - "wayland-cursor", - "wayland-protocols 0.25.0", "winapi 0.3.8", "x11-dl", - "xkb", - "xkbcommon-sys", ] [[package]] @@ -2734,19 +2728,6 @@ dependencies = [ "void", ] -[[package]] -name = "nix" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "void", -] - [[package]] name = "nodrop" version = "0.1.14" @@ -3966,12 +3947,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scoped_threadpool" version = "0.1.9" @@ -4431,20 +4406,6 @@ dependencies = [ "remove_dir_all", ] -[[package]] -name = "tempfile" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -dependencies = [ - "cfg-if", - "libc", - "rand 0.7.3", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.8", -] - [[package]] name = "term" version = "0.5.2" @@ -5256,22 +5217,6 @@ dependencies = [ "wayland-sys 0.23.6", ] -[[package]] -name = "wayland-client" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42cb608953ec8e132c7f53fde722cca9bfbf8b2071d685dbbb8df2b567fee8b" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix 0.17.0", - "scoped-tls", - "wayland-commons 0.25.0", - "wayland-scanner 0.25.0", - "wayland-sys 0.25.0", -] - [[package]] name = "wayland-commons" version = "0.21.13" @@ -5292,28 +5237,6 @@ dependencies = [ "wayland-sys 0.23.6", ] -[[package]] -name = "wayland-commons" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8caa2f106138cf71358c6a9e84468e4406069cec93cbd6dbfce92225fc175932" -dependencies = [ - "nix 0.17.0", - "once_cell", - "smallvec 1.2.0", - "wayland-sys 0.25.0", -] - -[[package]] -name = "wayland-cursor" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d774f69a6a4a9eac6d1a29cea45a4750ee7f997520421b2068f099a11b4cbba" -dependencies = [ - "wayland-client 0.25.0", - "wayland-sys 0.25.0", -] - [[package]] name = "wayland-protocols" version = "0.21.13" @@ -5339,18 +5262,6 @@ dependencies = [ "wayland-scanner 0.23.6", ] -[[package]] -name = "wayland-protocols" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f784a990d5fa6d846fa93eb8d3bb744ff1e6ec60c7f785b0a0ee2f1a1f20bee9" -dependencies = [ - "bitflags", - "wayland-client 0.25.0", - "wayland-commons 0.25.0", - "wayland-scanner 0.25.0", -] - [[package]] name = "wayland-scanner" version = "0.21.13" @@ -5373,17 +5284,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "wayland-scanner" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f45ddc08a8078f3efa96b5f413268cc9c53b30712891de081fbc1d5846fbc736" -dependencies = [ - "proc-macro2 1.0.9", - "quote 1.0.3", - "xml-rs", -] - [[package]] name = "wayland-sys" version = "0.21.13" @@ -5404,15 +5304,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "wayland-sys" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f9fc64f9045ad5ff491886a9460437655353e8be73c1b3f29f569342553319" -dependencies = [ - "dlib", -] - [[package]] name = "web-sys" version = "0.3.36" @@ -5576,27 +5467,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" -[[package]] -name = "xkb" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec02bc5de902aa579f3d2f2c522edaf40fa42963cbaffe645b058ddcc68fdb2" -dependencies = [ - "bitflags", - "libc", - "xkbcommon-sys", -] - -[[package]] -name = "xkbcommon-sys" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa434980dca02ebf28795d71e570dbb78316d095a228707efd6117bf8246d78b" -dependencies = [ - "libc", - "pkg-config", -] - [[package]] name = "xml-rs" version = "0.8.0" diff --git a/world/Cargo.toml b/world/Cargo.toml index 6a28140cc0..0ff1838510 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -29,4 +29,4 @@ ron = "0.5.1" [dev-dependencies] pretty_env_logger = "0.3.0" -minifb = "0.16.0" +minifb = "0.14.0" diff --git a/world/examples/turb.rs b/world/examples/turb.rs index aa4444c36f..8249feba9c 100644 --- a/world/examples/turb.rs +++ b/world/examples/turb.rs @@ -34,7 +34,7 @@ fn main() { } } - win.update_with_buffer(&buf, W, H).unwrap(); + win.update_with_buffer_size(&buf, W, H).unwrap(); _time += 1.0 / 60.0; } diff --git a/world/examples/view.rs b/world/examples/view.rs index 7fa4bd7c38..f80bbca0de 100644 --- a/world/examples/view.rs +++ b/world/examples/view.rs @@ -71,6 +71,6 @@ fn main() { scale -= 6; } - win.update_with_buffer(&buf, W, H).unwrap(); + win.update_with_buffer_size(&buf, W, H).unwrap(); } } diff --git a/world/examples/water.rs b/world/examples/water.rs index e9207bdbf5..5c6e35a834 100644 --- a/world/examples/water.rs +++ b/world/examples/water.rs @@ -252,6 +252,6 @@ fn main() { } } - win.update_with_buffer(&buf, W, H).unwrap(); + win.update_with_buffer_size(&buf, W, H).unwrap(); } }