commit 4e822abc183acfa82389b86b23fda43fda4dc6a8
parent 9fdcfbf0319894cdcf70ccd9036085a58ba7302b
Author: MTRNord <mtrnord1@gmail.com>
Date: Sat, 3 Apr 2021 14:58:45 +0200
Make it compile with newest bevy
Took 1 hour 1 minute
Diffstat:
5 files changed, 238 insertions(+), 634 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -25,15 +25,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9fe5e32de01730eb1f6b7f5b51c17e03e2325bf40a74f754f04f130043affff"
[[package]]
-name = "addr2line"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
-dependencies = [
- "gimli",
-]
-
-[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -83,14 +74,14 @@ dependencies = [
[[package]]
name = "alsa"
-version = "0.4.3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb213f6b3e4b1480a60931ca2035794aa67b73103d254715b1db7b70dcb3c934"
+checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18"
dependencies = [
"alsa-sys",
"bitflags",
"libc",
- "nix 0.15.0",
+ "nix",
]
[[package]]
@@ -138,9 +129,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
+checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
[[package]]
name = "anymap"
@@ -164,12 +155,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
-name = "ascii"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e"
-
-[[package]]
name = "ash"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -216,20 +201,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
-name = "backtrace"
-version = "0.3.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
-dependencies = [
- "addr2line",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide 0.4.4",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
name = "base-x"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -244,10 +215,11 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bevy"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_dylib",
"bevy_internal",
+ "syn",
]
[[package]]
@@ -275,10 +247,11 @@ dependencies = [
[[package]]
name = "bevy_app"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_derive 0.4.0",
"bevy_ecs 0.4.0",
+ "bevy_reflect",
"bevy_utils 0.4.0",
"serde",
"wasm-bindgen",
@@ -302,7 +275,7 @@ dependencies = [
"downcast-rs",
"js-sys",
"log",
- "ndk-glue",
+ "ndk-glue 0.2.1",
"notify",
"parking_lot",
"rand 0.7.3",
@@ -318,7 +291,7 @@ dependencies = [
[[package]]
name = "bevy_asset"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"anyhow",
"bevy_app 0.4.0",
@@ -331,7 +304,7 @@ dependencies = [
"crossbeam-channel 0.5.0",
"downcast-rs",
"js-sys",
- "ndk-glue",
+ "ndk-glue 0.2.1",
"notify",
"parking_lot",
"rand 0.8.3",
@@ -346,7 +319,7 @@ dependencies = [
[[package]]
name = "bevy_audio"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"anyhow",
"bevy_app 0.4.0",
@@ -361,7 +334,7 @@ dependencies = [
[[package]]
name = "bevy_core"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_derive 0.4.0",
@@ -389,7 +362,7 @@ dependencies = [
[[package]]
name = "bevy_derive"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"Inflector",
"find-crate",
@@ -401,7 +374,7 @@ dependencies = [
[[package]]
name = "bevy_diagnostic"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_core",
@@ -428,7 +401,7 @@ dependencies = [
[[package]]
name = "bevy_dylib"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_internal",
]
@@ -436,7 +409,7 @@ dependencies = [
[[package]]
name = "bevy_dynamic_plugin"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"libloading 0.7.0",
@@ -462,17 +435,17 @@ dependencies = [
[[package]]
name = "bevy_ecs"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"async-channel",
"bevy_ecs_macros",
+ "bevy_reflect",
"bevy_tasks 0.4.0",
"bevy_utils 0.4.0",
"bitflags",
"downcast-rs",
- "fixedbitset 0.3.2",
+ "fixedbitset 0.4.0",
"fxhash",
- "lazy_static",
"parking_lot",
"rand 0.8.3",
"serde",
@@ -482,7 +455,7 @@ dependencies = [
[[package]]
name = "bevy_ecs_macros"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"find-crate",
"proc-macro2",
@@ -493,7 +466,7 @@ dependencies = [
[[package]]
name = "bevy_gilrs"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_ecs 0.4.0",
@@ -505,7 +478,7 @@ dependencies = [
[[package]]
name = "bevy_gltf"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"anyhow",
"base64",
@@ -550,7 +523,7 @@ dependencies = [
[[package]]
name = "bevy_input"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_ecs 0.4.0",
@@ -561,7 +534,7 @@ dependencies = [
[[package]]
name = "bevy_internal"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_asset 0.4.0",
@@ -589,26 +562,13 @@ dependencies = [
"bevy_wgpu",
"bevy_window",
"bevy_winit",
- "ndk-glue",
-]
-
-[[package]]
-name = "bevy_ldtk"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806b2173ce11aa40ff204c6a184f50ee034ff4b34bbcc21c32170be6d8b6c094"
-dependencies = [
- "anyhow",
- "bevy",
- "ldtk",
- "serde_json",
- "thiserror",
+ "ndk-glue 0.2.1",
]
[[package]]
name = "bevy_log"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"android_log-sys 0.2.0",
"bevy_app 0.4.0",
@@ -630,16 +590,16 @@ dependencies = [
[[package]]
name = "bevy_math"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_reflect",
- "glam 0.12.0",
+ "glam 0.13.1",
]
[[package]]
name = "bevy_pbr"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_asset 0.4.0",
@@ -698,15 +658,13 @@ dependencies = [
[[package]]
name = "bevy_reflect"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
- "bevy_app 0.4.0",
- "bevy_ecs 0.4.0",
"bevy_reflect_derive",
"bevy_utils 0.4.0",
"downcast-rs",
"erased-serde",
- "glam 0.12.0",
+ "glam 0.13.1",
"parking_lot",
"serde",
"smallvec",
@@ -716,7 +674,7 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"find-crate",
"proc-macro2",
@@ -728,7 +686,7 @@ dependencies = [
[[package]]
name = "bevy_render"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"anyhow",
"bevy-glsl-to-spirv",
@@ -759,7 +717,7 @@ dependencies = [
[[package]]
name = "bevy_scene"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"anyhow",
"bevy_app 0.4.0",
@@ -778,7 +736,7 @@ dependencies = [
[[package]]
name = "bevy_sprite"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_asset 0.4.0",
@@ -790,6 +748,7 @@ dependencies = [
"bevy_render",
"bevy_transform",
"bevy_utils 0.4.0",
+ "bevy_window",
"guillotiere",
"rectangle-pack",
"serde",
@@ -813,7 +772,7 @@ dependencies = [
[[package]]
name = "bevy_tasks"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"async-channel",
"async-executor",
@@ -827,7 +786,7 @@ dependencies = [
[[package]]
name = "bevy_text"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"ab_glyph",
"anyhow",
@@ -849,7 +808,7 @@ dependencies = [
[[package]]
name = "bevy_transform"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_ecs 0.4.0",
@@ -878,7 +837,7 @@ dependencies = [
[[package]]
name = "bevy_ui"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_asset 0.4.0",
@@ -913,7 +872,7 @@ dependencies = [
[[package]]
name = "bevy_utils"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"ahash 0.7.2",
"getrandom 0.2.2",
@@ -925,7 +884,7 @@ dependencies = [
[[package]]
name = "bevy_wgpu"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_asset 0.4.0",
@@ -946,7 +905,7 @@ dependencies = [
[[package]]
name = "bevy_window"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_ecs 0.4.0",
@@ -958,7 +917,7 @@ dependencies = [
[[package]]
name = "bevy_winit"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=f520a341d5737600dbf89015b7729109d67cf041#f520a341d5737600dbf89015b7729109d67cf041"
dependencies = [
"bevy_app 0.4.0",
"bevy_ecs 0.4.0",
@@ -1103,12 +1062,6 @@ dependencies = [
]
[[package]]
-name = "chunked_transfer"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
-
-[[package]]
name = "clang-sys"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1167,19 +1120,6 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "combine"
-version = "3.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680"
-dependencies = [
- "ascii",
- "byteorder",
- "either",
- "memchr",
- "unreachable",
-]
-
-[[package]]
-name = "combine"
version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e"
@@ -1208,39 +1148,6 @@ dependencies = [
]
[[package]]
-name = "const_fn"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
-
-[[package]]
-name = "cookie"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
-[[package]]
-name = "cookie_store"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3"
-dependencies = [
- "cookie",
- "idna",
- "log",
- "publicsuffix",
- "serde",
- "serde_json",
- "time",
- "url",
-]
-
-[[package]]
name = "copyless"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1346,9 +1253,9 @@ dependencies = [
[[package]]
name = "coreaudio-rs"
-version = "0.9.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
+checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
dependencies = [
"bitflags",
"coreaudio-sys",
@@ -1365,21 +1272,21 @@ dependencies = [
[[package]]
name = "cpal"
-version = "0.13.1"
+version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05631e2089dfa5d3b6ea1cfbbfd092e2ee5deeb69698911bc976b28b746d3657"
+checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25"
dependencies = [
"alsa",
"core-foundation-sys 0.6.2",
"coreaudio-rs",
- "jni 0.17.0",
+ "jni",
"js-sys",
"lazy_static",
"libc",
"mach 0.3.2",
- "ndk",
- "ndk-glue",
- "nix 0.15.0",
+ "ndk 0.3.0",
+ "ndk-glue 0.3.0",
+ "nix",
"oboe",
"parking_lot",
"stdweb 0.1.3",
@@ -1574,16 +1481,6 @@ dependencies = [
]
[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "backtrace",
- "version_check",
-]
-
-[[package]]
name = "euclid"
version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1608,17 +1505,6 @@ dependencies = [
]
[[package]]
-name = "fetch_unroll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d44807d562d137f063cbfe209da1c3f9f2fa8375e11166ef495daab7b847f9"
-dependencies = [
- "libflate",
- "tar",
- "ureq",
-]
-
-[[package]]
name = "filetime"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1652,6 +1538,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45e780567ed7abc415d12fd464571d265eb4a5710ddc97cdb1a31a4c35bb479d"
[[package]]
+name = "fixedbitset"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
+
+[[package]]
name = "fnv"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1673,16 +1565,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
name = "fsevent"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1974,9 +1856,9 @@ dependencies = [
[[package]]
name = "gif"
-version = "0.11.1"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02efba560f227847cb41463a7395c514d127d4f74fff12ef0137fff1b84b96c4"
+checksum = "5a668f699973d0f573d15749b7002a9ac9e1f9c6b220e7b165601334c173d8de"
dependencies = [
"color_quant",
"weezl",
@@ -1984,30 +1866,29 @@ dependencies = [
[[package]]
name = "gilrs"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b64ac678e1174eb012be1cfd409ff2483f23cb79bc880ce4737147245b0fbff"
+checksum = "0e986f911d937f4395dfc2a39618dcef452773d32dcdbe0828c623f76588f749"
dependencies = [
"fnv",
"gilrs-core",
"log",
- "stdweb 0.4.20",
"uuid",
"vec_map",
]
[[package]]
name = "gilrs-core"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1024d4046c5c67d2adb8c90f6ed235163b58e05d35a63bf699b53f0cceeba2c6"
+checksum = "9a5e5bb97bf9a0d9519a28cf38839cf1d6d9bb572b48e3c67202271fec2ed5e7"
dependencies = [
"core-foundation 0.6.4",
"io-kit-sys",
"libc",
"libudev-sys",
"log",
- "nix 0.18.0",
+ "nix",
"rusty-xinput",
"stdweb 0.4.20",
"uuid",
@@ -2016,12 +1897,6 @@ dependencies = [
]
[[package]]
-name = "gimli"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
-
-[[package]]
name = "glam"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2032,21 +1907,15 @@ dependencies = [
[[package]]
name = "glam"
-version = "0.12.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad8819b352632f676098176a51e11e324e8cee4c2518dd67e58c36b848438e6"
+checksum = "70155b56080764b8b758e91e4c63d06da0262c0c939f2cd991cd1382087147df"
dependencies = [
"serde",
- "version_check",
+ "spirv-std",
]
[[package]]
-name = "glam"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27e6eecbd94ac86b2e1f3b0065ed5f17c097c15d668dddb84208a141e271403b"
-
-[[package]]
name = "glob"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2171,15 +2040,6 @@ dependencies = [
]
[[package]]
-name = "heck"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
name = "hermit-abi"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2200,7 +2060,7 @@ version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c592a42961cf144138e04a4bddbe3ef5c6f9fe6ef5eff6fd3bb767b254194171"
dependencies = [
- "glam 0.13.0",
+ "glam 0.13.1",
"lazy_static",
]
@@ -2211,17 +2071,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
-name = "idna"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
name = "image"
version = "0.23.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2321,29 +2170,15 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "jni"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1981310da491a4f0f815238097d0d43d8072732b5ae5f8bd0d8eadf5bf245402"
-dependencies = [
- "cesu8",
- "combine 3.8.1",
- "error-chain",
- "jni-sys",
- "log",
- "walkdir",
-]
-
-[[package]]
-name = "jni"
-version = "0.17.0"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36bcc950632e48b86da402c5c077590583da5ac0d480103611d5374e7c967a3c"
+checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf"
dependencies = [
"cesu8",
- "combine 4.5.2",
- "error-chain",
+ "combine",
"jni-sys",
"log",
+ "thiserror",
"walkdir",
]
@@ -2416,40 +2251,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
-name = "ldtk"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e561eff6c038cf2aec0be43647306b754d2e83bf12d277da99460ece9c483cb"
-dependencies = [
- "heck",
- "quote",
- "serde",
- "serde_json",
-]
-
-[[package]]
name = "libc"
-version = "0.2.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "538c092e5586f4cdd7dd8078c4a79220e3e168880218124dcbce860f0ea938c6"
-
-[[package]]
-name = "libflate"
-version = "1.0.4"
+version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158ae2ca09a761eaf6050894f5a6f013f2773dafe24f67bfa73a7504580e2916"
-dependencies = [
- "adler32",
- "crc32fast",
- "libflate_lz77",
- "rle-decode-fast",
-]
-
-[[package]]
-name = "libflate_lz77"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3286f09f7d4926fc486334f28d8d2e6ebe4f7f9994494b6dab27ddfad2c9b11b"
+checksum = "56d855069fafbb9b344c0f962150cd2c1187975cb1c22c1522c240d8c4986714"
[[package]]
name = "libloading"
@@ -2478,6 +2283,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
[[package]]
+name = "libm"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
+
+[[package]]
name = "libudev-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2489,9 +2300,9 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
dependencies = [
"scopeguard",
]
@@ -2542,12 +2353,6 @@ dependencies = [
]
[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
-[[package]]
name = "maybe-uninit"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2561,9 +2366,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "memoffset"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
dependencies = [
"autocfg",
]
@@ -2642,13 +2447,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.7.10"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839"
+checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956"
dependencies = [
"libc",
"log",
- "miow 0.3.6",
+ "miow 0.3.7",
"ntapi",
"winapi 0.3.9",
]
@@ -2679,11 +2484,10 @@ dependencies = [
[[package]]
name = "miow"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
dependencies = [
- "socket2",
"winapi 0.3.9",
]
@@ -2711,7 +2515,19 @@ checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
dependencies = [
"jni-sys",
"ndk-sys",
- "num_enum",
+ "num_enum 0.4.3",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
+dependencies = [
+ "jni-sys",
+ "ndk-sys",
+ "num_enum 0.5.1",
"thiserror",
]
@@ -2725,7 +2541,21 @@ dependencies = [
"lazy_static",
"libc",
"log",
- "ndk",
+ "ndk 0.2.1",
+ "ndk-macro",
+ "ndk-sys",
+]
+
+[[package]]
+name = "ndk-glue"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "ndk 0.3.0",
"ndk-macro",
"ndk-sys",
]
@@ -2762,26 +2592,13 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 0.1.10",
- "libc",
- "void",
-]
-
-[[package]]
-name = "nix"
-version = "0.18.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
"bitflags",
"cc",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"libc",
]
@@ -2820,7 +2637,7 @@ dependencies = [
"fsevent-sys",
"inotify",
"libc",
- "mio 0.7.10",
+ "mio 0.7.11",
"walkdir",
"winapi 0.3.9",
]
@@ -2884,6 +2701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
+ "libm 0.2.1",
]
[[package]]
@@ -2903,7 +2721,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
dependencies = [
"derivative",
- "num_enum_derive",
+ "num_enum_derive 0.4.3",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
+dependencies = [
+ "derivative",
+ "num_enum_derive 0.5.1",
]
[[package]]
@@ -2919,6 +2747,18 @@ dependencies = [
]
[[package]]
+name = "num_enum_derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "objc"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2938,20 +2778,14 @@ dependencies = [
]
[[package]]
-name = "object"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
-
-[[package]]
name = "oboe"
-version = "0.3.1"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aadc2b0867bdbb9a81c4d99b9b682958f49dbea1295a81d2f646cca2afdd9fc"
+checksum = "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4"
dependencies = [
- "jni 0.14.0",
- "ndk",
- "ndk-glue",
+ "jni",
+ "ndk 0.3.0",
+ "ndk-glue 0.3.0",
"num-derive",
"num-traits",
"oboe-sys",
@@ -2959,11 +2793,11 @@ dependencies = [
[[package]]
name = "oboe-sys"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ff7a51600eabe34e189eec5c995a62f151d8d97e5fbca39e87ca738bb99b82"
+checksum = "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103"
dependencies = [
- "fetch_unroll",
+ "cc",
]
[[package]]
@@ -3080,40 +2914,15 @@ dependencies = [
]
[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
dependencies = [
"unicode-xid",
]
[[package]]
-name = "publicsuffix"
-version = "1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f"
-dependencies = [
- "idna",
- "url",
-]
-
-[[package]]
-name = "qstring"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3254,9 +3063,9 @@ dependencies = [
[[package]]
name = "rectangle-pack"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e509b8eba9ca1884760ad1e2161cece724d4fd2b4cb47ddc01706920c6500cd7"
+checksum = "831eb2fcb5b72b09c72a3f2d24c09a28d79886512827cd4674d9bac10557f16a"
[[package]]
name = "redox_syscall"
@@ -3295,31 +3104,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rle-decode-fast"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"
-
-[[package]]
name = "rodio"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9683532495146e98878d4948fa1a1953f584cd923f2a5f5c26b7a8701b56943"
+checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f"
dependencies = [
"cpal",
"minimp3",
@@ -3337,12 +3125,6 @@ dependencies = [
]
[[package]]
-name = "rustc-demangle"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
-
-[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3358,19 +3140,6 @@ dependencies = [
]
[[package]]
-name = "rustls"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
-dependencies = [
- "base64",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
name = "rusty-xinput"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3409,16 +3178,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
-name = "sct"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
name = "semver"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3435,18 +3194,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.124"
+version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.124"
+version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
+checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
dependencies = [
"proc-macro2",
"quote",
@@ -3538,17 +3297,6 @@ dependencies = [
]
[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
name = "spin"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3569,6 +3317,27 @@ dependencies = [
]
[[package]]
+name = "spirv-std"
+version = "0.4.0-alpha.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6de6f1b80004dfc3e9e02fdf8eb32c663f3b85e3942f39d02b6540ed0d2460dd"
+dependencies = [
+ "num-traits",
+ "spirv-std-macros",
+]
+
+[[package]]
+name = "spirv-std-macros"
+version = "0.4.0-alpha.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4972082b5236fd57a46cc47fbc315ad78b5ad07b33e51077c688a2fe28d6f2d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "spirv_cross"
version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3590,15 +3359,6 @@ dependencies = [
]
[[package]]
-name = "standback"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2beb4d1860a61f571530b3f855a1b538d0200f7871c63331ecd6f17b1f014f8"
-dependencies = [
- "version_check",
-]
-
-[[package]]
name = "stdweb"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3671,7 +3431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b0dc6d20ce137f302edf90f9cd3d278866fd7fb139efca6f246161222ad6d87"
dependencies = [
"lazy_static",
- "libm",
+ "libm 0.1.4",
]
[[package]]
@@ -3688,9 +3448,9 @@ checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
[[package]]
name = "syn"
-version = "1.0.64"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
+checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663"
dependencies = [
"proc-macro2",
"quote",
@@ -3698,17 +3458,6 @@ dependencies = [
]
[[package]]
-name = "tar"
-version = "0.4.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
name = "thiserror"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3755,59 +3504,6 @@ dependencies = [
]
[[package]]
-name = "time"
-version = "0.2.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372"
-dependencies = [
- "const_fn",
- "libc",
- "standback",
- "stdweb 0.4.20",
- "time-macros",
- "version_check",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
-[[package]]
-name = "time-macros-impl"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
name = "toml"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3914,89 +3610,18 @@ version = "0.1.0"
dependencies = [
"bevy",
"bevy_discovery",
- "bevy_ldtk",
"bevy_prototype_inline_assets",
"noise",
"rand 0.8.3",
]
[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
-
-[[package]]
name = "unicode-xid"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
-name = "unreachable"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-dependencies = [
- "void",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "ureq"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "294b85ef5dbc3670a72e82a89971608a1fcc4ed5c7c5a2895230d31a95f0569b"
-dependencies = [
- "base64",
- "chunked_transfer",
- "cookie",
- "cookie_store",
- "log",
- "once_cell",
- "qstring",
- "rustls",
- "url",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "url"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
name = "uuid"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4008,9 +3633,9 @@ dependencies = [
[[package]]
name = "vec-arena"
-version = "1.0.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"
+checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1"
[[package]]
name = "vec_map"
@@ -4025,12 +3650,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
-[[package]]
name = "waker-fn"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4038,9 +3657,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]]
name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
"winapi 0.3.9",
@@ -4136,25 +3755,6 @@ dependencies = [
]
[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376"
-dependencies = [
- "webpki",
-]
-
-[[package]]
name = "weezl"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4162,9 +3762,9 @@ checksum = "4a32b378380f4e9869b22f0b5177c68a5519f03b3454fde0b291455ddbae266c"
[[package]]
name = "wgpu"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c60007fc3748278a36b458d96f86105f43aa5f0e412b15a5f934950d61ec26a9"
+checksum = "79a0a0a63fac9492cfaf6e7e4bdf9729c128f1e94124b9e4cbc4004b8cb6d1d8"
dependencies = [
"arrayvec",
"js-sys",
@@ -4172,6 +3772,7 @@ dependencies = [
"parking_lot",
"raw-window-handle",
"smallvec",
+ "syn",
"tracing",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -4279,8 +3880,8 @@ dependencies = [
"log",
"mio 0.6.23",
"mio-extras",
- "ndk",
- "ndk-glue",
+ "ndk 0.2.1",
+ "ndk-glue 0.2.1",
"ndk-sys",
"objc",
"parking_lot",
@@ -4324,15 +3925,6 @@ dependencies = [
]
[[package]]
-name = "xattr"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
-dependencies = [
- "libc",
-]
-
-[[package]]
name = "xi-unicode"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,13 +10,13 @@ edition = "2018"
bevy_prototype_inline_assets = "0.1.1"
bevy_discovery = "0.1.0"
#kurinji = "1.0.5"
-bevy_ldtk = {version = "0.4.2", features = ["bevy-unstable"]}
+#bevy_ldtk = {version = "0.4.2", features = ["bevy-unstable"]}
noise = "0.7.0"
rand = "0.8.3"
[dependencies.bevy]
git = "https://github.com/bevyengine/bevy"
-rev = "079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+rev = "f520a341d5737600dbf89015b7729109d67cf041"
features = ["dynamic"]
#[dependencies.bevy_rapier2d]
@@ -25,7 +25,7 @@ features = ["dynamic"]
#features = [ "simd-stable", "parallel" ]
[patch.crates-io]
-bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"}
+bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "f520a341d5737600dbf89015b7729109d67cf041"}
# Enable optimizations for dependencies (incl. Bevy), but not for our code:
[profile.dev.package."*"]
diff --git a/src/main.rs b/src/main.rs
@@ -28,7 +28,7 @@ fn main() {
title: "Random test game".to_string(),
width: 1024.,
height: 720.,
- vsync: true,
+ vsync: false,
resizable: true,
mode: WindowMode::Windowed,
..Default::default()
@@ -46,14 +46,13 @@ fn main() {
}
fn setup(
- commands: &mut Commands,
+ mut commands: Commands,
mut loading: ResMut<AssetsLoading>,
asset_server: Res<AssetServer>,
mut game_state: ResMut<GameState>,
) {
commands
- // Spawn a camera
- .spawn(OrthographicCameraBundle {
+ .spawn_bundle(OrthographicCameraBundle {
orthographic_projection: OrthographicProjection {
far: 1024.0, // This gives us 1024 layers,
scale: 160.0, // How many pixels high in the game
@@ -67,8 +66,8 @@ fn setup(
)),
..OrthographicCameraBundle::new_2d()
})
- .with(PLAYER_START)
- .with(MainCamera);
+ .insert(PLAYER_START)
+ .insert(MainCamera);
let sunny_texture_handle = asset_server.load("tilesets/SunnyLand_by_Ansimuz-extended.png");
loading.0.push(sunny_texture_handle.clone_untyped());
diff --git a/src/plugins/player.rs b/src/plugins/player.rs
@@ -19,7 +19,7 @@ impl Plugin for PlayerPlugin {
}
fn setup_player(
- mut commands: &mut Commands,
+ mut commands: Commands,
asset_server: Res<AssetServer>,
texture_atlases: ResMut<Assets<TextureAtlas>>,
game_state: ResMut<GameState>,
@@ -75,7 +75,7 @@ fn setup_player_internal(
// Spawn player
commands
- .spawn(SpriteSheetBundle {
+ .spawn_bundle(SpriteSheetBundle {
sprite: TextureAtlasSprite {
index: 362,
..Default::default()
@@ -88,9 +88,9 @@ fn setup_player_internal(
texture_atlas: texture_atlas_handle,
..Default::default()
})
- .with(grid_location)
- .with(Movable)
- .with(PlayerBundle {
+ .insert(grid_location)
+ .insert(Movable)
+ .insert(PlayerBundle {
xp: PlayerXp(0.0),
name: PlayerName("Player 1".into()),
health: Health { hp: 100.0 },
@@ -102,12 +102,12 @@ fn setup_player_internal(
#[allow(clippy::type_complexity)]
fn player_movement(
keyboard_input: Res<Input<KeyCode>>,
- mut wall_query: Query<(Entity, &Wall, &GridLocation)>,
mut set: QuerySet<(
Query<(Entity, &Movable, &mut GridLocation)>,
- Query<(Entity, &PlayerBundle, &GridLocation)>,
+ Query<(Entity, &Player, &GridLocation)>,
+ Query<(Entity, &Wall, &GridLocation)>,
+ Query<&mut GridLocation, With<MainCamera>>,
)>,
- mut camera: Query<&mut GridLocation, With<MainCamera>>,
) {
let _shift = keyboard_input.pressed(KeyCode::LShift) || keyboard_input.pressed(KeyCode::RShift);
let _ctrl =
@@ -135,7 +135,7 @@ fn player_movement(
let immovables: HashMap<GridLocation, Entity> = {
let mut tmp = HashMap::new();
- for (wall_entity, _wall, wall_grid_location) in wall_query.iter_mut() {
+ for (wall_entity, _wall, wall_grid_location) in set.q2_mut().iter_mut() {
tmp.insert(
GridLocation(wall_grid_location.0, wall_grid_location.1),
wall_entity,
@@ -180,10 +180,13 @@ fn player_movement(
to_move.append(&mut tmp_to_move);
}
- let mut camera_grid_location = camera.iter_mut().next().unwrap();
for loc in to_move {
+ {
+ let mut camera_grid_location = set.q3_mut().iter_mut().next().unwrap();
+ *camera_grid_location = *camera_grid_location + delta;
+ }
+
let mut grid_location: Mut<GridLocation> = set.q0_mut().get_component_mut(loc).unwrap();
*grid_location = *grid_location + delta;
- *camera_grid_location = *camera_grid_location + delta;
}
}
diff --git a/src/plugins/world.rs b/src/plugins/world.rs
@@ -86,6 +86,15 @@ impl Plugin for WorldPlugin {
pub const SPRITE_WIDTH: f32 = 16.0;
pub const SPRITE_HEIGHT: f32 = 16.0;
+#[derive(Bundle)]
+struct WallBundle {
+ pub grid_location: GridLocation,
+ pub _wall: Wall,
+
+ #[bundle]
+ pub sprite: SpriteSheetBundle,
+}
+
fn setup_wall(
grid_location: GridLocation,
commands: &mut Commands,
@@ -104,8 +113,10 @@ fn setup_wall(
rows as usize,
);
let texture_atlas_handle = texture_atlases.add(texture_atlas);
- commands
- .spawn(SpriteSheetBundle {
+ commands.spawn_bundle(WallBundle {
+ grid_location,
+ _wall: Wall,
+ sprite: SpriteSheetBundle {
sprite: TextureAtlasSprite {
index: 48,
..Default::default()
@@ -117,13 +128,12 @@ fn setup_wall(
)),
texture_atlas: texture_atlas_handle,
..Default::default()
- })
- .with(grid_location)
- .with(Wall);
+ },
+ });
}
fn draw(
- commands: &mut Commands,
+ mut commands: Commands,
mut game_state: ResMut<GameState>,
mut texture_atlases: ResMut<Assets<TextureAtlas>>,
server: Res<AssetServer>,
@@ -180,7 +190,7 @@ fn draw(
if noise_value > 4.8 {
setup_wall(
coord,
- commands,
+ &mut commands,
&game_state,
&mut texture_atlases,
&textures,
