diff --git a/Cargo.lock b/Cargo.lock index e3d3564..e0f274e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -740,7 +740,7 @@ dependencies = [ "bevy-inspector-egui-derive", "bevy_egui", "image 0.24.5", - "nalgebra", + "nalgebra 0.31.4", "pretty-type-name", ] @@ -763,7 +763,7 @@ checksum = "61093d6ab0ae326c80ddc12c13a540f3bee247b2e214f2f39a8147124f5a09c0" dependencies = [ "bevy", "bevy-inspector-egui", - "bevy_rapier2d", + "bevy_rapier2d 0.19.0", ] [[package]] @@ -851,6 +851,7 @@ dependencies = [ "bevy_tasks", "bevy_utils", "bytemuck", + "serde", ] [[package]] @@ -1030,6 +1031,7 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_utils", + "serde", "thiserror", ] @@ -1182,8 +1184,21 @@ dependencies = [ "bevy", "bitflags", "log", - "nalgebra", - "rapier2d", + "nalgebra 0.31.4", + "rapier2d 0.16.1", +] + +[[package]] +name = "bevy_rapier2d" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "459c99492ef202f535305fc4e279240c2d47c3645220100c56ec71e735fc03f3" +dependencies = [ + "bevy", + "bitflags", + "log", + "nalgebra 0.32.1", + "rapier2d 0.17.1", "serde", ] @@ -1363,6 +1378,7 @@ dependencies = [ "bevy_reflect", "bevy_utils", "crossbeam-channel", + "serde", ] [[package]] @@ -1375,6 +1391,7 @@ dependencies = [ "bevy_hierarchy", "bevy_math", "bevy_reflect", + "serde", ] [[package]] @@ -1430,6 +1447,7 @@ dependencies = [ "bevy_reflect", "bevy_utils", "raw-window-handle 0.5.0", + "serde", ] [[package]] @@ -4245,7 +4263,7 @@ dependencies = [ "bevy_disturbulence", "bevy_egui", "bevy_mod_picking", - "bevy_rapier2d", + "bevy_rapier2d 0.20.0", "chrono", "clipboard", "directories", @@ -4260,7 +4278,7 @@ dependencies = [ "puffin 0.14.1", "puffin_egui", "rand", - "rapier2d", + "rapier2d 0.16.1", "reqwest", "serde", "serde-wasm-bindgen", @@ -4375,7 +4393,7 @@ dependencies = [ "anyhow", "bevy", "bevy_disturbulence", - "bevy_rapier2d", + "bevy_rapier2d 0.20.0", "iyes_loopless", "jwt-compact", "k8s-openapi", @@ -4386,7 +4404,7 @@ dependencies = [ "mr_utils_lib", "puffin 0.13.3", "rand", - "rapier2d", + "rapier2d 0.16.1", "reqwest", "rymder", "serde", @@ -4403,7 +4421,7 @@ dependencies = [ "bevy_disturbulence", "bevy_egui", "bevy_mod_picking", - "bevy_rapier2d", + "bevy_rapier2d 0.20.0", "chrono", "crossbeam-channel", "futures-lite", @@ -4413,7 +4431,7 @@ dependencies = [ "num", "puffin 0.13.3", "rand", - "rapier2d", + "rapier2d 0.16.1", "serde", "serde_json", "thiserror", @@ -4531,12 +4549,29 @@ dependencies = [ "approx", "glam", "matrixmultiply", - "nalgebra-macros", + "nalgebra-macros 0.1.0", + "num-complex", + "num-rational 0.4.1", + "num-traits", + "simba 0.7.3", + "typenum", +] + +[[package]] +name = "nalgebra" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a" +dependencies = [ + "approx", + "glam", + "matrixmultiply", + "nalgebra-macros 0.2.0", "num-complex", "num-rational 0.4.1", "num-traits", "serde", - "simba", + "simba 0.8.0", "typenum", ] @@ -4551,6 +4586,17 @@ dependencies = [ "syn", ] +[[package]] +name = "nalgebra-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "names" version = "0.14.0" @@ -5190,12 +5236,33 @@ dependencies = [ "bitflags", "downcast-rs", "either", - "nalgebra", + "nalgebra 0.31.4", + "num-derive", + "num-traits", + "rustc-hash", + "simba 0.7.3", + "slab", + "smallvec", + "spade", +] + +[[package]] +name = "parry2d" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2342b33d77a0393879b1b85eac2a30cc4b36d10b30e111f55a5e9280cf5eb87" +dependencies = [ + "approx", + "arrayvec 0.7.2", + "bitflags", + "downcast-rs", + "either", + "nalgebra 0.32.1", "num-derive", "num-traits", "rustc-hash", "serde", - "simba", + "simba 0.8.0", "slab", "smallvec", "spade", @@ -5555,6 +5622,26 @@ name = "rapier2d" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b1c1ed75065adaf01adb8c46a1dad3922fb28de8225dc981481e3584f3af07" +dependencies = [ + "approx", + "arrayvec 0.7.2", + "bit-vec", + "bitflags", + "crossbeam", + "downcast-rs", + "nalgebra 0.31.4", + "num-derive", + "num-traits", + "parry2d 0.11.1", + "rustc-hash", + "simba 0.7.3", +] + +[[package]] +name = "rapier2d" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd37fc7fad61534f35ce9cb198283cd7055c08cdc4a1565d0974a1fe74d5e59" dependencies = [ "approx", "arrayvec 0.7.2", @@ -5563,13 +5650,13 @@ dependencies = [ "crossbeam", "downcast-rs", "instant", - "nalgebra", + "nalgebra 0.32.1", "num-derive", "num-traits", - "parry2d", + "parry2d 0.13.0", "rustc-hash", "serde", - "simba", + "simba 0.8.0", ] [[package]] @@ -6412,6 +6499,19 @@ dependencies = [ "wide", ] +[[package]] +name = "simba" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +dependencies = [ + "approx", + "num-complex", + "num-traits", + "paste", + "wide", +] + [[package]] name = "simple-mutex" version = "1.1.5" diff --git a/libs/client_lib/Cargo.toml b/libs/client_lib/Cargo.toml index f090d6f..78fbf9f 100644 --- a/libs/client_lib/Cargo.toml +++ b/libs/client_lib/Cargo.toml @@ -20,7 +20,7 @@ bevy-inspector-egui = "0.15.0" bevy-inspector-egui-rapier = { version = "0.9", features = ["rapier2d"] } bevy_mod_picking = "0.11" bevy_disturbulence = { git = "https://github.com/mvlabat/bevy_disturbulence.git", branch = "wip", features = ["client"] } -bevy_rapier2d = { version = "0.19", features = ["wasm-bindgen"] } +bevy_rapier2d = { version = "0.20", features = ["wasm-bindgen"] } chrono = "0.4.23" futures = "0.3.25" iyes_loopless = "0.9" diff --git a/libs/server_lib/Cargo.toml b/libs/server_lib/Cargo.toml index 682c0c9..362f98e 100644 --- a/libs/server_lib/Cargo.toml +++ b/libs/server_lib/Cargo.toml @@ -14,7 +14,7 @@ profiler = ["puffin", "mr_shared_lib/profiler"] anyhow = "1.0" bevy = { version = "0.9.1", default-features = false } bevy_disturbulence = { git = "https://github.com/mvlabat/bevy_disturbulence.git", branch = "wip", features = ["server"] } -bevy_rapier2d = "0.19" +bevy_rapier2d = "0.20" iyes_loopless = "0.9" jwt-compact = { version = "0.6", features = ["std", "clock", "with_rsa"], default-features = false } kube = "0.77.0" diff --git a/libs/shared_lib/Cargo.toml b/libs/shared_lib/Cargo.toml index 45fe30d..c818fb1 100644 --- a/libs/shared_lib/Cargo.toml +++ b/libs/shared_lib/Cargo.toml @@ -16,7 +16,7 @@ bevy = { version = "0.9.1", default-features = false } bevy_egui = { version = "0.18", optional = true } bevy_mod_picking = { version = "0.11", optional = true } bevy_disturbulence = { git = "https://github.com/mvlabat/bevy_disturbulence.git", branch = "wip" } -bevy_rapier2d = { version = "0.19", features = ["wasm-bindgen", "serde-serialize"] } +bevy_rapier2d = { version = "0.20", features = ["wasm-bindgen", "serde-serialize"] } chrono = "0.4.19" crossbeam-channel = "0.5.5" futures-lite = "1.12.0"