From ba48bfe05ec9480b9f8629d53351eb5a37931a0c Mon Sep 17 00:00:00 2001
From: Louis Capitanchik <contact@louiscap.co>
Date: Sun, 31 Jul 2022 16:59:31 +0100
Subject: [PATCH] Set up build commands for windows, linux & web
---
.dockerignore | 3 +
Cargo.lock | 1217 ++++++++++++++++++------
Makefile | 33 +-
game_core/Cargo.toml | 20 +-
game_core/src/assets/loader.rs | 2 +-
game_core/src/assets/mod.rs | 3 +-
game_core/src/assets/resources.rs | 4 +-
game_core/src/lib.rs | 43 +-
game_core/src/main.rs | 10 +-
game_core/src/multiplayer/mod.rs | 31 +
game_core/src/splash_screen/systems.rs | 8 +-
game_core/src/system/camera.rs | 16 +-
game_core/src/system/mod.rs | 1 +
game_core/src/system/resources.rs | 41 +
14 files changed, 1081 insertions(+), 351 deletions(-)
create mode 100644 .dockerignore
create mode 100644 game_core/src/multiplayer/mod.rs
create mode 100644 game_core/src/system/resources.rs
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..164cf3c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+dist/
+/target/
+/.idea/
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index a5cdbf5..1fce898 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,6 +18,12 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e"
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
[[package]]
name = "adler32"
version = "1.2.0"
@@ -32,7 +38,7 @@ checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
"getrandom",
"once_cell",
- "version_check",
+ "version_check 0.9.4",
]
[[package]]
@@ -81,7 +87,16 @@ dependencies = [
"android_log-sys",
"env_logger",
"lazy_static",
- "log",
+ "log 0.4.17",
+]
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
+dependencies = [
+ "libc",
]
[[package]]
@@ -116,9 +131,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "ash"
-version = "0.34.0+1.2.203"
+version = "0.37.0+1.3.209"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df"
+checksum = "006ca68e0f2b03f22d6fa9f2860f85aed430d257fec20f8879b2145e7c7ae1a6"
dependencies = [
"libloading",
]
@@ -160,6 +175,15 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10"
+[[package]]
+name = "autocfg"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
+dependencies = [
+ "autocfg 1.1.0",
+]
+
[[package]]
name = "autocfg"
version = "1.1.0"
@@ -168,40 +192,48 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
+dependencies = [
+ "byteorder",
+ "safemem",
+]
[[package]]
-name = "bevy"
-version = "0.7.0"
+name = "base64"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fce306d40a111309ee61d4626efbafccdd46bb80657122c38061fa7264c08e4"
+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
dependencies = [
- "bevy_internal",
+ "byteorder",
]
[[package]]
-name = "bevy-crevice-derive"
-version = "0.7.0"
+name = "base64"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "191a752a01c3402deb24320acf42288bf822e5d22f19ae1d903797f02e9b0c33"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
+[[package]]
+name = "bevy"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55f08528a4e59d607460513a823b40f602d013c1a00f57b824f1075d5d48c3cd"
dependencies = [
- "bevy_macro_utils",
- "proc-macro2",
- "quote",
- "syn",
+ "bevy_internal",
]
[[package]]
name = "bevy_app"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32660ae99fa3498ca379de28b7e2f447e6531b0e432bf200901efeec075553c1"
+checksum = "53d26d6ffdf493609d2fedc1018a2ef0cb4d8e48f6d3bcea56fa2df81867e464"
dependencies = [
"bevy_derive",
"bevy_ecs",
"bevy_reflect",
+ "bevy_tasks",
"bevy_utils",
"wasm-bindgen",
"web-sys",
@@ -209,9 +241,9 @@ dependencies = [
[[package]]
name = "bevy_asset"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2afd395240087924ba49c8cae2b00d007aeb1db53ee726a543b1e90dce2d3ab"
+checksum = "3d8fb95306d5f18fa70df40632cd984993aeb71e91ce059ae99699098a4f9ce9"
dependencies = [
"anyhow",
"bevy_app",
@@ -223,10 +255,10 @@ dependencies = [
"bevy_utils",
"crossbeam-channel",
"downcast-rs",
+ "fastrand",
"js-sys",
"ndk-glue 0.5.2",
- "parking_lot",
- "rand",
+ "parking_lot 0.12.1",
"serde",
"thiserror",
"wasm-bindgen",
@@ -236,12 +268,11 @@ dependencies = [
[[package]]
name = "bevy_core"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12c0f8614b6014671ab60bacb8bf681373d08b0bb15633b8ef72b895cf966d29"
+checksum = "c6712146d54fff9e1865362e9f39a7b63c7b037ddb72a3d7bb05b959213fb61e"
dependencies = [
"bevy_app",
- "bevy_derive",
"bevy_ecs",
"bevy_math",
"bevy_reflect",
@@ -252,35 +283,27 @@ dependencies = [
[[package]]
name = "bevy_core_pipeline"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d570bc9310196190910a5b1ffd8c8c35bd6b73f918d0651ae3c3d4e57be9a7"
+checksum = "080bb00399b6d7697e505f871d67c6de8b52eb06b47b0cda2be80c2396805983"
dependencies = [
"bevy_app",
"bevy_asset",
- "bevy_core",
+ "bevy_derive",
"bevy_ecs",
+ "bevy_reflect",
"bevy_render",
+ "bevy_transform",
"bevy_utils",
-]
-
-[[package]]
-name = "bevy_crevice"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da0a284fb26c02cb96ef4d5bbf4de5fad7e1a901730035a61813bf64e28482e"
-dependencies = [
- "bevy-crevice-derive",
- "bytemuck",
- "glam 0.20.5",
- "mint",
+ "radsort",
+ "serde",
]
[[package]]
name = "bevy_derive"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6abddf2ed415f31d28a9bf9ab3c0bc857e98a722858d38dba65bdda481f8d714"
+checksum = "a4b8f0786d1fc7e0d35297917be463db3d0886f7bd8d4221ca3d565502579ffb"
dependencies = [
"bevy_macro_utils",
"quote",
@@ -289,25 +312,26 @@ dependencies = [
[[package]]
name = "bevy_diagnostic"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ebf72ea058cfc379756e9da7de6861174e1860504f41e3e5a46d5b1c35d6644"
+checksum = "adab74ee5375fbf5d2b1d3da41de8d1491a8a706d17441b5e31214b65349d692"
dependencies = [
"bevy_app",
- "bevy_core",
"bevy_ecs",
"bevy_log",
+ "bevy_time",
"bevy_utils",
]
[[package]]
name = "bevy_ecs"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e67dd06b14e787d2026fe6e2b63f67482afcc62284f20ea2784d8b0662e95f"
+checksum = "a5643dc27b7d6778e3a66c8e0f6ad1fd33309aa2fa61d935f360ccc85b7be6a2"
dependencies = [
"async-channel",
"bevy_ecs_macros",
+ "bevy_ptr",
"bevy_reflect",
"bevy_tasks",
"bevy_utils",
@@ -315,14 +339,14 @@ dependencies = [
"fixedbitset",
"fxhash",
"serde",
- "thiserror",
+ "thread_local",
]
[[package]]
name = "bevy_ecs_macros"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718923a491490bd81074492d61fc08134f9c62a29ba8666818cd7a6630421246"
+checksum = "a5f2f12677f8725d40930d0a19652f007fe0ef5ac38e23817cfc4930c61f5680"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -330,17 +354,28 @@ dependencies = [
"syn",
]
+[[package]]
+name = "bevy_encase_derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a767adc36ce1fc917a736843b026d4de7069d90ed5e669c852481ef69fd5aa"
+dependencies = [
+ "bevy_macro_utils",
+ "encase_derive_impl",
+]
+
[[package]]
name = "bevy_gltf"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e07bda7721091c1a683343d466132dc69dec65aa83d8c9e328a2fb3431f03be"
+checksum = "150cc6782c4472600c2ade5d78c6ce481c992690f0499e63765aba752d7e0f04"
dependencies = [
"anyhow",
- "base64",
+ "base64 0.13.0",
"bevy_app",
"bevy_asset",
"bevy_core",
+ "bevy_core_pipeline",
"bevy_ecs",
"bevy_hierarchy",
"bevy_log",
@@ -349,18 +384,19 @@ dependencies = [
"bevy_reflect",
"bevy_render",
"bevy_scene",
+ "bevy_tasks",
"bevy_transform",
"bevy_utils",
"gltf",
- "percent-encoding",
+ "percent-encoding 2.1.0",
"thiserror",
]
[[package]]
name = "bevy_hierarchy"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f407f152f35541a099484200afe3b0ca09ce625469e8233dcdc264d6f88e01a"
+checksum = "8e2e4c20d7c843cd26ef3c5d7b4c20e3e32c275943e2437ecaca1cfd6cfe3b30"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -371,9 +407,9 @@ dependencies = [
[[package]]
name = "bevy_input"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4ec4f6e38ef1b41ff68ec7badd6afc5c9699191e61e511c4abee91a5888afc"
+checksum = "a11c70573fb4d4c056ba32cfa553daa7e6e1245cb876ccfbe322640928b7ee1c"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -383,9 +419,9 @@ dependencies = [
[[package]]
name = "bevy_internal"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d518a8e5f526a9537fc8408a284caec7af22b23c3b23c0dee08bacc0930e2f1a"
+checksum = "0d603b597772130782eab6e604706cbb764fb037f9cf0a1904b6f342845b6f44"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -400,12 +436,13 @@ dependencies = [
"bevy_log",
"bevy_math",
"bevy_pbr",
+ "bevy_ptr",
"bevy_reflect",
"bevy_render",
- "bevy_scene",
"bevy_sprite",
"bevy_tasks",
"bevy_text",
+ "bevy_time",
"bevy_transform",
"bevy_ui",
"bevy_utils",
@@ -417,20 +454,19 @@ dependencies = [
[[package]]
name = "bevy_kira_audio"
version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07e27a661ef2a0e92bcec42ebc4bd720871f093eb6f4e610297746095c5a45b"
+source = "git+https://github.com/NiklasEi/bevy_kira_audio.git?rev=8e2ee7ffb675163cd01083d46f12aeba634f9f8f#8e2ee7ffb675163cd01083d46f12aeba634f9f8f"
dependencies = [
"anyhow",
"bevy",
"kira",
- "parking_lot",
+ "parking_lot 0.12.1",
]
[[package]]
name = "bevy_log"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ec496720ded2ff62b292d8e5fc845817a504915f41b7c5fd12b1380300f75"
+checksum = "8cafb12fc84734236e36f407ab62c72d5d4279fa4777e40a95d7cc973cbabcd1"
dependencies = [
"android_log-sys",
"bevy_app",
@@ -443,34 +479,41 @@ dependencies = [
[[package]]
name = "bevy_macro_utils"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ddfc33a99547e36718e56e414541e461c74ec318ff987a1e9f4ff46d0dacbb"
+checksum = "4d081af83b701e16cad209255ba6b383744dfa49efa99eb6505989f293305ab3"
dependencies = [
- "cargo-manifest",
"quote",
"syn",
+ "toml",
]
[[package]]
name = "bevy_math"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20288df0f70ff258bbaffaf55209f1271a7436438591bbffc3d81e4d84b423f2"
+checksum = "db5394e86c5708d3aa506c6e98ec4ed2a4083a7a018c6693d9ac0e77ebfabfc2"
dependencies = [
- "bevy_reflect",
- "glam 0.20.5",
+ "glam",
+]
+
+[[package]]
+name = "bevy_mikktspace"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40b299a61175a6f7e7398f83cd5b50920fd8bad4df674e614ad94f25f8426509"
+dependencies = [
+ "glam",
]
[[package]]
name = "bevy_pbr"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06adee54840f18cfeda7af4cdc57608644fa840be076a562353f896bfdb9c694"
+checksum = "ed9a81bbd02f5e0a57899a41aec37d9cb14965e1e4d510547f3f680323d05c0f"
dependencies = [
"bevy_app",
"bevy_asset",
- "bevy_core",
"bevy_core_pipeline",
"bevy_ecs",
"bevy_math",
@@ -481,20 +524,29 @@ dependencies = [
"bevy_window",
"bitflags",
"bytemuck",
+ "radsort",
]
+[[package]]
+name = "bevy_ptr"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92d5679e89602a18682a37846573dcd1979410179e14204280460ba9fb8713a"
+
[[package]]
name = "bevy_reflect"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0793107bc4b7c6bd04232d739fc8d70aa5fb313bfad6e850f91f79b2557eed"
+checksum = "08798e67f2d4e6898ef117d8c99cf3b50a8eebc8da4159e6dad2657a0fbe9a4e"
dependencies = [
+ "bevy_ptr",
"bevy_reflect_derive",
"bevy_utils",
"downcast-rs",
"erased-serde",
- "glam 0.20.5",
- "parking_lot",
+ "glam",
+ "once_cell",
+ "parking_lot 0.12.1",
"serde",
"smallvec",
"thiserror",
@@ -502,9 +554,9 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81c88de8067d19dfde31662ee78e3ee6971e2df27715799f91b515b37a636677"
+checksum = "19209a7f0238053802b7de04e6724bd90d4ed7d90e87101dbd1b64cca64ff694"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -515,19 +567,24 @@ dependencies = [
[[package]]
name = "bevy_render"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a358da8255b704153913c3499b3693fa5cfe13a48725ac6e76b043fa5633bc8"
+checksum = "bb49530388ef17cff3fb8bd5e47372fb3cfeb4befc73e3036f6462ac20f049ef"
dependencies = [
"anyhow",
"bevy_app",
"bevy_asset",
"bevy_core",
- "bevy_crevice",
"bevy_derive",
"bevy_ecs",
+ "bevy_encase_derive",
+ "bevy_hierarchy",
+ "bevy_log",
"bevy_math",
+ "bevy_mikktspace",
"bevy_reflect",
+ "bevy_render_macros",
+ "bevy_time",
"bevy_transform",
"bevy_utils",
"bevy_window",
@@ -535,32 +592,49 @@ dependencies = [
"codespan-reporting",
"copyless",
"downcast-rs",
+ "encase",
"futures-lite",
"hex",
"hexasphere",
"image",
"naga",
"once_cell",
- "parking_lot",
+ "parking_lot 0.12.1",
"regex",
"serde",
"smallvec",
"thiserror",
+ "thread_local",
"wgpu",
]
+[[package]]
+name = "bevy_render_macros"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7d0b7a51fa819c20c64f43856c5aaea40f853050bbb09b9ba3672e5ff2688a5"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "bevy_scene"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ea240f2ffce9f58a5601cc5ead24111f577dc4c656452839eb1fdf4b7a28529"
+checksum = "0064d73ebb0de39901478b493604a1a6d448fd337b66803004c60f41f1fa6c37"
dependencies = [
"anyhow",
"bevy_app",
"bevy_asset",
+ "bevy_derive",
"bevy_ecs",
"bevy_hierarchy",
"bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
"bevy_utils",
"ron",
"serde",
@@ -570,13 +644,12 @@ dependencies = [
[[package]]
name = "bevy_sprite"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fcecfbc623410137d85a71a295ff7c16604b7be24529c9ea4b9a9881d7a142b"
+checksum = "1f83dfe8897d6c0d9d5ce3818d49a13e58ae2b9b9ecf4f4bb85aa31bb0678f68"
dependencies = [
"bevy_app",
"bevy_asset",
- "bevy_core",
"bevy_core_pipeline",
"bevy_ecs",
"bevy_log",
@@ -588,6 +661,7 @@ dependencies = [
"bitflags",
"bytemuck",
"copyless",
+ "fixedbitset",
"guillotiere",
"rectangle-pack",
"serde",
@@ -596,29 +670,29 @@ dependencies = [
[[package]]
name = "bevy_tasks"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2b0f0b86c8f78c53a2d4c669522f45e725ed9d9c3d734f54ec30876494e04e"
+checksum = "ff874c91a36eaac3ef957c6f3b590fb71332d9d136671cc858847d56fe9f80a3"
dependencies = [
"async-channel",
"async-executor",
"event-listener",
"futures-lite",
"num_cpus",
+ "once_cell",
"wasm-bindgen-futures",
]
[[package]]
name = "bevy_text"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a206112de011fd6baebaf476af69d87f4e38a1314b65e3c872060830d7c0b9fa"
+checksum = "ef05a788c2c04aaa5db95b22a8f0fff0d3a0b08a7bcd1a71f050a628b38eec6e"
dependencies = [
"ab_glyph",
"anyhow",
"bevy_app",
"bevy_asset",
- "bevy_core",
"bevy_ecs",
"bevy_math",
"bevy_reflect",
@@ -632,11 +706,24 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "bevy_time"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74ec681d641371df81d7bfbcb0eea725ed873f38a094f34b5f7b436f0889e77c"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
+ "crossbeam-channel",
+]
+
[[package]]
name = "bevy_transform"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2f7a77900fb23f24ca312c1f8df3eb47a45161326f41e9b4ef05b039793503"
+checksum = "42e1528e35f30bede46a50ee4134f150efc01f5c1002c340b3b2e6a0bfcb8aa5"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -647,13 +734,12 @@ dependencies = [
[[package]]
name = "bevy_ui"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c65e79658d8a3d4da087a6fb8b229cfe1455cda2c4e8e6305b3b44fb46fb1d30"
+checksum = "ac181a7b637da61fad72981ff9d2e5b899283ca7d54b2b7ea49c431121331c53"
dependencies = [
"bevy_app",
"bevy_asset",
- "bevy_core",
"bevy_core_pipeline",
"bevy_derive",
"bevy_ecs",
@@ -671,19 +757,18 @@ dependencies = [
"bytemuck",
"serde",
"smallvec",
- "stretch",
+ "taffy",
]
[[package]]
name = "bevy_utils"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f354c584812996febd48cc885f36b23004b49d6680e73fc95a69a2bb17a48e5"
+checksum = "8bda6dada53e546845887ae7357eec57b8d547ef71627b716b33839b4a98b687"
dependencies = [
"ahash",
- "bevy_derive",
"getrandom",
- "hashbrown 0.11.2",
+ "hashbrown 0.12.2",
"instant",
"tracing",
"uuid",
@@ -691,12 +776,13 @@ dependencies = [
[[package]]
name = "bevy_window"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04fe33d177e10b2984fa90c1d19496fc6f6e7b36d4442699d359e2b4b507873d"
+checksum = "a3bdc3a220a9bb2fad9bd30d5f44c6645725398fe1bc588fc87abf09f092696e"
dependencies = [
"bevy_app",
"bevy_ecs",
+ "bevy_input",
"bevy_math",
"bevy_utils",
"raw-window-handle",
@@ -705,9 +791,9 @@ dependencies = [
[[package]]
name = "bevy_winit"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c0e3b94cc73907f8a9f82945ca006a39ed2ab401aca0974b47a007a468509f"
+checksum = "57537a56ac4f4e1ffcad95227bcab37cd17b51770dacff82374a2d88be376322"
dependencies = [
"approx",
"bevy_app",
@@ -716,6 +802,7 @@ dependencies = [
"bevy_math",
"bevy_utils",
"bevy_window",
+ "crossbeam-channel",
"raw-window-handle",
"wasm-bindgen",
"web-sys",
@@ -768,12 +855,39 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+dependencies = [
+ "block-padding",
+ "byte-tools",
+ "byteorder",
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+dependencies = [
+ "byte-tools",
+]
+
[[package]]
name = "bumpalo"
version = "3.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+
[[package]]
name = "bytemuck"
version = "1.10.0"
@@ -800,6 +914,16 @@ version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+[[package]]
+name = "bytes"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+dependencies = [
+ "byteorder",
+ "iovec",
+]
+
[[package]]
name = "bytes"
version = "1.1.0"
@@ -812,17 +936,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-[[package]]
-name = "cargo-manifest"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5d1388481e60167ccfd7d2ffe6bdfd3640c1f69a9033db57892e36acbd8501"
-dependencies = [
- "serde",
- "serde_derive",
- "toml",
-]
-
[[package]]
name = "cc"
version = "1.0.73"
@@ -876,6 +989,15 @@ dependencies = [
"libloading",
]
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "cocoa"
version = "0.24.0"
@@ -929,7 +1051,7 @@ version = "4.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948"
dependencies = [
- "bytes",
+ "bytes 1.1.0",
"memchr",
]
@@ -952,6 +1074,12 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "const_panic"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c0358e41e90e443c69b2b2811f6ec9892c228b93620634cf4344fe89967fa9f"
+
[[package]]
name = "copyless"
version = "0.1.5"
@@ -1077,7 +1205,7 @@ dependencies = [
"ndk-glue 0.6.2",
"nix",
"oboe",
- "parking_lot",
+ "parking_lot 0.11.2",
"stdweb",
"thiserror",
"wasm-bindgen",
@@ -1122,9 +1250,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]]
name = "d3d12"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c"
+checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
dependencies = [
"bitflags",
"libloading",
@@ -1168,12 +1296,20 @@ dependencies = [
[[package]]
name = "deflate"
-version = "0.8.6"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
+checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f"
dependencies = [
"adler32",
- "byteorder",
+]
+
+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
+dependencies = [
+ "generic-array",
]
[[package]]
@@ -1188,6 +1324,38 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+[[package]]
+name = "encase"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9"
+dependencies = [
+ "const_panic",
+ "encase_derive",
+ "glam",
+ "thiserror",
+]
+
+[[package]]
+name = "encase_derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22"
+dependencies = [
+ "encase_derive_impl",
+]
+
+[[package]]
+name = "encase_derive_impl"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "encoding_rs"
version = "0.8.31"
@@ -1203,7 +1371,7 @@ version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
dependencies = [
- "log",
+ "log 0.4.17",
"regex",
]
@@ -1231,6 +1399,12 @@ version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+[[package]]
+name = "fake-simd"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+
[[package]]
name = "fastrand"
version = "1.7.0"
@@ -1267,6 +1441,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
[[package]]
name = "futures-core"
version = "0.3.21"
@@ -1311,13 +1491,23 @@ dependencies = [
"bevy",
"fastrand",
"iyes_loopless",
- "log",
- "micro_bevy_musicbox",
+ "log 0.4.17",
+ "musicbox",
+ "remote_events",
"serde",
"serde_json",
"thiserror",
]
+[[package]]
+name = "generic-array"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
+dependencies = [
+ "typenum",
+]
+
[[package]]
name = "getrandom"
version = "0.2.7"
@@ -1327,27 +1517,20 @@ dependencies = [
"cfg-if 1.0.0",
"js-sys",
"libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
[[package]]
name = "glam"
-version = "0.20.5"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f"
+checksum = "781aa11be58ef14b0cd7326618afcbd9cdb5ba686bdab7193d87cdc322cd7033"
dependencies = [
"bytemuck",
- "mint",
"serde",
]
-[[package]]
-name = "glam"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781aa11be58ef14b0cd7326618afcbd9cdb5ba686bdab7193d87cdc322cd7033"
-
[[package]]
name = "glob"
version = "0.3.0"
@@ -1462,20 +1645,43 @@ dependencies = [
]
[[package]]
-name = "hashbrown"
-version = "0.11.2"
+name = "hash32"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
dependencies = [
- "ahash",
- "serde",
+ "byteorder",
]
[[package]]
-name = "hashbrown"
-version = "0.12.2"
+name = "hash32-derive"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
+checksum = "59d2aba832b60be25c1b169146b27c64115470981b128ed84c8db18c1b03c6ff"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
+dependencies = [
+ "ahash",
+ "serde",
+]
[[package]]
name = "hermit-abi"
@@ -1498,7 +1704,7 @@ version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9652f2ed7ee9c6374a061039f60fc6e25d7adac7fa10f83365669af3b24b0bf0"
dependencies = [
- "glam 0.21.2",
+ "glam",
"once_cell",
]
@@ -1508,22 +1714,57 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+[[package]]
+name = "httparse"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
+
+[[package]]
+name = "hyper"
+version = "0.10.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
+dependencies = [
+ "base64 0.9.3",
+ "httparse",
+ "language-tags",
+ "log 0.3.9",
+ "mime",
+ "num_cpus",
+ "time",
+ "traitobject",
+ "typeable",
+ "unicase",
+ "url",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+[[package]]
+name = "idna"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
[[package]]
name = "image"
-version = "0.23.14"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
- "num-iter",
"num-rational",
"num-traits",
"png",
@@ -1536,7 +1777,7 @@ version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
"hashbrown 0.12.2",
]
@@ -1564,6 +1805,15 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "iovec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "itoa"
version = "1.0.2"
@@ -1572,13 +1822,12 @@ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
[[package]]
name = "iyes_loopless"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2de41e79e600b6d8a49878c3a15c1ab0852c2d982dd638dfacd95d7eadab5193"
+version = "0.7.0"
+source = "git+https://lab.lcr.gr/microhacks/iyes-loopless.git?rev=289746aceb673d0863d5c846d4d4511e6f15c224#289746aceb673d0863d5c846d4d4511e6f15c224"
dependencies = [
"bevy_app",
- "bevy_core",
"bevy_ecs",
+ "bevy_time",
"bevy_utils",
]
@@ -1591,7 +1840,7 @@ dependencies = [
"cesu8",
"combine",
"jni-sys",
- "log",
+ "log 0.4.17",
"thiserror",
"walkdir",
]
@@ -1628,6 +1877,7 @@ checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
dependencies = [
"libc",
"libloading",
+ "pkg-config",
]
[[package]]
@@ -1642,6 +1892,12 @@ dependencies = [
"symphonia",
]
+[[package]]
+name = "language-tags"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
+
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -1670,22 +1926,25 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "libm"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
-
[[package]]
name = "lock_api"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
"scopeguard",
]
+[[package]]
+name = "log"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+dependencies = [
+ "log 0.4.17",
+]
+
[[package]]
name = "log"
version = "0.4.17"
@@ -1722,6 +1981,12 @@ dependencies = [
"regex-automata",
]
+[[package]]
+name = "matches"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
+
[[package]]
name = "memchr"
version = "2.5.0"
@@ -1734,32 +1999,30 @@ version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
]
[[package]]
name = "metal"
-version = "0.23.1"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084"
+checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
dependencies = [
"bitflags",
"block",
"core-graphics-types",
"foreign-types",
- "log",
+ "log 0.4.17",
"objc",
]
[[package]]
-name = "micro_bevy_musicbox"
-version = "0.1.0"
-source = "git+https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git?rev=a6c8ae0127de2a0f2fd20ce7189625471663cd4a#a6c8ae0127de2a0f2fd20ce7189625471663cd4a"
+name = "mime"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
dependencies = [
- "bevy",
- "bevy_kira_audio",
- "serde",
- "serde_json",
+ "log 0.3.9",
]
[[package]]
@@ -1770,19 +2033,13 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.3.7"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
dependencies = [
- "adler32",
+ "adler",
]
-[[package]]
-name = "mint"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
-
[[package]]
name = "mio"
version = "0.8.4"
@@ -1790,29 +2047,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
dependencies = [
"libc",
- "log",
- "wasi",
+ "log 0.4.17",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys",
]
+[[package]]
+name = "musicbox"
+version = "0.2.0-pre.1"
+source = "git+https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git?rev=fc8da57c9cc174d174dd3200d2880096a39c733f#fc8da57c9cc174d174dd3200d2880096a39c733f"
+dependencies = [
+ "bevy",
+ "bevy_kira_audio",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "naga"
-version = "0.8.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705"
+checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0"
dependencies = [
"bit-set",
"bitflags",
"codespan-reporting",
"hexf-parse",
"indexmap",
- "log",
+ "log 0.4.17",
"num-traits",
"petgraph",
"pp-rs",
"rustc-hash",
"spirv",
+ "termcolor",
"thiserror",
+ "unicode-xid",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log 0.4.17",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
]
[[package]]
@@ -1856,7 +2144,7 @@ dependencies = [
"android_logger",
"lazy_static",
"libc",
- "log",
+ "log 0.4.17",
"ndk 0.5.0",
"ndk-context",
"ndk-macro",
@@ -1871,7 +2159,7 @@ checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f"
dependencies = [
"lazy_static",
"libc",
- "log",
+ "log 0.4.17",
"ndk 0.6.0",
"ndk-context",
"ndk-macro",
@@ -1946,28 +2234,17 @@ version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
-dependencies = [
- "autocfg",
- "num-integer",
+ "autocfg 1.1.0",
"num-traits",
]
[[package]]
name = "num-rational"
-version = "0.3.2"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
"num-integer",
"num-traits",
]
@@ -1978,7 +2255,7 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
dependencies = [
- "autocfg",
+ "autocfg 1.1.0",
]
[[package]]
@@ -2060,6 +2337,57 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+
+[[package]]
+name = "openssl"
+version = "0.10.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+dependencies = [
+ "autocfg 1.1.0",
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
[[package]]
name = "owned_ttf_parser"
version = "0.15.0"
@@ -2083,7 +2411,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [
"instant",
"lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.5",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.3",
]
[[package]]
@@ -2100,12 +2438,31 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "parking_lot_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
[[package]]
name = "peeking_take_while"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+[[package]]
+name = "percent-encoding"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+
[[package]]
name = "percent-encoding"
version = "2.1.0"
@@ -2136,9 +2493,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
[[package]]
name = "png"
-version = "0.16.8"
+version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
+checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba"
dependencies = [
"bitflags",
"crc32fast",
@@ -2155,12 +2512,6 @@ dependencies = [
"unicode-xid",
]
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
[[package]]
name = "proc-macro-crate"
version = "1.1.3"
@@ -2195,34 +2546,116 @@ dependencies = [
"proc-macro2",
]
+[[package]]
+name = "radsort"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
+
[[package]]
name = "rand"
-version = "0.8.5"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
dependencies = [
+ "autocfg 0.1.8",
"libc",
"rand_chacha",
- "rand_core",
+ "rand_core 0.4.2",
+ "rand_hc",
+ "rand_isaac",
+ "rand_jitter",
+ "rand_os",
+ "rand_pcg",
+ "rand_xorshift",
+ "winapi",
]
[[package]]
name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+dependencies = [
+ "autocfg 0.1.8",
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_core"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
dependencies = [
- "ppv-lite86",
- "rand_core",
+ "rand_core 0.4.2",
]
[[package]]
name = "rand_core"
-version = "0.6.3"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+[[package]]
+name = "rand_hc"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
dependencies = [
- "getrandom",
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+dependencies = [
+ "libc",
+ "rand_core 0.4.2",
+ "winapi",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+dependencies = [
+ "cloudabi",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.4.2",
+ "rdrand",
+ "winapi",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+dependencies = [
+ "autocfg 0.1.8",
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+dependencies = [
+ "rand_core 0.3.1",
]
[[package]]
@@ -2240,6 +2673,15 @@ dependencies = [
"cty",
]
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
[[package]]
name = "rectangle-pack"
version = "0.4.2"
@@ -2281,6 +2723,27 @@ version = "0.6.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+[[package]]
+name = "remote_events"
+version = "0.1.0"
+source = "git+https://lab.lcr.gr/microhacks/micro-bevy-remote-events.git?rev=be0c6b43a73e4c5e7ece20797e3d6f59340147b4#be0c6b43a73e4c5e7ece20797e3d6f59340147b4"
+dependencies = [
+ "bevy",
+ "log 0.4.17",
+ "thiserror",
+ "wasm-sockets",
+ "websocket",
+]
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
+
[[package]]
name = "renderdoc-sys"
version = "0.7.1"
@@ -2302,7 +2765,7 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
dependencies = [
- "base64",
+ "base64 0.13.0",
"bitflags",
"serde",
]
@@ -2319,6 +2782,12 @@ version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+[[package]]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+
[[package]]
name = "same-file"
version = "1.0.6"
@@ -2328,6 +2797,16 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "schannel"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+dependencies = [
+ "lazy_static",
+ "windows-sys",
+]
+
[[package]]
name = "scoped_threadpool"
version = "0.1.9"
@@ -2340,20 +2819,43 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+[[package]]
+name = "security-framework"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.3",
+ "core-foundation-sys 0.8.3",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+dependencies = [
+ "core-foundation-sys 0.8.3",
+ "libc",
+]
+
[[package]]
name = "serde"
-version = "1.0.139"
+version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
+checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.139"
+version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb"
+checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
dependencies = [
"proc-macro2",
"quote",
@@ -2371,6 +2873,18 @@ dependencies = [
"serde",
]
+[[package]]
+name = "sha-1"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+dependencies = [
+ "block-buffer",
+ "digest",
+ "fake-simd",
+ "opaque-debug",
+]
+
[[package]]
name = "sharded-slab"
version = "0.1.4"
@@ -2398,7 +2912,7 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
dependencies = [
- "version_check",
+ "version_check 0.9.4",
]
[[package]]
@@ -2426,16 +2940,6 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-[[package]]
-name = "stretch"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0dc6d20ce137f302edf90f9cd3d278866fd7fb139efca6f246161222ad6d87"
-dependencies = [
- "lazy_static",
- "libm",
-]
-
[[package]]
name = "strsim"
version = "0.10.0"
@@ -2470,7 +2974,7 @@ checksum = "9130cae661447f234b58759d74d23500e9c95697b698589b34196cb0fb488a61"
dependencies = [
"bitflags",
"lazy_static",
- "log",
+ "log 0.4.17",
"symphonia-core",
"symphonia-metadata",
]
@@ -2481,7 +2985,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "746fc459966b37e277565f9632e5ffd6cbd83d9381152727123f68484cb8f9c4"
dependencies = [
- "log",
+ "log 0.4.17",
"symphonia-core",
"symphonia-utils-xiph",
]
@@ -2496,7 +3000,7 @@ dependencies = [
"bitflags",
"bytemuck",
"lazy_static",
- "log",
+ "log 0.4.17",
]
[[package]]
@@ -2505,7 +3009,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00f5b92a2a6370873d9dbe3326dad1bf795b3151efcadca6e5f47d732499a518"
dependencies = [
- "log",
+ "log 0.4.17",
"symphonia-core",
"symphonia-metadata",
"symphonia-utils-xiph",
@@ -2519,7 +3023,7 @@ checksum = "f04ee665c99fd2b919b87261c86a5312e996b720ca142646a163d9583e72bd0e"
dependencies = [
"encoding_rs",
"lazy_static",
- "log",
+ "log 0.4.17",
"symphonia-core",
]
@@ -2544,6 +3048,33 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "taffy"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec27dea659b100d489dffa57cf0efc6d7bfefb119af817b92cc14006c0b214e3"
+dependencies = [
+ "arrayvec",
+ "hash32",
+ "hash32-derive",
+ "num-traits",
+ "typenum",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+dependencies = [
+ "cfg-if 1.0.0",
+ "fastrand",
+ "libc",
+ "redox_syscall",
+ "remove_dir_all",
+ "winapi",
+]
+
[[package]]
name = "termcolor"
version = "1.1.3"
@@ -2582,13 +3113,38 @@ dependencies = [
"once_cell",
]
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+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.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
dependencies = [
- "indexmap",
"serde",
]
@@ -2632,7 +3188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
dependencies = [
"lazy_static",
- "log",
+ "log 0.4.17",
"tracing-core",
]
@@ -2665,18 +3221,60 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "traitobject"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
+
[[package]]
name = "ttf-parser"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
+[[package]]
+name = "typeable"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
+
+[[package]]
+name = "typenum"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+
+[[package]]
+name = "unicase"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+dependencies = [
+ "version_check 0.1.5",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+
[[package]]
name = "unicode-ident"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+[[package]]
+name = "unicode-normalization"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+dependencies = [
+ "tinyvec",
+]
+
[[package]]
name = "unicode-width"
version = "0.1.9"
@@ -2689,11 +3287,22 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+[[package]]
+name = "url"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+dependencies = [
+ "idna",
+ "matches",
+ "percent-encoding 1.0.1",
+]
+
[[package]]
name = "uuid"
-version = "0.8.2"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
dependencies = [
"getrandom",
"serde",
@@ -2705,6 +3314,18 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+
[[package]]
name = "version_check"
version = "0.9.4"
@@ -2728,6 +3349,12 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -2752,7 +3379,7 @@ checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
dependencies = [
"bumpalo",
"lazy_static",
- "log",
+ "log 0.4.17",
"proc-macro2",
"quote",
"syn",
@@ -2800,27 +3427,68 @@ version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
+[[package]]
+name = "wasm-sockets"
+version = "0.2.2"
+source = "git+https://lab.lcr.gr/microhacks/wasm-sockets.git?rev=5c8bdb2a54c1acfd816587bfcd5f64a34b3740b4#5c8bdb2a54c1acfd816587bfcd5f64a34b3740b4"
+dependencies = [
+ "js-sys",
+ "log 0.4.17",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "web-sys"
-version = "0.3.57"
+version = "0.3.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
+checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
dependencies = [
"js-sys",
"wasm-bindgen",
]
+[[package]]
+name = "websocket"
+version = "0.26.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92aacab060eea423e4036820ddd28f3f9003b2c4d8048cbda985e5a14e18038d"
+dependencies = [
+ "bytes 0.4.12",
+ "hyper",
+ "native-tls",
+ "rand",
+ "unicase",
+ "url",
+ "websocket-base",
+]
+
+[[package]]
+name = "websocket-base"
+version = "0.26.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49aec794b07318993d1db16156d5a9c750120597a5ee40c6b928d416186cb138"
+dependencies = [
+ "base64 0.10.1",
+ "bitflags",
+ "byteorder",
+ "native-tls",
+ "rand",
+ "sha-1",
+]
+
[[package]]
name = "wgpu"
-version = "0.12.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567"
+checksum = "277e967bf8b7820a76852645a6bce8bbd31c32fda2042e82d8e3ea75fda8892d"
dependencies = [
"arrayvec",
"js-sys",
- "log",
+ "log 0.4.17",
"naga",
- "parking_lot",
+ "parking_lot 0.11.2",
"raw-window-handle",
"smallvec",
"wasm-bindgen",
@@ -2833,33 +3501,36 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.12.2"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d"
+checksum = "89b92788dec9d0c1bed849a1b83f01b2ee12819bf04a79c90f68e4173f7b5ba2"
dependencies = [
"arrayvec",
+ "bit-vec",
"bitflags",
"cfg_aliases",
"codespan-reporting",
"copyless",
"fxhash",
- "log",
+ "log 0.4.17",
"naga",
- "parking_lot",
+ "parking_lot 0.11.2",
"profiling",
"raw-window-handle",
"smallvec",
"thiserror",
+ "web-sys",
"wgpu-hal",
"wgpu-types",
]
[[package]]
name = "wgpu-hal"
-version = "0.12.5"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d684ea6a34974a2fc19f1dfd183d11a62e22d75c4f187a574bb1224df8e056c2"
+checksum = "20cbdfc3d0637dba3d5536b93adef3d26023a0b96f0e1ee5ee9560a401d9f646"
dependencies = [
+ "android_system_properties",
"arrayvec",
"ash",
"bit-set",
@@ -2876,11 +3547,11 @@ dependencies = [
"js-sys",
"khronos-egl",
"libloading",
- "log",
+ "log 0.4.17",
"metal",
"naga",
"objc",
- "parking_lot",
+ "parking_lot 0.11.2",
"profiling",
"range-alloc",
"raw-window-handle",
@@ -2894,9 +3565,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.12.0"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2"
+checksum = "1f762cbc08e1a51389859cf9c199c7aef544789cf3510889aab12c607f701604"
dependencies = [
"bitflags",
]
@@ -2990,14 +3661,14 @@ dependencies = [
"instant",
"lazy_static",
"libc",
- "log",
+ "log 0.4.17",
"mio",
"ndk 0.5.0",
"ndk-glue 0.5.2",
"ndk-sys 0.2.2",
"objc",
- "parking_lot",
- "percent-encoding",
+ "parking_lot 0.11.2",
+ "percent-encoding 2.1.0",
"raw-window-handle",
"wasm-bindgen",
"web-sys",
diff --git a/Makefile b/Makefile
index 955a8de..885f735 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+PROJECT_NAME=game_core
+CURRENT_DIRECTORY=$(shell pwd)
+
linux-deps:
sudo apt-get install -yyq clang pkg-config libx11-dev libasound-dev libudev-dev lld
@@ -19,4 +22,32 @@ run-web:
cd game_core && trunk serve --release
check:
- cargo check --release --features "bevy/dynamic" -p game_core
\ No newline at end of file
+ cargo check --release --features "bevy/dynamic" -p game_core
+
+build-windows: clean_dist top_tail
+ docker run --rm --name "${PROJECT_NAME}-build-windows" -v "$(CURRENT_DIRECTORY):/app" -w /app --user $(shell id -u):$(shell id -g) r.lcr.gr/microhacks/bevy-builder \
+ cargo build --release -p game_core --target x86_64-pc-windows-gnu
+ mkdir -p dist
+ cp -r assets dist/assets
+ cp target/x86_64-pc-windows-gnu/release/game_core.exe "dist/${PROJECT_NAME}.exe"
+ cd dist && zip -r "${PROJECT_NAME}-windows.zip" "./${PROJECT_NAME}.exe" ./assets
+
+build-linux: clean_dist top_tail
+ docker run --rm --name "${PROJECT_NAME}-build-linux" -v "$(CURRENT_DIRECTORY):/app" -w /app --user $(shell id -u):$(shell id -g) r.lcr.gr/microhacks/bevy-builder \
+ cargo build --release -p game_core --target x86_64-unknown-linux-gnu
+ mkdir -p dist
+ cp -r assets dist/assets
+ cp target/x86_64-unknown-linux-gnu/release/game_core "dist/${PROJECT_NAME}"
+ cd dist && zip -r "${PROJECT_NAME}-linux.zip" "./${PROJECT_NAME}" ./assets
+
+build-web: top_tail
+ cd game_core && trunk build --release
+ cd game_core/dist && zip -r "${PROJECT_NAME}-web.zip" ./*
+
+clean_dist:
+ rm -rf ./dist
+
+top_tail:
+ @echo "================================================"
+ @echo " Building ${PROJECT_NAME}"
+ @echo "================================================"
\ No newline at end of file
diff --git a/game_core/Cargo.toml b/game_core/Cargo.toml
index c06dbc3..df73370 100644
--- a/game_core/Cargo.toml
+++ b/game_core/Cargo.toml
@@ -6,18 +6,20 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-iyes_loopless = "0.6.1"
-fastrand = "1.7.0"
-anyhow = "1.0.58"
-log = "0.4.17"
-thiserror = "1.0.31"
-serde = "1.0.139"
-serde_json = "1.0.82"
+#iyes_loopless = "0.6.1"
+fastrand = "1.7"
+anyhow = "1"
+log = "0.4"
+thiserror = "1"
+serde = "1"
+serde_json = "1"
+iyes_loopless = { git = "https://lab.lcr.gr/microhacks/iyes-loopless.git", rev = "289746aceb673d0863d5c846d4d4511e6f15c224" }
-micro_bevy_musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev="a6c8ae0127de2a0f2fd20ce7189625471663cd4a"}
+musicbox = { git = "https://lab.lcr.gr/microhacks/micro-bevy-musicbox.git", rev = "fc8da57c9cc174d174dd3200d2880096a39c733f"}
+remote_events = { git = "https://lab.lcr.gr/microhacks/micro-bevy-remote-events.git", rev = "be0c6b43a73e4c5e7ece20797e3d6f59340147b4"}
[dependencies.bevy]
-version = "0.7"
+version = "0.8"
default-features = false
features = [
"render",
diff --git a/game_core/src/assets/loader.rs b/game_core/src/assets/loader.rs
index e95c954..351e338 100644
--- a/game_core/src/assets/loader.rs
+++ b/game_core/src/assets/loader.rs
@@ -4,7 +4,7 @@ use bevy::asset::LoadState;
use bevy::ecs::system::SystemParam;
use bevy::prelude::*;
use bevy::reflect::TypeUuid;
-use micro_bevy_musicbox::prelude::AudioSource;
+use musicbox::prelude::AudioSource;
use crate::assets::{AssetHandles, FixedAssetNameMapping, SpriteSheetConfig};
diff --git a/game_core/src/assets/mod.rs b/game_core/src/assets/mod.rs
index 69dc557..5fc030e 100644
--- a/game_core/src/assets/mod.rs
+++ b/game_core/src/assets/mod.rs
@@ -2,14 +2,13 @@ mod loader;
mod resources;
mod startup;
-use bevy::app::Plugin;
+use bevy::app::{App, Plugin};
use iyes_loopless::condition::ConditionSet;
use iyes_loopless::prelude::AppLooplessStateExt;
pub use loader::AssetTypeLoader;
pub use resources::{AssetHandles, AssetNameMapping, FixedAssetNameMapping, SpriteSheetConfig};
use crate::system::flow::AppState;
-use crate::App;
pub struct AssetsPlugin;
impl Plugin for AssetsPlugin {
diff --git a/game_core/src/assets/resources.rs b/game_core/src/assets/resources.rs
index 072ddbe..d7e078c 100644
--- a/game_core/src/assets/resources.rs
+++ b/game_core/src/assets/resources.rs
@@ -1,7 +1,7 @@
use bevy::prelude::*;
use bevy::utils::HashMap;
-use micro_bevy_musicbox::prelude::AudioSource;
-use micro_bevy_musicbox::utilities::SuppliesAudio;
+use musicbox::prelude::AudioSource;
+use musicbox::utilities::SuppliesAudio;
#[derive(Copy, Clone, Debug)]
pub struct SpriteSheetConfig {
diff --git a/game_core/src/lib.rs b/game_core/src/lib.rs
index e40419a..e0acb2f 100644
--- a/game_core/src/lib.rs
+++ b/game_core/src/lib.rs
@@ -1,45 +1,4 @@
-use bevy::asset::AssetServerSettings;
-use bevy::prelude::*;
-use bevy::window::PresentMode;
-
-use crate::system::camera::{spawn_orthographic_camera, spawn_ui_camera};
-
pub mod assets;
+pub mod multiplayer;
pub mod splash_screen;
pub mod system;
-
-#[cfg(target_arch = "wasm32")]
-pub fn get_asset_path_string() -> String {
- String::from("assets")
-}
-#[cfg(not(target_arch = "wasm32"))]
-pub fn get_asset_path_string() -> String {
- std::env::current_dir()
- .unwrap()
- .join("assets")
- .to_str()
- .unwrap()
- .to_string()
-}
-
-pub struct DefaultResourcesPlugin;
-impl Plugin for DefaultResourcesPlugin {
- fn build(&self, app: &mut App) {
- app.insert_resource(WindowDescriptor {
- width: 1280.0,
- height: 720.0,
- resizable: true,
- title: String::from("Bevy 2D Template"),
- present_mode: PresentMode::Mailbox,
- ..Default::default()
- })
- .insert_resource(Msaa { samples: 1 })
- .insert_resource(ClearColor(Color::hex("040720").unwrap()))
- .insert_resource(AssetServerSettings {
- asset_folder: get_asset_path_string(),
- watch_for_changes: false,
- })
- .add_startup_system(spawn_orthographic_camera)
- .add_startup_system(spawn_ui_camera);
- }
-}
diff --git a/game_core/src/main.rs b/game_core/src/main.rs
index fd87a24..f8a6d3a 100644
--- a/game_core/src/main.rs
+++ b/game_core/src/main.rs
@@ -1,8 +1,9 @@
use bevy::prelude::*;
use game_core::system::flow::AppState;
-use game_core::DefaultResourcesPlugin;
+use game_core::system::resources::DefaultResourcesPlugin;
use iyes_loopless::prelude::AppLooplessStateExt;
-use micro_bevy_musicbox::CombinedAudioPlugins;
+use musicbox::CombinedAudioPlugins;
+use remote_events::RemoteEventPlugin;
fn main() {
App::new()
@@ -12,5 +13,10 @@ fn main() {
.add_plugin(game_core::assets::AssetsPlugin)
.add_plugins(CombinedAudioPlugins)
.add_plugin(game_core::splash_screen::SplashScreenPlugin)
+ .add_plugin(game_core::system::camera::CameraManagementPlugin)
+ .add_plugin(RemoteEventPlugin::<
+ game_core::multiplayer::OutgoingEvent,
+ game_core::multiplayer::IncomingEvent,
+ >::new())
.run();
}
diff --git a/game_core/src/multiplayer/mod.rs b/game_core/src/multiplayer/mod.rs
new file mode 100644
index 0000000..0cd2512
--- /dev/null
+++ b/game_core/src/multiplayer/mod.rs
@@ -0,0 +1,31 @@
+use remote_events::events::{FromSocketMessage, ToSocketMessage};
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum IncomingEvent {
+ #[default]
+ Void,
+}
+
+impl FromSocketMessage for IncomingEvent {
+ fn from_text(value: String) -> Self {
+ serde_json::from_str(value.as_str()).unwrap_or_default()
+ }
+
+ fn from_binary(value: Vec<u8>) -> Self {
+ serde_json::from_slice(value.as_slice()).unwrap_or_default()
+ }
+}
+
+#[derive(Clone, Copy, Debug, Default, Serialize, Deserialize)]
+pub enum OutgoingEvent {
+ #[default]
+ Void,
+}
+
+impl ToSocketMessage for OutgoingEvent {
+ fn to_text(&self) -> String {
+ serde_json::to_string(&self).unwrap_or(String::from("{}"))
+ }
+}
diff --git a/game_core/src/splash_screen/systems.rs b/game_core/src/splash_screen/systems.rs
index 470f6dc..23cfa66 100644
--- a/game_core/src/splash_screen/systems.rs
+++ b/game_core/src/splash_screen/systems.rs
@@ -1,7 +1,8 @@
use bevy::prelude::*;
use bevy::render::render_resource::FilterMode;
+use bevy::render::texture::ImageSampler;
use iyes_loopless::state::NextState;
-use micro_bevy_musicbox::prelude::MusicBox;
+use musicbox::prelude::MusicBox;
use crate::assets::AssetHandles;
use crate::splash_screen::components::{
@@ -63,10 +64,7 @@ pub fn setup_splash_screen(
false => window_size.width() / image_data.texture_descriptor.size.width as f32,
};
- image_data.sampler_descriptor.min_filter = FilterMode::Linear;
- image_data.sampler_descriptor.mag_filter = FilterMode::Linear;
- image_data.sampler_descriptor.mipmap_filter = FilterMode::Linear;
-
+ image_data.sampler_descriptor = ImageSampler::linear();
music_box.play_effect_once("splash_sting");
commands
diff --git a/game_core/src/system/camera.rs b/game_core/src/system/camera.rs
index 07ebd1e..0a9a253 100644
--- a/game_core/src/system/camera.rs
+++ b/game_core/src/system/camera.rs
@@ -1,8 +1,7 @@
use bevy::app::App;
use bevy::math::{Vec2, Vec3Swizzles};
use bevy::prelude::{
- Commands, Component, CoreStage, Entity, OrthographicCameraBundle, Plugin, Query, Transform,
- UiCameraBundle, With,
+ Camera2dBundle, Commands, Component, CoreStage, Entity, Plugin, Query, Transform, With,
};
use iyes_loopless::prelude::AppLooplessStateExt;
@@ -11,9 +10,6 @@ use crate::system::flow::AppState;
/// A flag component to indicate which entity should be followed by the camera
#[derive(Component)]
pub struct ChaseCam;
-/// A flag component to indicate a camera that should be used for Bevy UI
-#[derive(Component)]
-pub struct BevyUICamera;
/// A flag component to indicate a camera that should be used for rendering world entities and sprites
#[derive(Component)]
pub struct GameCamera;
@@ -21,17 +17,10 @@ pub struct GameCamera;
/// System that creates a default orthographic camera, with correct tags for querying
pub fn spawn_orthographic_camera(mut commands: Commands) {
commands
- .spawn_bundle(OrthographicCameraBundle::new_2d())
+ .spawn_bundle(Camera2dBundle::default())
.insert(GameCamera);
}
-/// System that creates a default UI camera, with the correct tags for querying
-pub fn spawn_ui_camera(mut commands: Commands) {
- commands
- .spawn_bundle(UiCameraBundle::default())
- .insert(BevyUICamera);
-}
-
/// System that takes the average location of all chase camera entities, and updates the location
/// of all world cameras to track the average location.
///
@@ -68,7 +57,6 @@ pub struct CameraManagementPlugin;
impl Plugin for CameraManagementPlugin {
fn build(&self, app: &mut App) {
app.add_enter_system(AppState::Preload, spawn_orthographic_camera)
- .add_enter_system(AppState::Preload, spawn_ui_camera)
.add_system_to_stage(CoreStage::PreUpdate, sync_chase_camera_location);
}
}
diff --git a/game_core/src/system/mod.rs b/game_core/src/system/mod.rs
index 25e668e..229ec9f 100644
--- a/game_core/src/system/mod.rs
+++ b/game_core/src/system/mod.rs
@@ -1,4 +1,5 @@
pub mod camera;
pub mod flow;
+pub mod resources;
pub mod utilities;
pub mod window;
diff --git a/game_core/src/system/resources.rs b/game_core/src/system/resources.rs
new file mode 100644
index 0000000..815c6b8
--- /dev/null
+++ b/game_core/src/system/resources.rs
@@ -0,0 +1,41 @@
+use bevy::asset::AssetServerSettings;
+use bevy::prelude::*;
+use bevy::render::texture::ImageSettings;
+use bevy::window::PresentMode;
+
+use crate::system::camera::spawn_orthographic_camera;
+
+#[cfg(target_arch = "wasm32")]
+pub fn get_asset_path_string() -> String {
+ String::from("assets")
+}
+#[cfg(not(target_arch = "wasm32"))]
+pub fn get_asset_path_string() -> String {
+ std::env::current_dir()
+ .unwrap()
+ .join("assets")
+ .to_str()
+ .unwrap()
+ .to_string()
+}
+
+pub struct DefaultResourcesPlugin;
+impl Plugin for DefaultResourcesPlugin {
+ fn build(&self, app: &mut App) {
+ app.insert_resource(WindowDescriptor {
+ width: 1280.0,
+ height: 720.0,
+ resizable: true,
+ title: String::from("Bevy 2D Template"),
+ present_mode: PresentMode::AutoNoVsync,
+ ..Default::default()
+ })
+ .insert_resource(ImageSettings::default_nearest())
+ .insert_resource(Msaa { samples: 1 })
+ .insert_resource(ClearColor(Color::hex("040720").unwrap()))
+ .insert_resource(AssetServerSettings {
+ asset_folder: get_asset_path_string(),
+ watch_for_changes: false,
+ });
+ }
+}
--
GitLab