commit e242e1cbcbbb450814ef43b95e064f1d93eb3a25
parent b45f4a2513bf9e4f124c2124fe15066fae03bb03
Author: MTRNord <mtrnord1@gmail.com>
Date: Tue, 16 Mar 2021 15:31:23 +0100
Fix collision logic, optimize for preformance, fix map, disable rapier2d due to compatibility issues
Took 24 minutes
Diffstat:
5 files changed, 244 insertions(+), 846 deletions(-)
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,33 +1,24 @@
-# Add the contents of this file to `config.toml` to enable "fast build" configuration. Please read the notes below.
-# NOTE: For maximum performance, build using a nightly compiler
-# If you are using rust stable, remove the "-Zshare-generics=y" below (as well as "-Csplit-debuginfo=unpacked" when building on macOS).
-
-[target.x86_64-unknown-linux-gnu]
-linker = "/usr/bin/clang"
-rustflags = [
- "-Clink-arg=-fuse-ld=lld",
- "-Zshare-generics=y"
-]
+#[target.x86_64-unknown-linux-gnu]
+#linker = "/usr/bin/clang"
+#rustflags = [
+# "-Clink-arg=-fuse-ld=lld",
+# "-Zshare-generics=y"
+#]
# NOTE: you must manually install https://github.com/michaeleisel/zld on mac. you can easily do this with the "brew" package manager:
# `brew install michaeleisel/zld/zld`
-[target.x86_64-apple-darwin]
-rustflags = [
- "-C",
- "link-arg=-fuse-ld=/usr/local/bin/zld",
- "-Zshare-generics=y",
- "-Csplit-debuginfo=unpacked"
-]
-
-[target.x86_64-pc-windows-msvc]
-linker = "rust-lld.exe"
-rustflags = [
- #"-Zshare-generics=y"
- "-Zshare-generics=off"
-]
+#[target.x86_64-apple-darwin]
+#rustflags = [
+# "-C",
+# "link-arg=-fuse-ld=/usr/local/bin/zld",
+# "-Zshare-generics=y",
+# "-Csplit-debuginfo=unpacked"
+#]
-# Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'
-# In most cases the gains are negligible, but if you are on macos and have slow compile times you should see significant gains.
-#[profile.dev]
-#debug = 1
+#[target.x86_64-pc-windows-msvc]
+#linker = "rust-lld.exe"
+#rustflags = [
+# #"-Zshare-generics=y"
+# "-Zshare-generics=off"
+#]
diff --git a/Cargo.lock b/Cargo.lock
@@ -244,18 +244,10 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bevy"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_internal 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
-]
-
-[[package]]
-name = "bevy"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"bevy_dylib",
- "bevy_internal 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_internal",
]
[[package]]
@@ -283,25 +275,11 @@ dependencies = [
[[package]]
name = "bevy_app"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "serde",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "bevy_app"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_derive 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_utils 0.4.0",
"serde",
"wasm-bindgen",
"web-sys",
@@ -340,44 +318,16 @@ dependencies = [
[[package]]
name = "bevy_asset"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"anyhow",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_diagnostic 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "crossbeam-channel 0.5.0",
- "downcast-rs",
- "js-sys",
- "ndk-glue",
- "notify",
- "parking_lot",
- "rand 0.8.3",
- "ron",
- "serde",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "bevy_asset"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "anyhow",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_diagnostic 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_diagnostic",
+ "bevy_ecs 0.4.0",
+ "bevy_log",
+ "bevy_reflect",
+ "bevy_tasks 0.4.0",
+ "bevy_utils 0.4.0",
"crossbeam-channel 0.5.0",
"downcast-rs",
"js-sys",
@@ -396,14 +346,14 @@ dependencies = [
[[package]]
name = "bevy_audio"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"anyhow",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_reflect",
+ "bevy_utils 0.4.0",
"parking_lot",
"rodio",
]
@@ -411,29 +361,15 @@ dependencies = [
[[package]]
name = "bevy_core"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
-]
-
-[[package]]
-name = "bevy_core"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_derive 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_reflect",
+ "bevy_tasks 0.4.0",
+ "bevy_utils 0.4.0",
]
[[package]]
@@ -453,7 +389,7 @@ dependencies = [
[[package]]
name = "bevy_derive"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"Inflector",
"find-crate",
@@ -463,40 +399,15 @@ dependencies = [
]
[[package]]
-name = "bevy_derive"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "Inflector",
- "find-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "bevy_diagnostic"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "parking_lot",
-]
-
-[[package]]
name = "bevy_diagnostic"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_core",
+ "bevy_ecs 0.4.0",
+ "bevy_log",
+ "bevy_utils 0.4.0",
"parking_lot",
]
@@ -517,17 +428,17 @@ dependencies = [
[[package]]
name = "bevy_dylib"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_internal 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_internal",
]
[[package]]
name = "bevy_dynamic_plugin"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
"libloading 0.7.0",
]
@@ -551,32 +462,12 @@ dependencies = [
[[package]]
name = "bevy_ecs"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "async-channel",
- "bevy_ecs_macros 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bitflags",
- "downcast-rs",
- "fixedbitset 0.3.2",
- "fxhash",
- "parking_lot",
- "rand 0.8.3",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "bevy_ecs"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"async-channel",
- "bevy_ecs_macros 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_ecs_macros",
+ "bevy_tasks 0.4.0",
+ "bevy_utils 0.4.0",
"bitflags",
"downcast-rs",
"fixedbitset 0.3.2",
@@ -591,18 +482,7 @@ dependencies = [
[[package]]
name = "bevy_ecs_macros"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "find-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "bevy_ecs_macros"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"find-crate",
"proc-macro2",
@@ -613,32 +493,32 @@ dependencies = [
[[package]]
name = "bevy_gilrs"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_input 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_input",
+ "bevy_utils 0.4.0",
"gilrs",
]
[[package]]
name = "bevy_gltf"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"anyhow",
"base64",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_pbr 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_scene 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_core",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_scene",
+ "bevy_transform",
"gltf",
"thiserror",
]
@@ -670,83 +550,44 @@ dependencies = [
[[package]]
name = "bevy_input"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
-]
-
-[[package]]
-name = "bevy_input"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
-]
-
-[[package]]
-name = "bevy_internal"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_diagnostic 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_input 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_pbr 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_scene 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_sprite 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_text 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ui 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "ndk-glue",
+ "bevy_app 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_utils 0.4.0",
]
[[package]]
name = "bevy_internal"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
"bevy_audio",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_diagnostic 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_core",
+ "bevy_derive 0.4.0",
+ "bevy_diagnostic",
"bevy_dynamic_plugin",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_ecs 0.4.0",
"bevy_gilrs",
"bevy_gltf",
- "bevy_input 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_pbr 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_scene 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_sprite 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_tasks 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_text 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ui 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math 0.4.0",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_scene",
+ "bevy_sprite",
+ "bevy_tasks 0.4.0",
+ "bevy_text",
+ "bevy_transform",
+ "bevy_ui",
+ "bevy_utils 0.4.0",
"bevy_wgpu",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_window",
"bevy_winit",
"ndk-glue",
]
@@ -758,7 +599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "806b2173ce11aa40ff204c6a184f50ee034ff4b34bbcc21c32170be6d8b6c094"
dependencies = [
"anyhow",
- "bevy 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy",
"ldtk",
"serde_json",
"thiserror",
@@ -767,24 +608,11 @@ dependencies = [
[[package]]
name = "bevy_log"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "android_log-sys 0.2.0",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "console_error_panic_hook",
- "tracing-subscriber",
- "tracing-wasm",
-]
-
-[[package]]
-name = "bevy_log"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"android_log-sys 0.2.0",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_utils 0.4.0",
"console_error_panic_hook",
"tracing-subscriber",
"tracing-wasm",
@@ -802,53 +630,27 @@ dependencies = [
[[package]]
name = "bevy_math"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "glam 0.13.0",
-]
-
-[[package]]
-name = "bevy_math"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_reflect",
"glam 0.12.0",
]
[[package]]
name = "bevy_pbr"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
-]
-
-[[package]]
-name = "bevy_pbr"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_core",
+ "bevy_derive 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_window",
]
[[package]]
@@ -894,41 +696,14 @@ dependencies = [
]
[[package]]
-name = "bevy_rapier2d"
-version = "0.8.0"
-source = "git+https://github.com/alec-deason/bevy_rapier.git?branch=tracking_changes_for_bevy_0.5#bdebffd010516d51b8c235151808d3201c7ff7f1"
-dependencies = [
- "bevy 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "concurrent-queue",
- "nalgebra",
- "rapier2d",
-]
-
-[[package]]
-name = "bevy_reflect"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_reflect_derive 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "downcast-rs",
- "erased-serde",
- "glam 0.13.0",
- "parking_lot",
- "serde",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
name = "bevy_reflect"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect_derive 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_reflect_derive",
+ "bevy_utils 0.4.0",
"downcast-rs",
"erased-serde",
"glam 0.12.0",
@@ -941,7 +716,7 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"find-crate",
"proc-macro2",
@@ -951,65 +726,22 @@ dependencies = [
]
[[package]]
-name = "bevy_reflect_derive"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "find-crate",
- "proc-macro2",
- "quote",
- "syn",
- "uuid",
-]
-
-[[package]]
-name = "bevy_render"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "anyhow",
- "bevy-glsl-to-spirv",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bitflags",
- "downcast-rs",
- "hex",
- "hexasphere",
- "image",
- "once_cell",
- "parking_lot",
- "serde",
- "shaderc",
- "smallvec",
- "spirv-reflect",
- "thiserror",
-]
-
-[[package]]
name = "bevy_render"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"anyhow",
"bevy-glsl-to-spirv",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_core",
+ "bevy_derive 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils 0.4.0",
+ "bevy_window",
"bitflags",
"downcast-rs",
"hex",
@@ -1027,34 +759,15 @@ dependencies = [
[[package]]
name = "bevy_scene"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "anyhow",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "parking_lot",
- "ron",
- "serde",
- "thiserror",
- "uuid",
-]
-
-[[package]]
-name = "bevy_scene"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"anyhow",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils 0.4.0",
"parking_lot",
"ron",
"serde",
@@ -1065,39 +778,18 @@ dependencies = [
[[package]]
name = "bevy_sprite"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "guillotiere",
- "rectangle-pack",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "bevy_sprite"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+dependencies = [
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_core",
+ "bevy_ecs 0.4.0",
+ "bevy_log",
+ "bevy_math 0.4.0",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils 0.4.0",
"guillotiere",
"rectangle-pack",
"serde",
@@ -1121,21 +813,7 @@ dependencies = [
[[package]]
name = "bevy_tasks"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "async-channel",
- "async-executor",
- "event-listener",
- "futures-lite",
- "instant",
- "num_cpus",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "bevy_tasks"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"async-channel",
"async-executor",
@@ -1149,43 +827,21 @@ dependencies = [
[[package]]
name = "bevy_text"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"ab_glyph",
"anyhow",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_sprite 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "glyph_brush_layout",
- "thiserror",
-]
-
-[[package]]
-name = "bevy_text"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "ab_glyph",
- "anyhow",
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_sprite 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_core",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils 0.4.0",
+ "bevy_window",
"glyph_brush_layout",
"thiserror",
]
@@ -1193,26 +849,13 @@ dependencies = [
[[package]]
name = "bevy_transform"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "smallvec",
-]
-
-[[package]]
-name = "bevy_transform"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_reflect",
+ "bevy_utils 0.4.0",
"smallvec",
]
@@ -1235,48 +878,23 @@ dependencies = [
[[package]]
name = "bevy_ui"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_input 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_sprite 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_text 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "serde",
- "smallvec",
- "stretch",
-]
-
-[[package]]
-name = "bevy_ui"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_derive 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_input 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_reflect 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_sprite 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_text 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_transform 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+dependencies = [
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_core",
+ "bevy_derive 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math 0.4.0",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_text",
+ "bevy_transform",
+ "bevy_utils 0.4.0",
+ "bevy_window",
"serde",
"smallvec",
"stretch",
@@ -1295,19 +913,7 @@ dependencies = [
[[package]]
name = "bevy_utils"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
-dependencies = [
- "ahash 0.7.2",
- "getrandom 0.2.2",
- "instant",
- "tracing",
- "uuid",
-]
-
-[[package]]
-name = "bevy_utils"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
"ahash 0.7.2",
"getrandom 0.2.2",
@@ -1319,16 +925,16 @@ dependencies = [
[[package]]
name = "bevy_wgpu"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_asset 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_core 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_diagnostic 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_render 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+dependencies = [
+ "bevy_app 0.4.0",
+ "bevy_asset 0.4.0",
+ "bevy_core",
+ "bevy_diagnostic",
+ "bevy_ecs 0.4.0",
+ "bevy_render",
+ "bevy_utils 0.4.0",
+ "bevy_window",
"bevy_winit",
"crossbeam-channel 0.5.0",
"crossbeam-utils 0.8.3",
@@ -1340,39 +946,27 @@ dependencies = [
[[package]]
name = "bevy_window"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy.git?branch=main#284889c64b2a4a4f67018e42a14062392edbd0aa"
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy.git?branch=main)",
- "web-sys",
-]
-
-[[package]]
-name = "bevy_window"
-version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy_app 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_math 0.4.0",
+ "bevy_utils 0.4.0",
"web-sys",
]
[[package]]
name = "bevy_winit"
version = "0.4.0"
-source = "git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
-dependencies = [
- "bevy_app 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_ecs 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_input 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_log 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_math 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_utils 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
- "bevy_window 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+source = "git+https://github.com/bevyengine/bevy.git?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6#079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
+dependencies = [
+ "bevy_app 0.4.0",
+ "bevy_ecs 0.4.0",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math 0.4.0",
+ "bevy_utils 0.4.0",
+ "bevy_window",
"wasm-bindgen",
"web-sys",
"winit",
@@ -1804,20 +1398,6 @@ dependencies = [
]
[[package]]
-name = "crossbeam"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd01a6eb3daaafa260f6fc94c3a6c36390abc2080e38e3e34ced87393fb77d80"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-channel 0.5.0",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils 0.8.3",
-]
-
-[[package]]
name = "crossbeam-channel"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1862,16 +1442,6 @@ dependencies = [
]
[[package]]
-name = "crossbeam-queue"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils 0.8.3",
-]
-
-[[package]]
name = "crossbeam-utils"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2233,25 +1803,6 @@ dependencies = [
]
[[package]]
-name = "generational-arena"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601"
-dependencies = [
- "cfg-if 0.1.10",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
name = "getrandom"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2484,9 +2035,6 @@ name = "glam"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27e6eecbd94ac86b2e1f3b0065ed5f17c097c15d668dddb84208a141e271403b"
-dependencies = [
- "serde",
-]
[[package]]
name = "glob"
@@ -2729,7 +2277,6 @@ checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
- "time",
"wasm-bindgen",
"web-sys",
]
@@ -2866,9 +2413,9 @@ checksum = "538c092e5586f4cdd7dd8078c4a79220e3e168880218124dcbce860f0ea938c6"
[[package]]
name = "libflate"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914"
+checksum = "158ae2ca09a761eaf6050894f5a6f013f2773dafe24f67bfa73a7504580e2916"
dependencies = [
"adler32",
"crc32fast",
@@ -2909,12 +2456,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
[[package]]
-name = "libm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-
-[[package]]
name = "libudev-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2985,15 +2526,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]]
-name = "matrixmultiply"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1"
-dependencies = [
- "rawpointer",
-]
-
-[[package]]
name = "maybe-uninit"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3150,24 +2682,6 @@ dependencies = [
]
[[package]]
-name = "nalgebra"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9002895a0de45e3cde58b36d0cf2f83249e7dba4a43ee64dafbf01bfd464ff"
-dependencies = [
- "approx",
- "generic-array",
- "matrixmultiply",
- "num-complex",
- "num-rational",
- "num-traits",
- "rand 0.7.3",
- "rand_distr",
- "simba",
- "typenum",
-]
-
-[[package]]
name = "ndk"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3288,15 +2802,6 @@ dependencies = [
]
[[package]]
-name = "num-complex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
name = "num-derive"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3346,7 +2851,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
- "libm 0.2.1",
]
[[package]]
@@ -3476,32 +2980,6 @@ dependencies = [
]
[[package]]
-name = "parry2d"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e943882e415c38d779753cc038d56193ad3d43a856156d212816227eff5c6d78"
-dependencies = [
- "approx",
- "arrayvec",
- "bitflags",
- "downcast-rs",
- "either",
- "nalgebra",
- "num-derive",
- "num-traits",
- "rustc-hash",
- "simba",
- "slab",
- "smallvec",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
-
-[[package]]
name = "peeking_take_while"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3675,16 +3153,6 @@ dependencies = [
]
[[package]]
-name = "rand_distr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
-dependencies = [
- "num-traits",
- "rand 0.7.3",
-]
-
-[[package]]
name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3709,30 +3177,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6"
[[package]]
-name = "rapier2d"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b929b02109815ca1ddb680581b76eeea54ec18ebd22aaa567ba909a2af20e8"
-dependencies = [
- "approx",
- "arrayvec",
- "bit-vec",
- "bitflags",
- "crossbeam",
- "downcast-rs",
- "generational-arena",
- "instant",
- "nalgebra",
- "num-derive",
- "num-traits",
- "parry2d",
- "rayon",
- "rustc-hash",
- "simba",
- "vec_map",
-]
-
-[[package]]
name = "raw-window-handle"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3742,12 +3186,6 @@ dependencies = [
]
[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
-[[package]]
name = "rayon"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3908,15 +3346,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
-name = "safe_arch"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
name = "same-file"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4035,19 +3464,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
[[package]]
-name = "simba"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bfe642b1728a6e89137ad428ef5d4738eca4efaba9590f9e110b8944028621"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
- "paste",
- "wide",
-]
-
-[[package]]
name = "slab"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4213,7 +3629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b0dc6d20ce137f302edf90f9cd3d278866fd7fb139efca6f246161222ad6d87"
dependencies = [
"lazy_static",
- "libm 0.1.4",
+ "libm",
]
[[package]]
@@ -4287,9 +3703,9 @@ checksum = "7572415bd688d401c52f6e36f4c8e805b9ae1622619303b9fa835d531db0acae"
[[package]]
name = "time"
-version = "0.2.25"
+version = "0.2.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7"
+checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372"
dependencies = [
"const_fn",
"libc",
@@ -4443,21 +3859,14 @@ checksum = "85e00391c1f3d171490a3f8bd79999b0002ae38d3da0d6a3a306c754b053d71b"
name = "two_d_world_bevy"
version = "0.1.0"
dependencies = [
- "bevy 0.4.0 (git+https://github.com/bevyengine/bevy?rev=079b3ade89195ef1aa4bcf1f8c0740a6572b84b6)",
+ "bevy",
"bevy_discovery",
"bevy_ldtk",
"bevy_prototype_inline_assets",
- "bevy_rapier2d",
"rayon",
]
[[package]]
-name = "typenum"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
-
-[[package]]
name = "unicode-bidi"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4557,9 +3966,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "void"
@@ -4750,16 +4159,6 @@ dependencies = [
]
[[package]]
-name = "wide"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c51f160ef6333906fad7d31a2010d449148dd1a26bc377e0a1ace2cc9e1e1ee"
-dependencies = [
- "bytemuck",
- "safe_arch",
-]
-
-[[package]]
name = "winapi"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,10 +18,18 @@ git = "https://github.com/bevyengine/bevy"
rev = "079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"
features = ["dynamic"]
-[dependencies.bevy_rapier2d]
-git = "https://github.com/alec-deason/bevy_rapier.git"
-branch = "tracking_changes_for_bevy_0.5"
-features = [ "simd-stable", "parallel" ]
+#[dependencies.bevy_rapier2d]
+#git = "https://github.com/MTRNord/bevy_rapier.git"
+#branch = "tracking_changes_for_bevy_0.5"
+#features = [ "simd-stable", "parallel" ]
[patch.crates-io]
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"}
+bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "079b3ade89195ef1aa4bcf1f8c0740a6572b84b6"}
+
+# Enable optimizations for dependencies (incl. Bevy), but not for our code:
+[profile.dev.package."*"]
+opt-level = 3
+
+# Maybe also enable only a small amount of optimization for our code:
+[profile.dev]
+opt-level = 1
diff --git a/assets/map.ldtk b/assets/map.ldtk
@@ -9,7 +9,7 @@
"url": "https://ldtk.io"
},
"jsonVersion": "0.8.1",
- "nextUid": 97,
+ "nextUid": 99,
"worldLayout": "Free",
"worldGridWidth": 256,
"worldGridHeight": 256,
diff --git a/src/plugins/player.rs b/src/plugins/player.rs
@@ -68,7 +68,7 @@ fn spawn_player(
player_start.px[0] as f32,
// The player y position is the entity's y position from the map data, but
// multiplied by negative one because in the LDtk map +y means down and not up.
- -(player_start.px[1] - 1) as f32,
+ -(player_start.px[1]) as f32,
// Spawn the player with the z value we determined earlier
player_z,
);
@@ -213,6 +213,6 @@ fn can_move_to_requested_coordinate(
}
fn check_intersection(a: Vec2, b: &Vec2, a_size: Vec2, b_size: Vec2) -> bool {
- ((a.x - b.x).abs() * 2.0 <= (a_size.x + b_size.x))
- && ((a.y - b.y).abs() * 2.0 <= (a_size.y + b_size.y))
+ ((a.x - b.x).abs() * 2.0 < (a_size.x + b_size.x))
+ && ((a.y - b.y).abs() * 2.0 < (a_size.y + b_size.y))
}
