From 44613b71f29c382e33d44e204de270bcc4c451d5 Mon Sep 17 00:00:00 2001 From: Dominic Maas Date: Tue, 15 Feb 2022 11:38:12 +1300 Subject: [PATCH 01/47] convert example to bevy --- example/Cargo.lock | 1827 +++++++++++++++++++--------- example/Cargo.toml | 5 +- example/{src => assets}/square.png | Bin example/build_wasm.bat | 5 - example/build_wasm.sh | 3 - example/src/app.rs | 131 -- example/src/cube.rs | 239 ---- example/src/main.rs | 87 +- example/src/shader.wgsl | 53 - example/web/.gitignore | 3 - example/web/index.html | 8 - 11 files changed, 1338 insertions(+), 1023 deletions(-) rename example/{src => assets}/square.png (100%) delete mode 100644 example/build_wasm.bat delete mode 100644 example/build_wasm.sh delete mode 100644 example/src/app.rs delete mode 100644 example/src/cube.rs delete mode 100644 example/src/shader.wgsl delete mode 100644 example/web/.gitignore delete mode 100644 example/web/index.html diff --git a/example/Cargo.lock b/example/Cargo.lock index de1e43d..f5dd5df 100644 --- a/example/Cargo.lock +++ b/example/Cargo.lock @@ -18,12 +18,6 @@ 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" @@ -50,6 +44,55 @@ dependencies = [ "memchr", ] +[[package]] +name = "alsa" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +dependencies = [ + "alsa-sys", + "bitflags", + "libc", + "nix", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android_log-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" + +[[package]] +name = "android_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ed09b18365ed295d722d0b5ed59c01b79a826ff2d2a8f73d5ecca8e6fb2f66" +dependencies = [ + "android_log-sys", + "env_logger", + "lazy_static", + "log", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + [[package]] name = "anyhow" version = "1.0.53" @@ -65,6 +108,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arrayvec" version = "0.7.2" @@ -112,33 +164,142 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8" [[package]] -name = "atomic_refcell" -version = "0.1.8" +name = "autocfg" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "atty" -version = "0.2.14" +name = "base-x" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" + +[[package]] +name = "base64" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bevy" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b77ad2987710ed960746c43813ad8c103db5c4c090f5cbc9c32c0a90a91bc599" dependencies = [ - "hermit-abi", - "libc", - "winapi", + "bevy_internal", ] [[package]] -name = "autocfg" -version = "1.1.0" +name = "bevy-crevice-derive" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "d4cf594c9277eb1e426f45a00eaf70aa9ffdf479268d7e4538270263811e20bc" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "base-x" -version = "0.2.8" +name = "bevy_app" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "58fe3d3f4140fb11cd294f43be7cb66a5783d9277ba0270743e2860e32b25ab5" +dependencies = [ + "bevy_derive", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb68a0259e2f857a32c4f05eb9b9447db1072297c61864ad07d02fea1838bde9" +dependencies = [ + "anyhow", + "bevy_app", + "bevy_diagnostic", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "crossbeam-channel", + "downcast-rs", + "js-sys", + "ndk-glue 0.5.0", + "notify", + "parking_lot", + "rand", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_audio" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0291276cf0dd1dbbf3393112d0e0276e4110f633965542123b830d8dae44fff3" +dependencies = [ + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", + "parking_lot", + "rodio", +] + +[[package]] +name = "bevy_core" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c156430a5312c04a1b25fa434eeeab6349a41c6bb96ea0385406d53b3c43658" +dependencies = [ + "bevy_app", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bytemuck", +] + +[[package]] +name = "bevy_core_pipeline" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b422dca94195c904964ab21bc4557fbd11f692c299d46e38364715ac931841e" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_render", +] + +[[package]] +name = "bevy_crevice" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c684de72f710da0a701d1d2fe2a481241709d66f43215bcc9d7f9f0818d1cb15" +dependencies = [ + "bevy-crevice-derive", + "bytemuck", + "glam", + "mint", +] [[package]] name = "bevy_derive" @@ -151,6 +312,19 @@ dependencies = [ "syn", ] +[[package]] +name = "bevy_diagnostic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbe98f48873d4b20f6479723de18d957f4bc00c653efd36c245e6a66d6e8b71" +dependencies = [ + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_utils", +] + [[package]] name = "bevy_ecs" version = "0.6.0" @@ -181,6 +355,105 @@ dependencies = [ "syn", ] +[[package]] +name = "bevy_gilrs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b457f720b1c54ede34afd6007beae3708503c0dd7a4ab4b416e36cb8bbd05ac1" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_utils", + "gilrs", +] + +[[package]] +name = "bevy_gltf" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e4711f4f77542dccd59eec249c98f02e34e28a25ee079c14cd351061d08e5c" +dependencies = [ + "anyhow", + "base64", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_transform", + "bevy_utils", + "gltf", + "percent-encoding", + "thiserror", +] + +[[package]] +name = "bevy_input" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33989693efa636960dd40e540029ed7b7bc1af2f3eef26c009555b5e2a4e185a" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_utils", +] + +[[package]] +name = "bevy_internal" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92af28d95bba80d11840c24fa4ce8ff84ae27af1def2f5cf8a6891acce5d714" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_audio", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", + "bevy_gilrs", + "bevy_gltf", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_sprite", + "bevy_tasks", + "bevy_text", + "bevy_transform", + "bevy_ui", + "bevy_utils", + "bevy_window", + "bevy_winit", + "ndk-glue 0.5.0", +] + +[[package]] +name = "bevy_log" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf0083e72bf76cbfa6607311ac6baef2f4f7c9306c35942cece8c0589cd3e5e" +dependencies = [ + "android_log-sys", + "bevy_app", + "bevy_utils", + "console_error_panic_hook", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + [[package]] name = "bevy_macro_utils" version = "0.6.0" @@ -192,6 +465,37 @@ dependencies = [ "syn", ] +[[package]] +name = "bevy_math" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0f9ebf2ef80a8fff3e5dca817594071004048cd089e72b9a1bf4e494b66112" +dependencies = [ + "bevy_reflect", + "glam", +] + +[[package]] +name = "bevy_pbr" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41724d89746d54f7f8c8e522f9d0b1232a8a289e0d270482175d23774dc2362a" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bitflags", + "bytemuck", +] + [[package]] name = "bevy_reflect" version = "0.6.0" @@ -202,8 +506,10 @@ dependencies = [ "bevy_utils", "downcast-rs", "erased-serde", + "glam", "parking_lot", "serde", + "smallvec", "thiserror", ] @@ -220,6 +526,87 @@ dependencies = [ "uuid", ] +[[package]] +name = "bevy_render" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac0d5409e5e3d48f3192f78e37bedea29aa0c674083e51aaa7e945496913d2c2" +dependencies = [ + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_crevice", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bitflags", + "codespan-reporting", + "copyless", + "downcast-rs", + "futures-lite", + "hex", + "hexasphere", + "image", + "naga", + "once_cell", + "parking_lot", + "regex", + "serde", + "smallvec", + "thiserror", + "wgpu", +] + +[[package]] +name = "bevy_scene" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21eb2b01e4d1b074c75ea59a92409739cac24b56b1c723491ef80936d50e95df" +dependencies = [ + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_reflect", + "bevy_transform", + "bevy_utils", + "ron", + "serde", + "thiserror", + "uuid", +] + +[[package]] +name = "bevy_sprite" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66439831ff57c11c7fb2692e7ccf8d0551f4368a9908908d3c38f2da53115b33" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bitflags", + "bytemuck", + "copyless", + "guillotiere", + "rectangle-pack", + "serde", + "thiserror", +] + [[package]] name = "bevy_tasks" version = "0.6.0" @@ -234,6 +621,72 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "bevy_text" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233c4bb933435e8e6c34a1310317fd7f8c6617526270de572e643816070b236a" +dependencies = [ + "ab_glyph", + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", + "bevy_window", + "glyph_brush_layout", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_transform" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9974c494f9cc721df46d2ba27c6a8df2a955ed8360a23adabd2bd66d1f73fa8f" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", + "smallvec", +] + +[[package]] +name = "bevy_ui" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbdb34595bd7be349fba8038b970acbe632f70b98737318b2327c7c7cd557767" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_text", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bytemuck", + "serde", + "smallvec", + "stretch", +] + [[package]] name = "bevy_utils" version = "0.6.0" @@ -248,6 +701,57 @@ dependencies = [ "uuid", ] +[[package]] +name = "bevy_window" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f4b52b766baf565e96f24f61dbc51bc85151f23202fed2b3650769f2edd0b21" +dependencies = [ + "bevy_app", + "bevy_math", + "bevy_utils", + "raw-window-handle", + "web-sys", +] + +[[package]] +name = "bevy_winit" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d4a4bed46200615e070897a551d2389d49cdaff048e825e7fa6caef4dc57c6" +dependencies = [ + "approx 0.5.1", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_math", + "bevy_utils", + "bevy_window", + "raw-window-handle", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "bindgen" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] + [[package]] name = "bit-set" version = "0.5.2" @@ -263,12 +767,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" - [[package]] name = "bitflags" version = "1.3.2" @@ -314,20 +812,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] -name = "cache-padded" -version = "1.2.0" +name = "bytes" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] -name = "calloop" -version = "0.9.3" +name = "cache-padded" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" -dependencies = [ - "log", - "nix", -] +checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cargo-manifest" @@ -345,6 +839,24 @@ name = "cc" version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom", +] [[package]] name = "cfg-if" @@ -365,13 +877,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] -name = "cgmath" -version = "0.18.0" +name = "clang-sys" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" +checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" dependencies = [ - "approx", - "num-traits", + "glob", + "libc", + "libloading", ] [[package]] @@ -421,6 +934,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "combine" +version = "4.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -440,22 +963,22 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "console_log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" -dependencies = [ - "log", - "web-sys", -] - [[package]] name = "copyless" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" +[[package]] +name = "core-foundation" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +dependencies = [ + "core-foundation-sys 0.6.2", + "libc", +] + [[package]] name = "core-foundation" version = "0.7.0" @@ -476,6 +999,12 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + [[package]] name = "core-foundation-sys" version = "0.7.0" @@ -539,69 +1068,67 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crevice" -version = "0.8.0" +name = "coreaudio-rs" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4f6c6d647171f93b5f65f1250ea929c7189b4330e9364be147d4571ae01f8f" +checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" dependencies = [ - "bytemuck", - "cgmath", - "crevice-derive", - "mint", + "bitflags", + "coreaudio-sys", ] [[package]] -name = "crevice-derive" -version = "0.8.0" +name = "coreaudio-sys" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d88c3459fdadc1206f8ea5c4746547c92cbbf8ec9e6d91b2242847d5e00fde4" +checksum = "ca4679a59dbd8c15f064c012dfe8c1163b9453224238b59bb9328c142b8b248b" dependencies = [ - "proc-macro2", - "quote", - "syn", + "bindgen", ] [[package]] -name = "crossbeam-channel" -version = "0.5.2" +name = "cpal" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", + "alsa", + "core-foundation-sys 0.8.3", + "coreaudio-rs", + "jni", + "js-sys", + "lazy_static", + "libc", + "mach 0.3.2", + "ndk 0.6.0", + "ndk-glue 0.6.1", + "nix", + "oboe", + "parking_lot", + "stdweb 0.1.3", + "thiserror", + "wasm-bindgen", + "web-sys", + "winapi", ] [[package]] -name = "crossbeam-deque" -version = "0.8.1" +name = "crc32fast" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", ] [[package]] -name = "crossbeam-epoch" -version = "0.9.7" +name = "crossbeam-channel" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" +checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", ] [[package]] @@ -668,11 +1195,12 @@ dependencies = [ [[package]] name = "deflate" -version = "1.0.0" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" +checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" dependencies = [ "adler32", + "byteorder", ] [[package]] @@ -687,98 +1215,38 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "dlib" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" -dependencies = [ - "libloading", -] - [[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "egui" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c733356eb5f1139fdeedc370c00e9ea689c5d9120502c43925285bc7249a333" -dependencies = [ - "ahash", - "epaint", - "nohash-hasher", -] - -[[package]] -name = "egui_wgpu_backend" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e59185e6e0ba5691235434f3eef768dcbcbdf3322055819435a1697ebd8facff" -dependencies = [ - "bytemuck", - "egui", - "wgpu", -] - -[[package]] -name = "egui_winit_platform" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f145532d38e25621e3d24814fa76ce8b3ed714f2acf081060097fa571a357d" -dependencies = [ - "egui", - "winit", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "emath" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55673de2eb96660dde25ba7b2d36a7054beead1a2bec74dcfd5eb05a1e1ba76d" - [[package]] name = "env_logger" -version = "0.9.0" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ - "atty", - "humantime", "log", "regex", - "termcolor", ] [[package]] -name = "epaint" -version = "0.16.0" +name = "erased-serde" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfd9296f7f92902e41c0e8e5deca6d2fb29f289c86d03a01ea01bd7498316c2" +checksum = "56047058e1ab118075ca22f9ecd737bcc961aa3566a3019cb71388afa280bd8a" dependencies = [ - "ab_glyph", - "ahash", - "atomic_refcell", - "emath", - "nohash-hasher", + "serde", ] [[package]] -name = "erased-serde" -version = "0.3.18" +name = "euclid" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56047058e1ab118075ca22f9ecd737bcc961aa3566a3019cb71388afa280bd8a" +checksum = "da96828553a086d7b18dcebfc579bd9628b016f86590d7453c115e490fa74b80" dependencies = [ - "serde", + "num-traits", ] [[package]] @@ -787,22 +1255,6 @@ version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" -[[package]] -name = "exr" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4badb9489a465cb2c555af1f00f0bfd8cecd6fc12ac11da9d5b40c5dd5f0200" -dependencies = [ - "bit_field", - "deflate", - "flume", - "half", - "inflate", - "lebe", - "smallvec", - "threadpool", -] - [[package]] name = "fastrand" version = "1.7.0" @@ -813,35 +1265,22 @@ dependencies = [ ] [[package]] -name = "fixedbitset" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" - -[[package]] -name = "flate2" -version = "1.0.22" +name = "filetime" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", - "crc32fast", "libc", - "miniz_oxide 0.4.4", + "redox_syscall", + "winapi", ] [[package]] -name = "flume" -version = "0.10.11" +name = "fixedbitset" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b279436a715a9de95dcd26b151db590a71961cc06e54918b24fe0dd5b7d3fc4" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin", -] +checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "fnv" @@ -865,28 +1304,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" +name = "fsevent-sys" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" dependencies = [ - "futures-core", - "futures-sink", + "libc", ] [[package]] @@ -895,17 +1318,6 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.21" @@ -928,88 +1340,134 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.21" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" dependencies = [ - "proc-macro2", - "quote", - "syn", + "byteorder", ] [[package]] -name = "futures-sink" -version = "0.3.21" +name = "getrandom" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] [[package]] -name = "futures-task" -version = "0.3.21" +name = "gilrs" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "1550c8bdebc993576e343d600a954654708a9a1182396ee1e805d6fe60c72909" +dependencies = [ + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", +] [[package]] -name = "futures-util" -version = "0.3.21" +name = "gilrs-core" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "84c7262ce1e88429c9b1d847820c9d2ba00adafc955218393d9c0861d5aaab88" dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", + "core-foundation 0.6.4", + "io-kit-sys", + "js-sys", + "libc", + "libudev-sys", + "log", + "nix", + "rusty-xinput", + "stdweb 0.4.20", + "uuid", + "vec_map", + "web-sys", + "winapi", +] + +[[package]] +name = "glam" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fa84eead97d5412b2a20aed4d66612a97a9e41e08eababdb9ae2bf88667490" +dependencies = [ + "bytemuck", + "mint", + "serde", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "glow" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "fxhash" -version = "0.2.1" +name = "gltf" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +checksum = "8ff38b75359a0096dd0a8599b6e4f37a6ee41d5df300cc7669e62aafa697f7a2" dependencies = [ "byteorder", + "gltf-json", + "lazy_static", ] [[package]] -name = "getrandom" -version = "0.2.4" +name = "gltf-derive" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" +checksum = "1f2a9333e0f9c7bca94dfc20bcf44fa12a61eeec662d6e007563ff748aa59c70" dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", + "inflections", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "gif" -version = "0.11.3" +name = "gltf-json" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b" +checksum = "a1414d3a98cbaabdb2f134328b1f6036d14b282febc1df51952a435d2ca17fb6" dependencies = [ - "color_quant", - "weezl", + "gltf-derive", + "serde", + "serde_derive", + "serde_json", ] [[package]] -name = "glow" -version = "0.11.2" +name = "glyph_brush_layout" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", + "ab_glyph", + "approx 0.5.1", + "xi-unicode", ] [[package]] @@ -1052,10 +1510,14 @@ dependencies = [ ] [[package]] -name = "half" -version = "1.8.2" +name = "guillotiere" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] [[package]] name = "hashbrown" @@ -1076,16 +1538,26 @@ dependencies = [ ] [[package]] -name = "hexf-parse" -version = "0.2.1" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "humantime" -version = "2.1.0" +name = "hexasphere" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dc62dcfd68ec810c4707804556f2e88655012b1a373b0e0bbbe88a9db366627" +dependencies = [ + "glam", + "lazy_static", +] + +[[package]] +name = "hexf-parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "ident_case" @@ -1095,22 +1567,18 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "image" -version = "0.24.0" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94ac3d41f882c624a82d7945952032388488681f45f9d4077999a6c85688d61" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder 0.2.2", "num-iter", "num-rational", "num-traits", "png", "scoped_threadpool", - "tiff", ] [[package]] @@ -1124,12 +1592,29 @@ dependencies = [ ] [[package]] -name = "inflate" -version = "0.4.5" +name = "inflections" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "adler32", + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", ] [[package]] @@ -1146,11 +1631,20 @@ checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", "js-sys", - "stdweb", "wasm-bindgen", "web-sys", ] +[[package]] +name = "io-kit-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" +dependencies = [ + "core-foundation-sys 0.6.2", + "mach 0.2.3", +] + [[package]] name = "itoa" version = "1.0.1" @@ -1158,24 +1652,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] -name = "jni-sys" -version = "0.3.0" +name = "jni" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] [[package]] -name = "jpeg-decoder" -version = "0.1.22" +name = "jni-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] -name = "jpeg-decoder" -version = "0.2.2" +name = "jobserver" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105fb082d64e2100074587f59a74231f771750c664af903f1f9f76c9dedfc6f1" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" dependencies = [ - "rayon", + "libc", ] [[package]] @@ -1197,6 +1699,26 @@ dependencies = [ "libloading", ] +[[package]] +name = "kqueue" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058a107a784f8be94c7d35c1300f4facced2e93d2fbe5b1452b44e905ddca4a9" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags", + "libc", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1204,10 +1726,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lebe" -version = "0.5.1" +name = "lazycell" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efd1d698db0759e6ef11a7cd44407407399a910c774dd804c64c032da7826ff" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] [[package]] name = "libc" @@ -1225,6 +1758,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "lock_api" version = "0.4.6" @@ -1244,29 +1793,47 @@ dependencies = [ ] [[package]] -name = "malloc_buf" -version = "0.0.6" +name = "mach" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" dependencies = [ "libc", ] [[package]] -name = "memchr" -version = "2.4.1" +name = "mach" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] [[package]] -name = "memmap2" -version = "0.3.1" +name = "malloc_buf" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + [[package]] name = "memoffset" version = "0.6.5" @@ -1290,29 +1857,13 @@ dependencies = [ "objc", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" dependencies = [ - "adler", + "adler32", ] [[package]] @@ -1321,6 +1872,19 @@ version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" +[[package]] +name = "mio" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +dependencies = [ + "libc", + "log", + "miow", + "ntapi", + "winapi", +] + [[package]] name = "mio" version = "0.8.0" @@ -1356,45 +1920,73 @@ dependencies = [ "indexmap", "log", "num-traits", + "petgraph", + "pp-rs", "rustc-hash", "spirv", "thiserror", ] [[package]] -name = "nanorand" -version = "0.6.1" +name = "ndk" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729eb334247daa1803e0a094d0a5c55711b85571179f5ec6e53eccfdf7008958" +checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" dependencies = [ - "getrandom", + "bitflags", + "jni-sys", + "ndk-sys 0.2.2", + "num_enum", + "thiserror", ] [[package]] name = "ndk" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ "bitflags", "jni-sys", - "ndk-sys", + "ndk-sys 0.3.0", "num_enum", "thiserror", ] +[[package]] +name = "ndk-context" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5cc68637e21fe8f077f6a1c9e0b9ca495bb74895226b476310f613325884" + [[package]] name = "ndk-glue" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc291b8de2095cba8dab7cf381bf582ff4c17a09acf854c32e46545b08085d28" +dependencies = [ + "android_logger", + "lazy_static", + "libc", + "log", + "ndk 0.5.0", + "ndk-macro", + "ndk-sys 0.2.2", +] + +[[package]] +name = "ndk-glue" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9ffb7443daba48349d545028777ca98853b018b4c16624aa01223bc29e078da" dependencies = [ "lazy_static", "libc", "log", - "ndk", + "ndk 0.6.0", + "ndk-context", "ndk-macro", - "ndk-sys", + "ndk-sys 0.3.0", ] [[package]] @@ -1416,11 +2008,20 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", @@ -1429,23 +2030,34 @@ dependencies = [ "memoffset", ] -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - [[package]] name = "nom" -version = "7.1.0" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "memchr", - "minimal-lexical", "version_check", ] +[[package]] +name = "notify" +version = "5.0.0-pre.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c614e7ed2b1cf82ec99aeffd8cf6225ef5021b9951148eb161393c394855032c" +dependencies = [ + "bitflags", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio 0.7.14", + "walkdir", + "winapi", +] + [[package]] name = "ntapi" version = "0.3.7" @@ -1455,6 +2067,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -1478,9 +2101,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg", "num-integer", @@ -1546,6 +2169,38 @@ dependencies = [ "cc", ] +[[package]] +name = "oboe" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2463c8f2e19b4e0d0710a21f8e4011501ff28db1c95d7a5482a553b2100502d2" +dependencies = [ + "jni", + "ndk 0.6.0", + "ndk-glue 0.6.1", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + [[package]] name = "once_cell" version = "1.9.0" @@ -1593,29 +2248,25 @@ dependencies = [ ] [[package]] -name = "percent-encoding" -version = "2.1.0" +name = "peeking_take_while" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "pin-project" -version = "1.0.10" +name = "percent-encoding" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" -dependencies = [ - "pin-project-internal", -] +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "pin-project-internal" -version = "1.0.10" +name = "petgraph" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ - "proc-macro2", - "quote", - "syn", + "fixedbitset", + "indexmap", ] [[package]] @@ -1624,12 +2275,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] name = "pkg-config" version = "0.3.24" @@ -1638,16 +2283,31 @@ checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "png" -version = "0.17.3" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8f1882177b17c98ec33a51f5910ecbf4db92ca0def706781a1f8d0c661f393" +checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" dependencies = [ "bitflags", "crc32fast", "deflate", - "miniz_oxide 0.5.1", + "miniz_oxide", +] + +[[package]] +name = "pp-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" +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.0" @@ -1683,45 +2343,56 @@ dependencies = [ ] [[package]] -name = "range-alloc" -version = "0.1.2" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] [[package]] -name = "raw-window-handle" -version = "0.4.2" +name = "rand_chacha" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ - "cty", + "ppv-lite86", + "rand_core", ] [[package]] -name = "rayon" -version = "1.5.1" +name = "rand_core" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", + "getrandom", ] [[package]] -name = "rayon-core" -version = "1.9.1" +name = "range-alloc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" + +[[package]] +name = "raw-window-handle" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", + "cty", ] +[[package]] +name = "rectangle-pack" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb" + [[package]] name = "redox_syscall" version = "0.2.10" @@ -1742,6 +2413,15 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + [[package]] name = "regex-syntax" version = "0.6.25" @@ -1754,6 +2434,27 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" +[[package]] +name = "rodio" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9" +dependencies = [ + "cpal", + "lewton", +] + +[[package]] +name = "ron" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" +dependencies = [ + "base64", + "bitflags", + "serde", +] + [[package]] name = "rustc-hash" version = "1.1.0" @@ -1769,6 +2470,17 @@ dependencies = [ "semver", ] +[[package]] +name = "rusty-xinput" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb" +dependencies = [ + "lazy_static", + "log", + "winapi", +] + [[package]] name = "ryu" version = "1.0.9" @@ -1776,10 +2488,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] -name = "scoped-tls" -version = "1.0.0" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "scoped_threadpool" @@ -1813,6 +2528,9 @@ name = "serde" version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" @@ -1851,6 +2569,21 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" + [[package]] name = "slab" version = "0.4.5" @@ -1871,33 +2604,19 @@ name = "smallvec" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "smithay-client-toolkit" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1325f292209cee78d5035530932422a30aa4c8fda1a16593ac083c1de211e68a" dependencies = [ - "bitflags", - "calloop", - "dlib", - "lazy_static", - "log", - "memmap2", - "nix", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", + "serde", ] [[package]] -name = "spin" -version = "0.9.2" +name = "smooth-bevy-cameras" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" +checksum = "63e2ea6d4cf1ee6e40e804e50b2bb73a06b7dc4e23ea0f427cf77971796310f6" dependencies = [ - "lock_api", + "approx 0.4.0", + "bevy", + "serde", ] [[package]] @@ -1910,6 +2629,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "stdweb" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" + [[package]] name = "stdweb" version = "0.4.20" @@ -1961,12 +2686,28 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" +[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + [[package]] name = "syn" version = "1.0.86" @@ -2008,25 +2749,29 @@ dependencies = [ ] [[package]] -name = "threadpool" -version = "1.8.1" +name = "thread_local" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "num_cpus", + "once_cell", ] [[package]] -name = "tiff" -version = "0.7.1" +name = "tinyvec" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0247608e998cb6ce39dfc8f4a16c50361ce71e5b52e6d24ea1227ea8ea8ee0b2" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ - "flate2", - "jpeg-decoder 0.1.22", - "weezl", + "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" @@ -2067,6 +2812,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ "lazy_static", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" +dependencies = [ + "ansi_term", + "lazy_static", + "matchers", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-wasm" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" +dependencies = [ + "tracing", + "tracing-subscriber", + "wasm-bindgen", ] [[package]] @@ -2097,43 +2883,30 @@ dependencies = [ "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "vesta" -version = "0.4.0" -dependencies = [ - "anyhow", - "bevy_ecs", - "bytemuck", - "cgmath", - "console_error_panic_hook", - "console_log", - "crevice", - "egui", - "egui_wgpu_backend", - "egui_winit_platform", - "env_logger", - "futures", - "image", - "instant", - "log", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu", - "winit", -] - [[package]] name = "vesta_example" -version = "0.1.0" +version = "0.1.5" dependencies = [ - "vesta", + "bevy", + "smooth-bevy-cameras", ] [[package]] @@ -2142,6 +2915,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" @@ -2214,79 +2998,6 @@ version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" -[[package]] -name = "wayland-client" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91223460e73257f697d9e23d401279123d36039a3f7a449e983f123292d4458f" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e" -dependencies = [ - "nix", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd" -dependencies = [ - "nix", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741" -dependencies = [ - "bitflags", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a1ed3143f7a143187156a2ab52742e89dac33245ba505c17224df48939f9e0" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.29.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - [[package]] name = "web-sys" version = "0.3.56" @@ -2297,12 +3008,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "weezl" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" - [[package]] name = "wgpu" version = "0.12.0" @@ -2441,18 +3146,15 @@ dependencies = [ "lazy_static", "libc", "log", - "mio", - "ndk", - "ndk-glue", - "ndk-sys", + "mio 0.8.0", + "ndk 0.5.0", + "ndk-glue 0.5.0", + "ndk-sys 0.2.2", "objc", "parking_lot", "percent-encoding", "raw-window-handle", - "smithay-client-toolkit", "wasm-bindgen", - "wayland-client", - "wayland-protocols", "web-sys", "winapi", "x11-dl", @@ -2470,16 +3172,7 @@ dependencies = [ ] [[package]] -name = "xcursor" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] - -[[package]] -name = "xml-rs" -version = "0.8.4" +name = "xi-unicode" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" diff --git a/example/Cargo.toml b/example/Cargo.toml index 1f3fd9b..405d981 100644 --- a/example/Cargo.toml +++ b/example/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "vesta_example" -version = "0.1.0" +version = "0.1.5" authors = ["Dominic Maas "] edition = "2021" [dependencies] -vesta = { path = "../vesta" } +bevy = "0.6.0" +smooth-bevy-cameras = "0.2.0" diff --git a/example/src/square.png b/example/assets/square.png similarity index 100% rename from example/src/square.png rename to example/assets/square.png diff --git a/example/build_wasm.bat b/example/build_wasm.bat deleted file mode 100644 index da30c58..0000000 --- a/example/build_wasm.bat +++ /dev/null @@ -1,5 +0,0 @@ -SET RUSTFLAGS=--cfg=web_sys_unstable_apis - -cargo build --target wasm32-unknown-unknown - -wasm-bindgen --out-dir web --web target/wasm32-unknown-unknown/debug/vesta_example.wasm diff --git a/example/build_wasm.sh b/example/build_wasm.sh deleted file mode 100644 index 420423d..0000000 --- a/example/build_wasm.sh +++ /dev/null @@ -1,3 +0,0 @@ -RUSTFLAGS=--cfg=web_sys_unstable_apis cargo build --target wasm32-unknown-unknown - -wasm-bindgen --out-dir web --web target/wasm32-unknown-unknown/debug/vesta_example.wasm diff --git a/example/src/app.rs b/example/src/app.rs deleted file mode 100644 index de08d7b..0000000 --- a/example/src/app.rs +++ /dev/null @@ -1,131 +0,0 @@ -use vesta::{ - cgmath::num_traits::FloatConst, egui::CtxRef, log::info, winit::dpi::PhysicalSize, Engine, -}; - -use crate::cube::Cube; - -pub struct App { - render_pipeline: vesta::wgpu::RenderPipeline, - cube: Cube, - camera: vesta::Camera, - camera_controller: vesta::ArcBallCameraController, - scene: vesta::Scene, -} - -impl vesta::VestaApp for App { - fn init(engine: &mut vesta::Engine) -> Self { - info!("Init Start!"); - - let render_pipeline_layout = - engine - .renderer - .device - .create_pipeline_layout(&vesta::wgpu::PipelineLayoutDescriptor { - label: Some("Render Pipeline Layout"), - bind_group_layouts: &[ - &vesta::Texture::create_bind_group_layout(&engine.renderer.device), - &vesta::UniformBufferUtils::create_bind_group_layout( - vesta::wgpu::ShaderStages::VERTEX, - &engine.renderer.device, - ), - &vesta::UniformBufferUtils::create_bind_group_layout( - vesta::wgpu::ShaderStages::VERTEX, - &engine.renderer.device, - ), - ], - push_constant_ranges: &[], - }); - - let render_pipeline = vesta::RenderPipelineBuilder::new( - engine.renderer.surface_config.format, - "Render Pipeline", - ) - .with_shader_source(vesta::wgpu::ShaderSource::Wgsl( - include_str!("shader.wgsl").into(), - )) - .with_layout(&render_pipeline_layout) - .build(&engine.renderer.device) - .unwrap(); - - let cube = Cube::new(&engine.renderer); - - // Setup the main camera - let camera = vesta::CameraBuilder::new() - .with_position((0.0, 0.0, 3.0).into()) - .build( - vesta::PerspectiveProjection::new( - engine.get_window_size().width, - engine.get_window_size().height, - vesta::cgmath::Rad(70.0 / 180.0 * f32::PI()), - 0.01, - 1000.0, - ), - &engine.renderer.device, - ); - - let camera_controller = vesta::ArcBallCameraController::default(); - - info!("Init Finish!"); - - let mut scene = vesta::Scene::default(); - - // Create a cube mesh with a default transform - scene - .world() - .spawn() - .insert(vesta::components::Transform::default()) - .insert(engine.renderer.create_cube_mesh()); - - Self { - render_pipeline, - cube, - camera, - camera_controller, - scene, - } - } - - fn physics_update(&mut self, dt: f32, engine: &mut vesta::Engine) { - self.cube.update(dt, &engine.renderer); - } - - fn update(&mut self, engine: &mut vesta::Engine) { - self.camera_controller.process_input( - &mut self.camera, - &engine, - engine.is_cursor_captured(), - ); - - self.camera_controller.update_camera(&mut self.camera); - self.camera.update_uniforms(&engine.renderer); - } - - fn render_ui(&mut self, ctx: &CtxRef, _engine: &Engine) { - vesta::egui::SidePanel::left("settings_panel") - .frame(vesta::egui::Frame { - margin: vesta::egui::vec2(20.0, 20.0), - ..Default::default() - }) - .min_width(200.0) - .show(&ctx, |ui| { - ui.heading("Vesta Engine Example"); - ui.separator(); - ui.label("Click and drag to move the camera around the cube."); - }); - } - - fn render<'a>( - &'a mut self, - render_pass: &mut vesta::wgpu::RenderPass<'a>, - _engine: &vesta::Engine, - ) { - render_pass.set_pipeline(&self.render_pipeline); - render_pass.set_bind_group(1, &self.camera.uniform_buffer.bind_group, &[]); - self.cube.draw(render_pass); - } - - fn resize(&mut self, size: PhysicalSize, _engine: &vesta::Engine) { - // The screen projection needs to be updated - self.camera.projection.resize(size.width, size.height); - } -} diff --git a/example/src/cube.rs b/example/src/cube.rs deleted file mode 100644 index 3723b03..0000000 --- a/example/src/cube.rs +++ /dev/null @@ -1,239 +0,0 @@ -use vesta::cgmath::{Matrix3, Matrix4, Vector2, Vector3}; -use vesta::components::DrawMesh; - -pub struct Cube { - mesh: vesta::components::Mesh, - uniform_buffer: vesta::UniformBuffer, - texture: vesta::Texture, - angle: f32, -} - -impl Cube { - pub fn new(renderer: &vesta::Renderer) -> Self { - let mut vertices: Vec = Vec::new(); - let mut indices: Vec = Vec::new(); - - let x = 0.0; - let y = 0.0; - let z = 0.0; - let mut curr_index = 0; - - // BACK - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 1.0 + y, 0.0 + z), - Vector2::new(1.0, 1.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 0.0 + y, 0.0 + z), - Vector2::new(1.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 0.0 + y, 0.0 + z), - Vector2::new(0.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 1.0 + y, 0.0 + z), - Vector2::new(0.0, 1.0), - )); - - indices.push(curr_index); - indices.push(curr_index + 1); - indices.push(curr_index + 3); - - indices.push(curr_index + 1); - indices.push(curr_index + 2); - indices.push(curr_index + 3); - - curr_index += 4; - - // FRONT - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 0.0 + y, 1.0 + z), - Vector2::new(1.0, 1.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 0.0 + y, 1.0 + z), - Vector2::new(1.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 1.0 + y, 1.0 + z), - Vector2::new(0.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 1.0 + y, 1.0 + z), - Vector2::new(0.0, 1.0), - )); - - indices.push(curr_index); - indices.push(curr_index + 1); - indices.push(curr_index + 3); - - indices.push(curr_index + 1); - indices.push(curr_index + 2); - indices.push(curr_index + 3); - - curr_index += 4; - - // Right - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 1.0 + y, 1.0 + z), - Vector2::new(1.0, 1.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 1.0 + y, 0.0 + z), - Vector2::new(1.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 0.0 + y, 0.0 + z), - Vector2::new(0.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 0.0 + y, 1.0 + z), - Vector2::new(0.0, 1.0), - )); - - indices.push(curr_index); - indices.push(curr_index + 1); - indices.push(curr_index + 3); - - indices.push(curr_index + 1); - indices.push(curr_index + 2); - indices.push(curr_index + 3); - - curr_index += 4; - - // Left - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 0.0 + y, 0.0 + z), - Vector2::new(1.0, 1.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 1.0 + y, 0.0 + z), - Vector2::new(1.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 1.0 + y, 1.0 + z), - Vector2::new(0.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 0.0 + y, 1.0 + z), - Vector2::new(0.0, 1.0), - )); - - indices.push(curr_index); - indices.push(curr_index + 1); - indices.push(curr_index + 3); - - indices.push(curr_index + 1); - indices.push(curr_index + 2); - indices.push(curr_index + 3); - - curr_index += 4; - - // Down - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 0.0 + y, 0.0 + z), - Vector2::new(1.0, 1.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 0.0 + y, 0.0 + z), - Vector2::new(1.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 0.0 + y, 1.0 + z), - Vector2::new(0.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 0.0 + y, 1.0 + z), - Vector2::new(0.0, 1.0), - )); - - indices.push(curr_index); - indices.push(curr_index + 1); - indices.push(curr_index + 3); - - indices.push(curr_index + 1); - indices.push(curr_index + 2); - indices.push(curr_index + 3); - - curr_index += 4; - - // Up - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 1.0 + y, 1.0 + z), - Vector2::new(1.0, 1.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(1.0 + x, 1.0 + y, 0.0 + z), - Vector2::new(1.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 1.0 + y, 0.0 + z), - Vector2::new(0.0, 0.0), - )); - vertices.push(vesta::Vertex::with_tex_coords( - Vector3::new(0.0 + x, 1.0 + y, 1.0 + z), - Vector2::new(0.0, 1.0), - )); - - indices.push(curr_index); - indices.push(curr_index + 1); - indices.push(curr_index + 3); - - indices.push(curr_index + 1); - indices.push(curr_index + 2); - indices.push(curr_index + 3); - - let mesh = renderer.create_mesh(vertices, indices); - - let transform = vesta::components::Transform::default(); - - let uniform_data = vesta::ModelUniform { - model: transform.calculate_model_matrix(), - normal: transform.calculate_normal_matrix(), - }; - - let uniform_buffer = vesta::UniformBuffer::new( - "Cube Uniform Buffer", - vesta::wgpu::ShaderStages::VERTEX, - uniform_data, - &renderer.device, - ); - - let texture = renderer - .create_texture_from_bytes( - include_bytes!("square.png"), - Some("square.png"), - Default::default(), - ) - .unwrap(); - - Self { - mesh, - uniform_buffer, - texture, - angle: 0.0, - } - } - - pub fn update(&mut self, dt: f32, renderer: &vesta::Renderer) { - self.angle += dt * 100.0; - if self.angle >= 360.0 { - self.angle = 0.0; - } - - //let rotation = Matrix4::from_angle_z(Deg(self.angle)); - let model = Matrix4::from_translation(Vector3::new(0.0, 0.0, 0.0)); // * rotation; - let normal = Matrix3::from_cols(model.x.truncate(), model.y.truncate(), model.z.truncate()); - - self.uniform_buffer.data.model = model; - self.uniform_buffer.data.normal = normal; - renderer.write_uniform_buffer(&self.uniform_buffer); - } - - pub fn draw<'a>(&'a self, render_pass: &mut vesta::wgpu::RenderPass<'a>) { - render_pass.set_bind_group(0, self.texture.bind_group.as_ref().unwrap(), &[]); - render_pass.set_bind_group(2, &self.uniform_buffer.bind_group, &[]); - render_pass.draw_mesh(&self.mesh); - } -} diff --git a/example/src/main.rs b/example/src/main.rs index acc143d..9ba6c1e 100644 --- a/example/src/main.rs +++ b/example/src/main.rs @@ -1,16 +1,79 @@ -mod app; -mod cube; - -use app::*; -use vesta::winit::dpi::PhysicalSize; +use bevy::prelude::*; +use smooth_bevy_cameras::{ + controllers::orbit::{OrbitCameraBundle, OrbitCameraController, OrbitCameraPlugin}, + LookTransformPlugin, +}; fn main() { - // Config for the engine - let config = vesta::Config { - window_title: "Vesta Example".to_string(), - window_size: PhysicalSize::new(1920, 1080), - }; + App::new() + .insert_resource(Msaa { samples: 4 }) + .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0))) + .add_plugins(DefaultPlugins) + .add_plugin(LookTransformPlugin) + .add_plugin(OrbitCameraPlugin::default()) + .add_startup_system(setup) + .run(); +} + +fn setup( + mut commands: Commands, + asset_server: Res, + mut meshes: ResMut>, + mut materials: ResMut>, +) { + // Texture for the cube + let texture_handle = asset_server.load("square.png"); + + // Simple plane that the cube is floating on top of + commands.spawn_bundle(PbrBundle { + mesh: meshes.add(Mesh::from(shape::Plane { size: 6.0 })), + material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()), + transform: Transform::from_xyz(0.0, -1.0, 0.0), + ..Default::default() + }); + + // Cube that we rotate around (also rotate around the plane) + commands.spawn_bundle(PbrBundle { + mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), + material: materials.add(StandardMaterial { + base_color_texture: Some(texture_handle.clone()), + alpha_mode: AlphaMode::Blend, + ..Default::default() + }), + transform: Transform::from_xyz(0.0, 0.0, 0.0), + ..Default::default() + }); + + // Light for the scene + const HALF_SIZE: f32 = 10.0; + commands.spawn_bundle(DirectionalLightBundle { + directional_light: DirectionalLight { + // Configure the projection to better fit the scene + shadow_projection: OrthographicProjection { + left: -HALF_SIZE, + right: HALF_SIZE, + bottom: -HALF_SIZE, + top: HALF_SIZE, + near: -10.0 * HALF_SIZE, + far: 10.0 * HALF_SIZE, + ..Default::default() + }, + shadows_enabled: true, + ..Default::default() + }, + transform: Transform { + translation: Vec3::new(0.0, 2.0, 0.0), + rotation: Quat::from_rotation_x(-std::f32::consts::FRAC_PI_4), + ..Default::default() + }, + ..Default::default() + }); - // Create for App, and pass in the config - vesta::Engine::run::(config); + // Main camera to look through + commands.spawn_bundle(OrbitCameraBundle::new( + OrbitCameraController::default(), + PerspectiveCameraBundle::default(), + Vec3::new(0.0, 0.0, 5.0), + Vec3::new(0., 0., 0.), + )); } diff --git a/example/src/shader.wgsl b/example/src/shader.wgsl deleted file mode 100644 index 3137e72..0000000 --- a/example/src/shader.wgsl +++ /dev/null @@ -1,53 +0,0 @@ -// Vertex input and output -struct VertexInput { - [[location(0)]] position: vec3; - [[location(1)]] color: vec3; - [[location(2)]] tex_coord: vec2; - [[location(3)]] normal: vec3; -}; - -struct VertexOutput { - [[builtin(position)]] position: vec4; - [[location(0)]] tex_coord: vec2; - [[location(1)]] normal: vec3; - [[location(2)]] vertex_position: vec3; -}; - -// Data structures -struct Camera { - view_proj: mat4x4; -}; - -struct Model { - model: mat4x4; - normal: mat3x3; -}; - -// Uniform bindings -[[group(0), binding(0)]] -var u_diffuse_texture: texture_2d; - -[[group(0), binding(1)]] -var u_sampler: sampler; - -[[group(1), binding(0)]] -var u_camera: Camera; - -[[group(2), binding(0)]] -var u_model: Model; - -// Vertex Shader -[[stage(vertex)]] -fn vs_main(in: VertexInput) -> VertexOutput { - - var out: VertexOutput; - out.tex_coord = in.tex_coord; - out.position = u_camera.view_proj * u_model.model * vec4(in.position, 1.0); - return out; -} - -// Fragment Shader -[[stage(fragment)]] -fn fs_main(in: VertexOutput) -> [[location(0)]] vec4 { - return textureSample(u_diffuse_texture, u_sampler, in.tex_coord); -} diff --git a/example/web/.gitignore b/example/web/.gitignore deleted file mode 100644 index bff1b2e..0000000 --- a/example/web/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.js -*.ts -*.wasm diff --git a/example/web/index.html b/example/web/index.html deleted file mode 100644 index 87f736a..0000000 --- a/example/web/index.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - From db12ebe13827920a10b95812918a3833fe753f5a Mon Sep 17 00:00:00 2001 From: Dominic Maas Date: Wed, 20 Apr 2022 18:06:34 +1200 Subject: [PATCH 02/47] lots of temp mess around, this will all be deleted in the futurez --- example/Cargo.lock | 419 ++- example/Cargo.toml | 4 +- example/src/main.rs | 43 +- graphics.code-workspace | 4 + projects/pixel_2d/Cargo.lock | 1400 +++++++- projects/pixel_2d/Cargo.toml | 4 +- projects/pixel_2d/build_wasm.bat | 5 - projects/pixel_2d/build_wasm.sh | 3 - projects/pixel_2d/src/main.rs | 54 +- projects/pixel_2d/web/.gitignore | 3 - projects/pixel_2d/web/index.html | 8 - projects/solar_system/Cargo.lock | 3179 +++++++++++++++++ projects/solar_system/Cargo.toml | 9 + projects/solar_system/src/celestial_body.rs | 69 + projects/solar_system/src/main.rs | 105 + .../solar_system/src/solar_system_plugin.rs | 80 + projects/titan/Cargo.lock | 2089 +++++++++-- projects/titan/Cargo.toml | 7 +- projects/titan/assets/block_map.png | Bin 0 -> 9069 bytes projects/titan/src/main.rs | 121 +- projects/titan/src/{ => old}/app.rs | 0 projects/titan/src/{ => old}/cube.rs | 0 projects/titan/src/{ => old}/entities/mod.rs | 0 .../titan/src/{ => old}/entities/player.rs | 0 projects/titan/src/{ => old}/sky_shader.rs | 0 .../titan/src/{ => old}/world/block_map.rs | 0 projects/titan/src/{ => old}/world/chunk.rs | 0 .../titan/src/{ => old}/world/generator.rs | 0 projects/titan/src/{ => old}/world/mod.rs | 0 projects/titan/src/{ => old}/world/world.rs | 0 projects/titan/src/terrain/chunk.rs | 144 + projects/titan/src/terrain/generator.rs | 46 + projects/titan/src/terrain/mod.rs | 56 + titan/Cargo.lock | 7 + titan/Cargo.toml | 8 + titan/src/main.rs | 3 + 36 files changed, 7306 insertions(+), 564 deletions(-) delete mode 100644 projects/pixel_2d/build_wasm.bat delete mode 100644 projects/pixel_2d/build_wasm.sh delete mode 100644 projects/pixel_2d/web/.gitignore delete mode 100644 projects/pixel_2d/web/index.html create mode 100644 projects/solar_system/Cargo.lock create mode 100644 projects/solar_system/Cargo.toml create mode 100644 projects/solar_system/src/celestial_body.rs create mode 100644 projects/solar_system/src/main.rs create mode 100644 projects/solar_system/src/solar_system_plugin.rs create mode 100644 projects/titan/assets/block_map.png rename projects/titan/src/{ => old}/app.rs (100%) rename projects/titan/src/{ => old}/cube.rs (100%) rename projects/titan/src/{ => old}/entities/mod.rs (100%) rename projects/titan/src/{ => old}/entities/player.rs (100%) rename projects/titan/src/{ => old}/sky_shader.rs (100%) rename projects/titan/src/{ => old}/world/block_map.rs (100%) rename projects/titan/src/{ => old}/world/chunk.rs (100%) rename projects/titan/src/{ => old}/world/generator.rs (100%) rename projects/titan/src/{ => old}/world/mod.rs (100%) rename projects/titan/src/{ => old}/world/world.rs (100%) create mode 100644 projects/titan/src/terrain/chunk.rs create mode 100644 projects/titan/src/terrain/generator.rs create mode 100644 projects/titan/src/terrain/mod.rs create mode 100644 titan/Cargo.lock create mode 100644 titan/Cargo.toml create mode 100644 titan/src/main.rs diff --git a/example/Cargo.lock b/example/Cargo.lock index f5dd5df..ee8db45 100644 --- a/example/Cargo.lock +++ b/example/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61caed9aec6daeee1ea38ccf5fb225e4f96c1eeead1b4a5c267324a63cf02326" +checksum = "24606928a235e73cdef55a0c909719cadd72fce573e5713d58cb2952d8f5794c" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" [[package]] name = "approx" @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8" +checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "autocfg" @@ -183,18 +183,18 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bevy" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b77ad2987710ed960746c43813ad8c103db5c4c090f5cbc9c32c0a90a91bc599" +checksum = "4fce306d40a111309ee61d4626efbafccdd46bb80657122c38061fa7264c08e4" dependencies = [ "bevy_internal", ] [[package]] name = "bevy-crevice-derive" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf594c9277eb1e426f45a00eaf70aa9ffdf479268d7e4538270263811e20bc" +checksum = "191a752a01c3402deb24320acf42288bf822e5d22f19ae1d903797f02e9b0c33" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -202,11 +202,28 @@ dependencies = [ "syn", ] +[[package]] +name = "bevy_animation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c087569c34b168dd988e8b3409ce273661b4a58c3c534d0e381950589f59f68e" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", +] + [[package]] name = "bevy_app" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fe3d3f4140fb11cd294f43be7cb66a5783d9277ba0270743e2860e32b25ab5" +checksum = "32660ae99fa3498ca379de28b7e2f447e6531b0e432bf200901efeec075553c1" dependencies = [ "bevy_derive", "bevy_ecs", @@ -218,9 +235,9 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb68a0259e2f857a32c4f05eb9b9447db1072297c61864ad07d02fea1838bde9" +checksum = "f2afd395240087924ba49c8cae2b00d007aeb1db53ee726a543b1e90dce2d3ab" dependencies = [ "anyhow", "bevy_app", @@ -233,7 +250,7 @@ dependencies = [ "crossbeam-channel", "downcast-rs", "js-sys", - "ndk-glue 0.5.0", + "ndk-glue 0.5.1", "notify", "parking_lot", "rand", @@ -246,9 +263,9 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0291276cf0dd1dbbf3393112d0e0276e4110f633965542123b830d8dae44fff3" +checksum = "73a1c827ae837b62868539040176fb6d4daecf24983b98a0284d158e52cd21d5" dependencies = [ "anyhow", "bevy_app", @@ -262,9 +279,9 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c156430a5312c04a1b25fa434eeeab6349a41c6bb96ea0385406d53b3c43658" +checksum = "12c0f8614b6014671ab60bacb8bf681373d08b0bb15633b8ef72b895cf966d29" dependencies = [ "bevy_app", "bevy_derive", @@ -278,22 +295,23 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b422dca94195c904964ab21bc4557fbd11f692c299d46e38364715ac931841e" +checksum = "74d570bc9310196190910a5b1ffd8c8c35bd6b73f918d0651ae3c3d4e57be9a7" dependencies = [ "bevy_app", "bevy_asset", "bevy_core", "bevy_ecs", "bevy_render", + "bevy_utils", ] [[package]] name = "bevy_crevice" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c684de72f710da0a701d1d2fe2a481241709d66f43215bcc9d7f9f0818d1cb15" +checksum = "3da0a284fb26c02cb96ef4d5bbf4de5fad7e1a901730035a61813bf64e28482e" dependencies = [ "bevy-crevice-derive", "bytemuck", @@ -303,9 +321,9 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918dc0dff01e8b4e8f989db89d74fd4042810ea80a70642d0459b3c265995e59" +checksum = "6abddf2ed415f31d28a9bf9ab3c0bc857e98a722858d38dba65bdda481f8d714" dependencies = [ "bevy_macro_utils", "quote", @@ -314,9 +332,9 @@ dependencies = [ [[package]] name = "bevy_diagnostic" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adbe98f48873d4b20f6479723de18d957f4bc00c653efd36c245e6a66d6e8b71" +checksum = "6ebf72ea058cfc379756e9da7de6861174e1860504f41e3e5a46d5b1c35d6644" dependencies = [ "bevy_app", "bevy_core", @@ -327,9 +345,9 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b182092396e6c2caf5ab30d738511fcd382628aa86ef35878d28fabb325c933" +checksum = "79e67dd06b14e787d2026fe6e2b63f67482afcc62284f20ea2784d8b0662e95f" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -345,9 +363,9 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e9e664b3ea45cfc9ab3251ee0255dfa6410f675b3a405e7bac8e59b2d76aa9" +checksum = "718923a491490bd81074492d61fc08134f9c62a29ba8666818cd7a6630421246" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -357,9 +375,9 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b457f720b1c54ede34afd6007beae3708503c0dd7a4ab4b416e36cb8bbd05ac1" +checksum = "15b164983e8057a1a730412a7c26ccc540d9ce76d2c6ab68edd258a0baeb1762" dependencies = [ "bevy_app", "bevy_ecs", @@ -370,16 +388,18 @@ dependencies = [ [[package]] name = "bevy_gltf" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e4711f4f77542dccd59eec249c98f02e34e28a25ee079c14cd351061d08e5c" +checksum = "2e07bda7721091c1a683343d466132dc69dec65aa83d8c9e328a2fb3431f03be" dependencies = [ "anyhow", "base64", + "bevy_animation", "bevy_app", "bevy_asset", "bevy_core", "bevy_ecs", + "bevy_hierarchy", "bevy_log", "bevy_math", "bevy_pbr", @@ -393,11 +413,24 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_hierarchy" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f407f152f35541a099484200afe3b0ca09ce625469e8233dcdc264d6f88e01a" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", + "smallvec", +] + [[package]] name = "bevy_input" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33989693efa636960dd40e540029ed7b7bc1af2f3eef26c009555b5e2a4e185a" +checksum = "ff4ec4f6e38ef1b41ff68ec7badd6afc5c9699191e61e511c4abee91a5888afc" dependencies = [ "bevy_app", "bevy_ecs", @@ -407,10 +440,11 @@ dependencies = [ [[package]] name = "bevy_internal" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92af28d95bba80d11840c24fa4ce8ff84ae27af1def2f5cf8a6891acce5d714" +checksum = "d518a8e5f526a9537fc8408a284caec7af22b23c3b23c0dee08bacc0930e2f1a" dependencies = [ + "bevy_animation", "bevy_app", "bevy_asset", "bevy_audio", @@ -421,6 +455,7 @@ dependencies = [ "bevy_ecs", "bevy_gilrs", "bevy_gltf", + "bevy_hierarchy", "bevy_input", "bevy_log", "bevy_math", @@ -436,14 +471,14 @@ dependencies = [ "bevy_utils", "bevy_window", "bevy_winit", - "ndk-glue 0.5.0", + "ndk-glue 0.5.1", ] [[package]] name = "bevy_log" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf0083e72bf76cbfa6607311ac6baef2f4f7c9306c35942cece8c0589cd3e5e" +checksum = "943ec496720ded2ff62b292d8e5fc845817a504915f41b7c5fd12b1380300f75" dependencies = [ "android_log-sys", "bevy_app", @@ -456,9 +491,9 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57cf90b3b67606d0818cdac6c9134eb66fa174959977a4abba893364a571a7cd" +checksum = "b7ddfc33a99547e36718e56e414541e461c74ec318ff987a1e9f4ff46d0dacbb" dependencies = [ "cargo-manifest", "quote", @@ -467,9 +502,9 @@ dependencies = [ [[package]] name = "bevy_math" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0f9ebf2ef80a8fff3e5dca817594071004048cd089e72b9a1bf4e494b66112" +checksum = "20288df0f70ff258bbaffaf55209f1271a7436438591bbffc3d81e4d84b423f2" dependencies = [ "bevy_reflect", "glam", @@ -477,9 +512,9 @@ dependencies = [ [[package]] name = "bevy_pbr" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41724d89746d54f7f8c8e522f9d0b1232a8a289e0d270482175d23774dc2362a" +checksum = "06adee54840f18cfeda7af4cdc57608644fa840be076a562353f896bfdb9c694" dependencies = [ "bevy_app", "bevy_asset", @@ -498,9 +533,9 @@ dependencies = [ [[package]] name = "bevy_reflect" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84ce8cbd484a39d67171831eaf72c20d2684de71f1e9d79333c8dd6d6f3ebca" +checksum = "4d0793107bc4b7c6bd04232d739fc8d70aa5fb313bfad6e850f91f79b2557eed" dependencies = [ "bevy_reflect_derive", "bevy_utils", @@ -515,9 +550,9 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7af3100febf44583a7c052d1469fbdb411f56aa85729333a0ac106a016bd379c" +checksum = "81c88de8067d19dfde31662ee78e3ee6971e2df27715799f91b515b37a636677" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -528,9 +563,9 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0d5409e5e3d48f3192f78e37bedea29aa0c674083e51aaa7e945496913d2c2" +checksum = "6a358da8255b704153913c3499b3693fa5cfe13a48725ac6e76b043fa5633bc8" dependencies = [ "anyhow", "bevy_app", @@ -564,16 +599,16 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eb2b01e4d1b074c75ea59a92409739cac24b56b1c723491ef80936d50e95df" +checksum = "2ea240f2ffce9f58a5601cc5ead24111f577dc4c656452839eb1fdf4b7a28529" dependencies = [ "anyhow", "bevy_app", "bevy_asset", "bevy_ecs", + "bevy_hierarchy", "bevy_reflect", - "bevy_transform", "bevy_utils", "ron", "serde", @@ -583,9 +618,9 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66439831ff57c11c7fb2692e7ccf8d0551f4368a9908908d3c38f2da53115b33" +checksum = "5fcecfbc623410137d85a71a295ff7c16604b7be24529c9ea4b9a9881d7a142b" dependencies = [ "bevy_app", "bevy_asset", @@ -609,9 +644,9 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc4bce7f4cddbb489636092f52478b103dc26ee8526c585289bbdd9c0d0a99f" +checksum = "db2b0f0b86c8f78c53a2d4c669522f45e725ed9d9c3d734f54ec30876494e04e" dependencies = [ "async-channel", "async-executor", @@ -623,9 +658,9 @@ dependencies = [ [[package]] name = "bevy_text" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233c4bb933435e8e6c34a1310317fd7f8c6617526270de572e643816070b236a" +checksum = "a206112de011fd6baebaf476af69d87f4e38a1314b65e3c872060830d7c0b9fa" dependencies = [ "ab_glyph", "anyhow", @@ -647,23 +682,22 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9974c494f9cc721df46d2ba27c6a8df2a955ed8360a23adabd2bd66d1f73fa8f" +checksum = "aa2f7a77900fb23f24ca312c1f8df3eb47a45161326f41e9b4ef05b039793503" dependencies = [ "bevy_app", "bevy_ecs", + "bevy_hierarchy", "bevy_math", "bevy_reflect", - "bevy_utils", - "smallvec", ] [[package]] name = "bevy_ui" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbdb34595bd7be349fba8038b970acbe632f70b98737318b2327c7c7cd557767" +checksum = "c65e79658d8a3d4da087a6fb8b229cfe1455cda2c4e8e6305b3b44fb46fb1d30" dependencies = [ "bevy_app", "bevy_asset", @@ -671,6 +705,7 @@ dependencies = [ "bevy_core_pipeline", "bevy_derive", "bevy_ecs", + "bevy_hierarchy", "bevy_input", "bevy_log", "bevy_math", @@ -689,13 +724,14 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252f6674aa3ba68bacfec506b91570a3cc206ad09b7ef4b23661959ef0246396" +checksum = "2f354c584812996febd48cc885f36b23004b49d6680e73fc95a69a2bb17a48e5" dependencies = [ "ahash", "bevy_derive", "getrandom", + "hashbrown", "instant", "tracing", "uuid", @@ -703,11 +739,12 @@ dependencies = [ [[package]] name = "bevy_window" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4b52b766baf565e96f24f61dbc51bc85151f23202fed2b3650769f2edd0b21" +checksum = "04fe33d177e10b2984fa90c1d19496fc6f6e7b36d4442699d359e2b4b507873d" dependencies = [ "bevy_app", + "bevy_ecs", "bevy_math", "bevy_utils", "raw-window-handle", @@ -716,9 +753,9 @@ dependencies = [ [[package]] name = "bevy_winit" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d4a4bed46200615e070897a551d2389d49cdaff048e825e7fa6caef4dc57c6" +checksum = "a7c0e3b94cc73907f8a9f82945ca006a39ed2ab401aca0974b47a007a468509f" dependencies = [ "approx 0.5.1", "bevy_app", @@ -787,18 +824,18 @@ checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "bytemuck" -version = "1.7.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f" +checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54" +checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" dependencies = [ "proc-macro2", "quote", @@ -836,9 +873,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" dependencies = [ "jobserver", ] @@ -1123,9 +1160,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1133,9 +1170,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -1160,9 +1197,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ "darling_core", "darling_macro", @@ -1170,9 +1207,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", @@ -1184,9 +1221,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.1" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", @@ -1233,18 +1270,18 @@ dependencies = [ [[package]] name = "erased-serde" -version = "0.3.18" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56047058e1ab118075ca22f9ecd737bcc961aa3566a3019cb71388afa280bd8a" +checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd" dependencies = [ "serde", ] [[package]] name = "euclid" -version = "0.22.6" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da96828553a086d7b18dcebfc579bd9628b016f86590d7453c115e490fa74b80" +checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" dependencies = [ "num-traits", ] @@ -1266,9 +1303,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1350,14 +1387,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi", + "wasi 0.10.2+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -1397,9 +1434,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.20.2" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fa84eead97d5412b2a20aed4d66612a97a9e41e08eababdb9ae2bf88667490" +checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f" dependencies = [ "bytemuck", "mint", @@ -1426,9 +1463,9 @@ dependencies = [ [[package]] name = "gltf" -version = "0.16.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff38b75359a0096dd0a8599b6e4f37a6ee41d5df300cc7669e62aafa697f7a2" +checksum = "00e0a0eace786193fc83644907097285396360e9e82e30f81a21e9b1ba836a3e" dependencies = [ "byteorder", "gltf-json", @@ -1437,9 +1474,9 @@ dependencies = [ [[package]] name = "gltf-derive" -version = "0.16.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2a9333e0f9c7bca94dfc20bcf44fa12a61eeec662d6e007563ff748aa59c70" +checksum = "bdd53d6e284bb2bf02a6926e4cc4984978c1990914d6cd9deae4e31cf37cd113" dependencies = [ "inflections", "proc-macro2", @@ -1449,9 +1486,9 @@ dependencies = [ [[package]] name = "gltf-json" -version = "0.16.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1414d3a98cbaabdb2f134328b1f6036d14b282febc1df51952a435d2ca17fb6" +checksum = "9949836a9ec5e7f83f76fb9bbcbc77f254a577ebbdb0820867bc11979ef97cad" dependencies = [ "gltf-derive", "serde", @@ -1526,6 +1563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ "ahash", + "serde", ] [[package]] @@ -1545,9 +1583,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc62dcfd68ec810c4707804556f2e88655012b1a373b0e0bbbe88a9db366627" +checksum = "04ab9d20ba513ff1582a7d885e91839f62cf28bef7c56b1b0428ca787315979b" dependencies = [ "glam", "lazy_static", @@ -1583,9 +1621,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", @@ -1682,9 +1720,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" dependencies = [ "wasm-bindgen", ] @@ -1701,9 +1739,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058a107a784f8be94c7d35c1300f4facced2e93d2fbe5b1452b44e905ddca4a9" +checksum = "97caf428b83f7c86809b7450722cd1f2b1fc7fb23aa7b9dee7e72ed14d048352" dependencies = [ "kqueue-sys", "libc", @@ -1744,9 +1782,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.117" +version = "0.2.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" +checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" [[package]] name = "libloading" @@ -1776,18 +1814,19 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if 1.0.0", ] @@ -1887,14 +1926,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi", ] @@ -1961,15 +2001,16 @@ checksum = "4e3c5cc68637e21fe8f077f6a1c9e0b9ca495bb74895226b476310f613325884" [[package]] name = "ndk-glue" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc291b8de2095cba8dab7cf381bf582ff4c17a09acf854c32e46545b08085d28" +checksum = "a1c68f70683c5fc9a747a383744206cd371741b2f0b31781ab6770487ec572e2" dependencies = [ "android_logger", "lazy_static", "libc", "log", "ndk 0.5.0", + "ndk-context", "ndk-macro", "ndk-sys 0.2.2", ] @@ -2131,18 +2172,18 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720d3ea1055e4e4574c0c0b0f8c3fd4f24c4cdaf465948206dea090b57b526ad" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2203,15 +2244,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "owned_ttf_parser" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef05f2882a8b3e7acc10c153ade2631f7bfc8ce00d2bf3fb8f4e9d2ae6ea5c3" +checksum = "4fb1e509cfe7a12db2a90bfa057dfcdbc55a347f5da677c506b53dd099cfec9d" dependencies = [ "ttf-parser", ] @@ -2277,9 +2318,9 @@ checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "png" @@ -2310,9 +2351,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro-crate" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", @@ -2320,9 +2361,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" dependencies = [ "unicode-xid", ] @@ -2335,9 +2376,9 @@ checksum = "9145ac0af1d93c638c98c40cf7d25665f427b2a44ad0a99b1dccf3e2f25bb987" [[package]] name = "quote" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -2380,9 +2421,9 @@ checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" [[package]] name = "raw-window-handle" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" dependencies = [ "cty", ] @@ -2395,18 +2436,18 @@ checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb" [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", @@ -2436,9 +2477,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "rodio" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9" +checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" dependencies = [ "cpal", "lewton", @@ -2586,9 +2627,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slotmap" @@ -2610,9 +2651,9 @@ dependencies = [ [[package]] name = "smooth-bevy-cameras" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e2ea6d4cf1ee6e40e804e50b2bb73a06b7dc4e23ea0f427cf77971796310f6" +checksum = "4ec0c573326a234b780c3d31843437b401798077354fa5e5acddf35ffa40da06" dependencies = [ "approx 0.4.0", "bevy", @@ -2710,9 +2751,9 @@ checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" [[package]] name = "syn" -version = "1.0.86" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ "proc-macro2", "quote", @@ -2721,9 +2762,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -2774,9 +2815,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "indexmap", "serde", @@ -2784,9 +2825,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.30" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -2796,9 +2837,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ "proc-macro2", "quote", @@ -2807,9 +2848,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.22" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", "valuable", @@ -2828,9 +2869,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" +checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" dependencies = [ "ansi_term", "lazy_static", @@ -2857,9 +2898,9 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ccbe8381883510b6a2d8f1e32905bddd178c11caef8083086d0c0c9ab0ac281" +checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" [[package]] name = "unicode-width" @@ -2932,11 +2973,17 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2944,9 +2991,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", "lazy_static", @@ -2959,9 +3006,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2971,9 +3018,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2981,9 +3028,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", @@ -2994,15 +3041,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" dependencies = [ "js-sys", "wasm-bindgen", @@ -3146,9 +3193,9 @@ dependencies = [ "lazy_static", "libc", "log", - "mio 0.8.0", + "mio 0.8.2", "ndk 0.5.0", - "ndk-glue 0.5.0", + "ndk-glue 0.5.1", "ndk-sys 0.2.2", "objc", "parking_lot", diff --git a/example/Cargo.toml b/example/Cargo.toml index 405d981..516e43d 100644 --- a/example/Cargo.toml +++ b/example/Cargo.toml @@ -5,5 +5,5 @@ authors = ["Dominic Maas "] edition = "2021" [dependencies] -bevy = "0.6.0" -smooth-bevy-cameras = "0.2.0" +bevy = "0.7.0" +smooth-bevy-cameras = "0.4.0" diff --git a/example/src/main.rs b/example/src/main.rs index 9ba6c1e..d41cb6f 100644 --- a/example/src/main.rs +++ b/example/src/main.rs @@ -8,13 +8,23 @@ fn main() { App::new() .insert_resource(Msaa { samples: 4 }) .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0))) + .insert_resource(WindowDescriptor { + title: "Bevy Example".to_string(), + width: 1920., + height: 1080., + ..Default::default() + }) .add_plugins(DefaultPlugins) .add_plugin(LookTransformPlugin) .add_plugin(OrbitCameraPlugin::default()) .add_startup_system(setup) + .add_system(animate_cube) .run(); } +#[derive(Component)] +struct Movable; + fn setup( mut commands: Commands, asset_server: Res, @@ -24,6 +34,9 @@ fn setup( // Texture for the cube let texture_handle = asset_server.load("square.png"); + // Tell the asset server to watch for asset changes on disk: + asset_server.watch_for_changes().unwrap(); + // Simple plane that the cube is floating on top of commands.spawn_bundle(PbrBundle { mesh: meshes.add(Mesh::from(shape::Plane { size: 6.0 })), @@ -33,16 +46,17 @@ fn setup( }); // Cube that we rotate around (also rotate around the plane) - commands.spawn_bundle(PbrBundle { - mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), - material: materials.add(StandardMaterial { - base_color_texture: Some(texture_handle.clone()), - alpha_mode: AlphaMode::Blend, + commands + .spawn_bundle(PbrBundle { + mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), + material: materials.add(StandardMaterial { + base_color_texture: Some(texture_handle.clone()), + ..Default::default() + }), + transform: Transform::from_xyz(0.0, 0.0, 0.0), ..Default::default() - }), - transform: Transform::from_xyz(0.0, 0.0, 0.0), - ..Default::default() - }); + }) + .insert(Movable); // Light for the scene const HALF_SIZE: f32 = 10.0; @@ -71,9 +85,18 @@ fn setup( // Main camera to look through commands.spawn_bundle(OrbitCameraBundle::new( - OrbitCameraController::default(), + OrbitCameraController { + smoothing_weight: 0.0, + ..Default::default() + }, PerspectiveCameraBundle::default(), Vec3::new(0.0, 0.0, 5.0), Vec3::new(0., 0., 0.), )); } + +fn animate_cube(time: Res