Migrating to bevy 0.19.

Cargo.toml

@@ -34,7 +34,7 @@ exclude = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "^0.18", default-features = false, features = [
+bevy = { version = "^0.19", default-features = false, features = [
     "bevy_log",
     "bevy_asset",
 ]}
@@ -45,7 +45,7 @@ serde = { version = "^1", features = ["derive"] }
 ron = "0.12.0"
 
 [dev-dependencies]
-bevy = { version = "^0.18", default-features = false, features = [
+bevy = { version = "^0.19", default-features = false, features = [
     "gltf_animation",
     # "bevy_audio",
     "bevy_gilrs",
@@ -66,7 +66,7 @@ bevy = { version = "^0.18", default-features = false, features = [
     "x11",
     # "filesystem_watcher",
 ] }
-avian3d = { version = "^0.6", features = ["3d", "debug-plugin", "parallel", "parry-f32"] }
+avian3d = { version = "^0.7", features = ["3d", "debug-plugin", "parallel", "parry-f32"] }
 bevy-tnua-avian3d = { path = "avian3d" }
 
 [package.metadata.docs.rs]

avian2d/Cargo.toml

@@ -12,8 +12,8 @@ documentation = "https://docs.rs/bevy-tnua-avian2d"
 readme = "../README.md"
 
 [dependencies]
-bevy = { version = "^0.18", default-features = false }
-avian2d = { version = "^0.6", default-features = false, features = ["2d", "debug-plugin", "parallel"]}
+bevy = { version = "^0.19", default-features = false }
+avian2d = { version = "^0.7", default-features = false, features = ["2d", "debug-plugin", "parallel"]}
 bevy-tnua-physics-integration-layer = { version = "^0.12", path = "../physics-integration-layer" }
 ordered-float = "5.3.0"
 

avian2d/src/spatial_ext.rs

@@ -1,5 +1,6 @@
-use avian2d::prelude::*;
-use bevy::{ecs::system::SystemParam, prelude::*};
+use crate::{Collider, Position, Rotation};
+use avian2d::collision::collider::{CollisionLayers, Sensor};
+use bevy::ecs::{query::Has, system::Query};
 use bevy_tnua_physics_integration_layer::{
     math::{Float, Vector3},
     spatial_ext::{TnuaPointProjectionResult, TnuaSpatialExt},

avian3d/Cargo.toml

@@ -12,8 +12,8 @@ documentation = "https://docs.rs/bevy-tnua-avian3d"
 readme = "../README.md"
 
 [dependencies]
-bevy = { version = "^0.18", default-features = false }
-avian3d = { version = "^0.6", default-features = false, features = ["3d", "debug-plugin", "parallel"] }
+bevy = { version = "^0.19", default-features = false }
+avian3d = { version = "^0.7", default-features = false, features = ["3d", "debug-plugin", "parallel"] }
 bevy-tnua-physics-integration-layer = { version = "^0.12", path = "../physics-integration-layer" }
 ordered-float = "5.3.0"
 

avian3d/src/spatial_ext.rs

@@ -1,5 +1,7 @@
-use avian3d::prelude::*;
-use bevy::{ecs::system::SystemParam, prelude::*};
+use crate::{Position, Rotation};
+use avian3d::collision::collider::{CollisionLayers, Sensor};
+use avian3d::prelude::Collider;
+use bevy::ecs::{entity::Entity, query::Has, system::Query, system::SystemParam};
 use bevy_tnua_physics_integration_layer::{
     math::{Float, Vector3},
     spatial_ext::{TnuaPointProjectionResult, TnuaSpatialExt},

demos/Cargo.toml

@@ -43,7 +43,7 @@ avian2d = ["avian", "dep:avian2d", "dep:bevy-tnua-avian2d"]
 avian3d = ["avian", "dep:avian3d", "dep:bevy-tnua-avian3d"]
 
 [dependencies]
-bevy = { version = "^0.18", default-features = false, features = [
+bevy = { version = "^0.19", default-features = false, features = [
     "gltf_animation",
     "bevy_asset",
     # "bevy_audio",
@@ -52,6 +52,8 @@ bevy = { version = "^0.18", default-features = false, features = [
     # "bevy_winit",
     "bevy_render",
     "bevy_gltf",
+    "system_font_discovery",
+    "bevy_pbr",
     "ktx2",
     "zstd_rust",
     "tonemapping_luts",
@@ -71,27 +73,28 @@ bevy = { version = "^0.18", default-features = false, features = [
 bevy-tnua = { path = ".." }
 bevy-tnua-physics-integration-layer = { path = "../physics-integration-layer" }
 
-bevy_rapier2d = { version = "^0.33", features = ["debug-render-2d"], optional = true }
+bevy_rapier2d = { version = "^0.34", features = ["debug-render-2d"], optional = true }
 bevy-tnua-rapier2d = { path = "../rapier2d", optional = true }
 
-bevy_rapier3d = { version = "^0.33", features = ["debug-render-3d"], optional = true }
+bevy_rapier3d = { version = "^0.34", features = ["debug-render-3d"], optional = true }
 bevy-tnua-rapier3d = { path = "../rapier3d", optional = true }
+avian2d = { version = "^0.7", default-features = false, features = ["2d","debug-plugin", "parry-f32", "parallel"], optional = true}
 
-avian2d = { version = "^0.6", default-features = false, features = ["2d","debug-plugin", "parallel"], optional = true}
 bevy-tnua-avian2d = { path = "../avian2d", default-features = false, optional = true }
 
-avian3d = { version = "^0.6", default-features = false, features = ["3d","debug-plugin", "parallel"], optional = true }
+avian3d = { version = "^0.7", default-features = false, features = ["3d", "debug-plugin", "parallel", "parry-f32"], optional=true }
 bevy-tnua-avian3d = { path = "../avian3d", default-features = false, optional = true }
 
-bevy_egui = { version = "0.39", optional = true, default-features = false, features = ["default_fonts", "render"] }
-egui_plot = { version = "0.34", optional = true }
-egui_extras = { version = "0.33", optional = true }
+bevy_egui = { version = "0.40", optional = true, default-features = false, features = ["bevy_ui", "default_fonts", "render"] }
+egui_plot = { version = "0.35", optional = true }
+egui_extras = { version = "0.34", optional = true }
 
 bevy_framepace = { version = "0.21", optional = true }
 
 clap = { version = "^4", features = ["derive"] }
 ordered-float = "5.0.0"
 serde = { version = "1.0.228", features = ["derive"] }
+bevy_ecs = "0.19.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = { version = "^0.3", features = ["Window", "Location", "Url", "UrlSearchParams"] }

demos/src/bin/platformer_2d.rs

@@ -203,13 +203,13 @@ fn setup_player(
                 "Sensor Shape",
                 1,
                 &[
-                    ("Point", |mut cmd| {
+                    ("Point", |_cmd| {
                         #[cfg(feature = "rapier2d")]
                         cmd.remove::<TnuaRapier2dSensorShape>();
                         #[cfg(feature = "avian2d")]
                         cmd.remove::<TnuaAvian2dSensorShape>();
                     }),
-                    ("Flat (underfit)", |mut cmd| {
+                    ("Flat (underfit)", |_cmd| {
                         #[cfg(feature = "rapier2d")]
                         cmd.insert(TnuaRapier2dSensorShape(
                             bevy_rapier2d::parry::shape::SharedShape::cuboid(0.49, 0.0),
@@ -219,15 +219,15 @@ fn setup_player(
                             0.99, 0.0,
                         )));
                     }),
-                    ("Flat (exact)", |mut cmd| {
+                    ("Flat (exact)", |_cmd| {
                         #[cfg(feature = "rapier2d")]
                         cmd.insert(TnuaRapier2dSensorShape(
                             bevy_rapier2d::parry::shape::SharedShape::cuboid(0.5, 0.0),
                         ));
                         #[cfg(feature = "avian2d")]
                         cmd.insert(TnuaAvian2dSensorShape(avian::Collider::rectangle(1.0, 0.0)));
                     }),
-                    ("flat (overfit)", |mut cmd| {
+                    ("flat (overfit)", |_cmd| {
                         #[cfg(feature = "rapier2d")]
                         cmd.insert(TnuaRapier2dSensorShape(
                             bevy_rapier2d::parry::shape::SharedShape::cuboid(0.51, 0.0),
@@ -237,15 +237,15 @@ fn setup_player(
                             1.01, 0.0,
                         )));
                     }),
-                    ("Ball (underfit)", |mut cmd| {
+                    ("Ball (underfit)", |_cmd| {
                         #[cfg(feature = "rapier2d")]
                         cmd.insert(TnuaRapier2dSensorShape(
                             bevy_rapier2d::parry::shape::SharedShape::ball(0.49),
                         ));
                         #[cfg(feature = "avian2d")]
                         cmd.insert(TnuaAvian2dSensorShape(avian::Collider::circle(0.49)));
                     }),
-                    ("Ball (exact)", |mut cmd| {
+                    ("Ball (exact)", |_cmd| {
                         #[cfg(feature = "rapier2d")]
                         cmd.insert(TnuaRapier2dSensorShape(
                             bevy_rapier2d::parry::shape::SharedShape::ball(0.5),
@@ -255,7 +255,7 @@ fn setup_player(
                     }),
                 ],
             )
-            .with_checkbox("Lock Tilt", false, |mut cmd, lock_tilt| {
+            .with_checkbox("Lock Tilt", false, |_cmd, lock_tilt| {
                 // Tnua will automatically apply angular impulses/forces to fix the tilt and make
                 // the character stand upward, but it is also possible to just let the physics
                 // engine prevent rotation (other than around the Y axis, for turning)
@@ -274,7 +274,7 @@ fn setup_player(
             .with_checkbox(
                 "Phase Through Collision Groups",
                 true,
-                |mut cmd, use_collision_groups| {
+                |_cmd, _use_collision_groups| {
                     #[cfg(feature = "rapier2d")]
                     if use_collision_groups {
                         cmd.insert(CollisionGroups {

demos/src/bin/platformer_3d.rs

@@ -137,7 +137,7 @@ fn setup_camera_and_lights(mut commands: Commands) {
     commands.spawn((
         DirectionalLight {
             illuminance: 4000.0,
-            shadows_enabled: true,
+            shadow_maps_enabled: true,
             ..Default::default()
         },
         Transform::default().looking_at(-Vec3::Y, Vec3::Z),
@@ -165,7 +165,7 @@ fn setup_player(
     mut control_scheme_config_assets: ResMut<Assets<DemoControlSchemeConfig>>,
 ) {
     let mut cmd = commands.spawn(IsPlayer);
-    cmd.insert(SceneRoot(asset_server.load("player.glb#Scene0")));
+    cmd.insert(WorldAssetRoot(asset_server.load("player.glb#Scene0")));
     cmd.insert(GltfSceneHandler {
         names_from: asset_server.load("player.glb"),
     });
@@ -231,45 +231,45 @@ fn setup_player(
                 "Sensor Shape",
                 1,
                 &[
-                    ("no", |mut cmd| {
+                    ("no", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.remove::<TnuaRapier3dSensorShape>();
                         #[cfg(feature = "avian3d")]
                         cmd.remove::<TnuaAvian3dSensorShape>();
                     }),
-                    ("flat (underfit)", |mut cmd| {
+                    ("flat (underfit)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::cylinder(0.0, 0.49),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::cylinder(0.49, 0.0)));
                     }),
-                    ("flat (exact)", |mut cmd| {
+                    ("flat (exact)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::cylinder(0.0, 0.5),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::cylinder(0.5, 0.0)));
                     }),
-                    ("flat (overfit)", |mut cmd| {
+                    ("flat (overfit)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::cylinder(0.0, 0.51),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::cylinder(0.51, 0.0)));
                     }),
-                    ("ball (underfit)", |mut cmd| {
+                    ("ball (underfit)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::ball(0.49),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::sphere(0.49)));
                     }),
-                    ("ball (exact)", |mut cmd| {
+                    ("ball (exact)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::ball(0.5),
@@ -279,7 +279,7 @@ fn setup_player(
                     }),
                 ],
             )
-            .with_checkbox("Lock Tilt", true, |mut cmd, lock_tilt| {
+            .with_checkbox("Lock Tilt", true, |cmd, lock_tilt| {
                 // Tnua will automatically apply angular impulses/forces to fix the tilt and make
                 // the character stand upward, but it is also possible to just let the physics
                 // engine prevent rotation (other than around the Y axis, for turning)
@@ -301,7 +301,7 @@ fn setup_player(
             .with_checkbox(
                 "Phase Through Collision Groups",
                 true,
-                |mut cmd, use_collision_groups| {
+                |cmd, use_collision_groups| {
                     #[cfg(feature = "rapier3d")]
                     if use_collision_groups {
                         cmd.insert(CollisionGroups {

demos/src/bin/shooter_like.rs

@@ -153,7 +153,7 @@ fn setup_camera_and_lights(mut commands: Commands) {
     commands.spawn((
         DirectionalLight {
             illuminance: 4000.0,
-            shadows_enabled: true,
+            shadow_maps_enabled: true,
             ..Default::default()
         },
         Transform::default().looking_at(-Vec3::Y, Vec3::Z),
@@ -166,7 +166,7 @@ fn setup_player(
     mut control_scheme_config_assets: ResMut<Assets<DemoControlSchemeConfig>>,
 ) {
     let mut cmd = commands.spawn(IsPlayer);
-    cmd.insert(SceneRoot(asset_server.load("player.glb#Scene0")));
+    cmd.insert(WorldAssetRoot(asset_server.load("player.glb#Scene0")));
     cmd.insert(GltfSceneHandler {
         names_from: asset_server.load("player.glb"),
     });
@@ -231,45 +231,45 @@ fn setup_player(
                 "Sensor Shape",
                 1,
                 &[
-                    ("no", |mut cmd| {
+                    ("no", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.remove::<TnuaRapier3dSensorShape>();
                         #[cfg(feature = "avian3d")]
                         cmd.remove::<TnuaAvian3dSensorShape>();
                     }),
-                    ("flat (underfit)", |mut cmd| {
+                    ("flat (underfit)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::cylinder(0.0, 0.49),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::cylinder(0.49, 0.0)));
                     }),
-                    ("flat (exact)", |mut cmd| {
+                    ("flat (exact)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::cylinder(0.0, 0.5),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::cylinder(0.5, 0.0)));
                     }),
-                    ("flat (overfit)", |mut cmd| {
+                    ("flat (overfit)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::cylinder(0.0, 0.51),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::cylinder(0.51, 0.0)));
                     }),
-                    ("ball (underfit)", |mut cmd| {
+                    ("ball (underfit)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::ball(0.49),
                         ));
                         #[cfg(feature = "avian3d")]
                         cmd.insert(TnuaAvian3dSensorShape(avian::Collider::sphere(0.49)));
                     }),
-                    ("ball (exact)", |mut cmd| {
+                    ("ball (exact)", |cmd| {
                         #[cfg(feature = "rapier3d")]
                         cmd.insert(TnuaRapier3dSensorShape(
                             bevy_rapier3d::parry::shape::SharedShape::ball(0.5),
@@ -279,7 +279,7 @@ fn setup_player(
                     }),
                 ],
             )
-            .with_checkbox("Lock Tilt", false, |mut cmd, lock_tilt| {
+            .with_checkbox("Lock Tilt", false, |cmd, lock_tilt| {
                 // Tnua will automatically apply angular impulses/forces to fix the tilt and make
                 // the character stand upward, but it is also possible to just let the physics
                 // engine prevent rotation (other than around the Y axis, for turning)
@@ -301,7 +301,7 @@ fn setup_player(
             .with_checkbox(
                 "Phase Through Collision Groups",
                 true,
-                |mut cmd, use_collision_groups| {
+                |cmd, use_collision_groups| {
                     #[cfg(feature = "rapier3d")]
                     if use_collision_groups {
                         cmd.insert(CollisionGroups {
@@ -381,7 +381,7 @@ fn grab_ungrab_mouse(
     if cursor_options.visible {
         if mouse_buttons.just_pressed(MouseButton::Left) {
             #[cfg(feature = "egui")]
-            if egui_context.ctx_mut().unwrap().is_pointer_over_area() {
+            if egui_context.ctx_mut().unwrap().is_pointer_over_egui() {
                 return;
             }
             cursor_options.grab_mode = CursorGrabMode::Locked;

demos/src/character_control_systems/platformer_control_systems.rs

@@ -97,7 +97,7 @@ pub fn apply_platformer_controls(
     ghost_sensors_query: Query<&TnuaGhostSensor>,
 ) {
     #[cfg(feature = "egui")]
-    if egui_context.ctx_mut().unwrap().wants_keyboard_input() {
+    if egui_context.ctx_mut().unwrap().egui_wants_keyboard_input() {
         for (mut controller, ..) in query.iter_mut() {
             // The basis remembers its last frame status, so if we cannot feed it proper input this
             // frame (for example - because the GUI takes the input focus) we need to neutralize