From 2de9ad095444988e98f71a6494a69226f6ff0921 Mon Sep 17 00:00:00 2001 From: Joel Courtney Date: Mon, 24 Jun 2024 04:08:11 -0700 Subject: [PATCH] Update dependencies (#50) Co-authored-by: Thierry Berger --- build/salva2d/Cargo.toml | 16 ++++++++-------- build/salva3d/Cargo.toml | 16 ++++++++-------- examples2d/Cargo.toml | 14 +++++++------- examples3d/Cargo.toml | 12 ++++++------ src/integrations/rapier/testbed_plugin.rs | 12 +++++------- src/z_order.rs | 2 +- 6 files changed, 35 insertions(+), 37 deletions(-) diff --git a/build/salva2d/Cargo.toml b/build/salva2d/Cargo.toml index e7387da..b093b98 100644 --- a/build/salva2d/Cargo.toml +++ b/build/salva2d/Cargo.toml @@ -36,21 +36,21 @@ required-features = [ "dim2" ] approx = "0.5" num-traits = "0.2" fnv = "1.0" -itertools = "0.12" +itertools = "0.13" generational-arena = "0.2" instant = { version = "0.1", features = [ "now" ] } rayon = { version = "1.8", optional = true } -nalgebra = "0.32" -parry2d = { version = "0.13", optional = true } -rapier2d = { version = "0.18", optional = true } -rapier_testbed2d = { version = "0.18", optional = true } +nalgebra = "0.33" +parry2d = { version = "0.16", optional = true } +rapier2d = { version = "0.21", optional = true } +rapier_testbed2d = { version = "0.21", optional = true } -bevy_egui = { version = "0.23", features = ["immutable_ctx"], optional = true } +bevy_egui = { version = "0.26", features = ["immutable_ctx"], optional = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = { version = "0.12.1", default-features = false, features = ["bevy_winit", "bevy_render", "x11"], optional = true } +bevy = { version = "0.13.2", default-features = false, features = ["bevy_winit", "bevy_render", "x11"], optional = true } # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = { version = "0.12", default-features = false, features = ["bevy_winit", "bevy_render"], optional = true } +bevy = { version = "0.13", default-features = false, features = ["bevy_winit", "bevy_render"], optional = true } diff --git a/build/salva3d/Cargo.toml b/build/salva3d/Cargo.toml index fdbce0e..02ab3f1 100644 --- a/build/salva3d/Cargo.toml +++ b/build/salva3d/Cargo.toml @@ -32,21 +32,21 @@ required-features = [ "dim3" ] approx = "0.5" num-traits = "0.2" fnv = "1.0" -itertools = "0.12" +itertools = "0.13" generational-arena = "0.2" instant = { version = "0.1", features = [ "now" ] } rayon = { version = "1.8", optional = true } -nalgebra = "0.32" -parry3d = { version = "0.13", optional = true } -rapier3d = { version = "0.18", optional = true } -rapier_testbed3d = { version = "0.18", optional = true } +nalgebra = "0.33" +parry3d = { version = "0.16", optional = true } +rapier3d = { version = "0.21", optional = true } +rapier_testbed3d = { version = "0.21", optional = true } -bevy_egui = { version = "0.23", features = ["immutable_ctx"], optional = true } +bevy_egui = { version = "0.26", features = ["immutable_ctx"], optional = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy = { version = "0.12", default-features = false, features = ["bevy_winit", "bevy_render", "x11"], optional = true } +bevy = { version = "0.13", default-features = false, features = ["bevy_winit", "bevy_render", "x11"], optional = true } # Dependencies for WASM only. [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy = { version = "0.12", default-features = false, features = ["bevy_winit", "bevy_render"], optional = true } +bevy = { version = "0.13", default-features = false, features = ["bevy_winit", "bevy_render"], optional = true } diff --git a/examples2d/Cargo.toml b/examples2d/Cargo.toml index e6388fb..ec07788 100644 --- a/examples2d/Cargo.toml +++ b/examples2d/Cargo.toml @@ -10,12 +10,12 @@ parallel = [ "rapier_testbed2d/parallel"] [dependencies] Inflector = "0.11" -nalgebra = "0.32" -parry2d = "0.13" -rapier2d = "0.18" -rapier_testbed2d = "0.18" -parry3d = "0.13" -bevy = "0.12.1" +nalgebra = "0.33" +parry2d = "0.16" +rapier2d = "0.21" +rapier_testbed2d = "0.21" +parry3d = "0.16" +bevy = "0.13.2" [dependencies.salva2d] path = "../build/salva2d" @@ -32,4 +32,4 @@ stdweb = "0.4" [[bin]] name = "all_examples2" -path = "./all_examples2.rs" \ No newline at end of file +path = "./all_examples2.rs" diff --git a/examples3d/Cargo.toml b/examples3d/Cargo.toml index 701166f..cd71aeb 100644 --- a/examples3d/Cargo.toml +++ b/examples3d/Cargo.toml @@ -11,11 +11,11 @@ parallel = [ "rapier_testbed3d/parallel", "salva3d/parallel"] [dependencies] num-traits = "0.2" Inflector = "0.11" -nalgebra = "0.32" -rapier3d = "0.18" -rapier_testbed3d = "0.18" -parry3d = "0.13" -bevy = "0.12.1" +nalgebra = "0.33" +rapier3d = "0.21" +rapier_testbed3d = "0.21" +parry3d = "0.16" +bevy = "0.13.2" [dependencies.salva3d] path = "../build/salva3d" @@ -36,4 +36,4 @@ path = "./all_examples3.rs" [[bin]] name = "harness_basic3" -path = "./harness_basic3.rs" \ No newline at end of file +path = "./harness_basic3.rs" diff --git a/src/integrations/rapier/testbed_plugin.rs b/src/integrations/rapier/testbed_plugin.rs index 1595396..8699dd1 100644 --- a/src/integrations/rapier/testbed_plugin.rs +++ b/src/integrations/rapier/testbed_plugin.rs @@ -143,7 +143,7 @@ impl FluidsTestbedPlugin { commands: &mut Commands, meshes: &mut Assets, materials: &mut Assets, - _components: &mut Query<(&mut Transform,)>, + _components: &mut Query<&mut Transform>, _harness: &mut Harness, color: &Point3, force_shape: Option, @@ -210,7 +210,7 @@ impl TestbedPlugin for FluidsTestbedPlugin { commands: &mut Commands, meshes: &mut Assets, materials: &mut Assets, - components: &mut Query<(&mut Transform,)>, + components: &mut Query<&mut Transform>, harness: &mut Harness, ) { for (handle, fluid) in self.fluids_pipeline.liquid_world.fluids().iter() { @@ -348,7 +348,7 @@ impl TestbedPlugin for FluidsTestbedPlugin { commands: &mut Commands, meshes: &mut Assets, materials: &mut Assets, - components: &mut Query<(&mut Transform,)>, + components: &mut Query<&mut Transform>, harness: &mut Harness, ) { if self.queue_graphics_reset { @@ -366,9 +366,7 @@ impl TestbedPlugin for FluidsTestbedPlugin { min = min.min(magnitude); max = max.max(magnitude); if let Some(entity) = entities.get_mut(idx) { - if let Ok(mut pos) = - components.get_component_mut::(entity.entity) - { + if let Ok(mut pos) = components.get_mut(entity.entity) { { pos.translation.x = particle.x; pos.translation.y = particle.y; @@ -459,7 +457,7 @@ impl TestbedPlugin for FluidsTestbedPlugin { commands: &mut Commands, meshes: &mut Assets, materials: &mut Assets, - components: &mut Query<(&mut Transform,)>, + components: &mut Query<&mut Transform>, ) { fn get_rendering_mode_index(rendering_mode: FluidsRenderingMode) -> usize { FLUIDS_RENDERING_MAP diff --git a/src/z_order.rs b/src/z_order.rs index 3fc8a94..2b4cb51 100644 --- a/src/z_order.rs +++ b/src/z_order.rs @@ -10,7 +10,7 @@ pub fn compute_points_z_order(points: &[Point]) -> Vec { let mut indices: Vec<_> = (0..points.len()).collect(); indices.sort_unstable_by(|i, j| { z_order_floats(points[*i].coords.as_slice(), points[*j].coords.as_slice()) - .unwrap_or(std::cmp::Ordering::Equal) + .unwrap_or(Ordering::Equal) }); indices }