Upgrade to Bevy 0.18

Cargo.toml

@@ -13,68 +13,68 @@ categories = ["game-development"]
 readme = "readme.md"
 
 [workspace.dependencies]
-avian3d = { version = "0.4", default-features = false }
-serde = { version = "1.0.219", default-features = false, features = ["alloc"] }
-serde_json = { version = "1.0.140", default-features = false, features = [
+avian3d = { version = "0.5", default-features = false }
+serde = { version = "1", default-features = false, features = ["alloc"] }
+serde_json = { version = "1", default-features = false, features = [
     "alloc",
 ] }
-slotmap = { version = "1.0.7", default-features = false }
+slotmap = { version = "1", default-features = false }
 ehttp = { version = "0.5", default-features = false }
 rfd = "0.15"
 
 # In sync with Bevy
-thiserror = { version = "2.0.12", default-features = false }
-wgpu-types = { version = "26", default-features = false }
-base64 = { version = "0.22.0", default-features = false, features = ["alloc"] }
-glam = { version = "0.30.5", default-features = false }
-libm = { version = "0.2.0", default-features = false }
-cosmic-text = { version = "0.14.2", default-features = false }
-tracing = { version = "0.1.41", default-features = false }
-critical-section = { version = "1.2.0", default-features = false }
-anyhow = { version = "1.0.98", default-features = false }
+thiserror = { version = "2", default-features = false }
+wgpu-types = { version = "27", default-features = false }
+base64 = { version = "0.22", default-features = false, features = ["alloc"] }
+glam = { version = "0.30", default-features = false }
+libm = { version = "0.2", default-features = false }
+cosmic-text = { version = "0.14", default-features = false }
+tracing = { version = "0.1", default-features = false }
+critical-section = { version = "1", default-features = false }
+anyhow = { version = "1", default-features = false }
 
 # Bevy
 ## Bevy itself is only used in tests and examples, so we can use the default features.
-bevy = { version = "0.17.0", default-features = true }
+bevy = { version = "0.18", default-features = true }
 ## Actual crate code should only depend on bevy_ crates with default features disabled.
-bevy_reflect = { version = "0.17.0", default-features = false, features = [
+bevy_reflect = { version = "0.18", default-features = false, features = [
     "glam",
 ] }
-bevy_app = { version = "0.17.0", default-features = false }
-bevy_camera = { version = "0.17.0", default-features = false }
-bevy_utils = { version = "0.17.0", default-features = false }
-bevy_light = { version = "0.17.0", default-features = false }
-bevy_remote = { version = "0.17.0", default-features = false }
-bevy_mesh = { version = "0.17.0", default-features = false }
-bevy_ecs = { version = "0.17.0", default-features = false }
-bevy_render = { version = "0.17.0", default-features = false }
-bevy_transform = { version = "0.17.0", default-features = false }
-bevy_asset = { version = "0.17.0", default-features = false }
-bevy_image = { version = "0.17.0", default-features = false }
-bevy_pbr = { version = "0.17.0", default-features = false }
-bevy_math = { version = "0.17.0", default-features = false }
-bevy_color = { version = "0.17.0", default-features = false }
-bevy_derive = { version = "0.17.0", default-features = false }
-bevy_platform = { version = "0.17.0", default-features = false }
-bevy_tasks = { version = "0.17.0", default-features = false }
-bevy_gizmos = { version = "0.17.0", default-features = false }
+bevy_app = { version = "0.18", default-features = false }
+bevy_camera = { version = "0.18", default-features = false }
+bevy_light = { version = "0.18", default-features = false }
+bevy_remote = { version = "0.18", default-features = false }
+bevy_mesh = { version = "0.18", default-features = false }
+bevy_ecs = { version = "0.18", default-features = false }
+bevy_render = { version = "0.18", default-features = false }
+bevy_transform = { version = "0.18", default-features = false }
+bevy_asset = { version = "0.18", default-features = false }
+bevy_image = { version = "0.18", default-features = false }
+bevy_pbr = { version = "0.18", default-features = false }
+bevy_math = { version = "0.18", default-features = false }
+bevy_color = { version = "0.18", default-features = false }
+bevy_derive = { version = "0.18", default-features = false }
+bevy_platform = { version = "0.18", default-features = false }
+bevy_tasks = { version = "0.18", default-features = false }
+bevy_gizmos = { version = "0.18", default-features = false }
 
 # Workspace crates
-rerecast = { version = "0.2.0", path = "crates/rerecast", default-features = false }
-bevy_rerecast = { version = "0.3.0", path = "crates/bevy_rerecast", default-features = false }
-bevy_rerecast_core = { version = "0.3.0", path = "crates/bevy_rerecast_core", default-features = false }
-bevy_rerecast_editor_integration = { version = "0.3.0", path = "crates/bevy_rerecast_editor_integration", default-features = false }
-avian_rerecast = { version = "0.3.0", path = "crates/avian_rerecast", default-features = false }
-test_utils = { version = "0.1.0", path = "crates/test_utils", default-features = false }
+rerecast = { version = "0.3", path = "crates/rerecast", default-features = false }
+bevy_rerecast = { version = "0.4", path = "crates/bevy_rerecast", default-features = false }
+bevy_rerecast_core = { version = "0.4", path = "crates/bevy_rerecast_core", default-features = false }
+bevy_rerecast_editor_integration = { version = "0.4", path = "crates/bevy_rerecast_editor_integration", default-features = false }
+avian_rerecast = { version = "0.4", path = "crates/avian_rerecast", default-features = false }
+test_utils = { version = "0.1", path = "crates/test_utils", default-features = false }
 
 # Other stuffs
-bitflags = { version = "2.9.1", default-features = false }
-bevy_ui_text_input = { version = "0.6.0-rc" }
-flate2 = { version = "1.1.2", default-features = false, features = [
+bitflags = { version = "2", default-features = false }
+bevy_ui_text_input = { version = "0.7", git = "https://github.com/ickshonpe/bevy_ui_text_input" }
+flate2 = { version = "1", default-features = false, features = [
     "rust_backend",
 ] }
 bincode = { version = "2", features = ["serde"], default-features = false }
-bevy_trenchbroom = { version = "0.10", features = ["avian"], git = "https://github.com/Noxmore/bevy_trenchbroom", branch = "bevy-0.17" }
+bevy_trenchbroom = "0.12"
+bevy_trenchbroom_avian = "0.12"
 approxim = "0.6"
 
 [workspace.lints.rust]

changelog.md

@@ -1,4 +1,6 @@
-# Unreleased
+# 0.3.0
+
+- Bump deps
 
 # 0.2.0
 

crates/avian_rerecast/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "avian_rerecast"
 description = "Avian backend for bevy_rerecast"
-version = "0.3.0"
+version = "0.4.0"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
@@ -13,7 +13,6 @@ readme = { workspace = true }
 [dependencies]
 bevy_app = { workspace = true }
 bevy_ecs = { workspace = true }
-bevy_transform = { workspace = true }
 bevy_math = { workspace = true }
 avian3d = { workspace = true, features = ["3d"] }
 bevy_rerecast_core = { workspace = true, features = ["std"] }

crates/bevy_rerecast/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_rerecast"
 description = "Bevy integration for rerecast"
-version = "0.3.0"
+version = "0.4.0"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
@@ -12,7 +12,6 @@ readme = { workspace = true }
 
 [dependencies]
 bevy_app = { workspace = true, features = ["std"] }
-bevy_math = { workspace = true, features = ["std"] }
 bevy_rerecast_core = { workspace = true, features = [
     "std",
     "bevy_asset",

crates/bevy_rerecast_core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_rerecast_core"
 description = "Core editorless Bevy integration for bevy_rerecast"
-version = "0.3.1"
+version = "0.4.0"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
@@ -19,12 +19,11 @@ bevy_light = { workspace = true }
 bevy_derive = { workspace = true }
 bevy_reflect = { workspace = true }
 bevy_app = { workspace = true }
-bevy_utils = { workspace = true }
 bevy_math = { workspace = true, features = ["bevy_reflect", "serialize"] }
 bevy_platform = { workspace = true }
 
 # debug-plugin
-bevy_gizmos = { workspace = true, optional = true, features = ["bevy_render"] }
+bevy_gizmos = { workspace = true, optional = true, features = ["bevy_light"] }
 bevy_color = { workspace = true, optional = true }
 bevy_pbr = { workspace = true, optional = true }
 
@@ -57,7 +56,6 @@ std = [
     "bevy_math/std",
     "bevy_platform/std",
     "bevy_color?/std",
-    "bevy_utils/std",
     "serde/std",
     "anyhow/std",
     "tracing?/std",

crates/bevy_rerecast_core/src/asset_loader.rs

@@ -3,6 +3,7 @@
 use alloc::vec::Vec;
 use bevy_app::prelude::*;
 use bevy_asset::{AssetApp as _, AssetLoader, LoadContext, io::Reader};
+use bevy_reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
@@ -14,7 +15,7 @@ pub(super) fn plugin(app: &mut App) {
 }
 
 /// The [`AssetLoader`] for [`Navmesh`] assets. Loads files ending in `.nav`.
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Reflect)]
 #[non_exhaustive]
 pub struct NavmeshLoader;
 

crates/bevy_rerecast_editor/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_rerecast_editor"
 description = "Standalone editor for bevy_rerecast"
-version = "0.3.0"
+version = "0.4.0"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }

crates/bevy_rerecast_editor/src/ui.rs

@@ -489,10 +489,10 @@ fn decimal_option_input(marker: impl Bundle, initial_value: f32) -> impl Bundle
         },
         TextInputNode {
             mode: TextInputMode::SingleLine,
-            filter: Some(TextInputFilter::Decimal),
             clear_on_submit: false,
             ..Default::default()
         },
+        TextInputFilter::Decimal,
         TextFont {
             font_size: 14.0,
             ..default()

crates/bevy_rerecast_editor_integration/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_rerecast_editor_integration"
 description = "Editor integration for bevy_rerecast_core"
-version = "0.3.0"
+version = "0.4.0"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
@@ -40,6 +40,7 @@ bevy_camera = { workspace = true }
 bevy_tasks = { workspace = true }
 bevy_mesh = { workspace = true, features = ["serialize"] }
 bevy_image = { workspace = true, features = ["serialize"] }
+cosmic-text = { workspace = true, features = ["std"] }
 
 tracing = { workspace = true }
 thiserror = { workspace = true }

crates/bevy_rerecast_editor_integration/src/transmission/serialized_standard_material.rs

@@ -4,10 +4,9 @@ use bevy_image::{Image, SerializedImage};
 use bevy_math::Affine2;
 use bevy_pbr::{OpaqueRendererMethod, UvChannel, prelude::*};
 use bevy_platform::collections::HashMap;
-use bevy_render::alpha::AlphaMode;
+use bevy_render::{alpha::AlphaMode, render_resource::Face};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-use wgpu_types::Face;
 
 /// Serialized representation of a [`StandardMaterial`]
 #[derive(Debug, Clone, Serialize, Deserialize)]

crates/rerecast/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rerecast"
 description = "Rust port of recastnavigation"
-version = "0.2.0"
+version = "0.3.0"
 authors = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }

examples/Cargo.toml

@@ -16,6 +16,7 @@ bevy_rerecast = { workspace = true, default-features = true }
 avian_rerecast = { workspace = true }
 bevy = { workspace = true, features = ["bevy_remote"] }
 bevy_trenchbroom = { workspace = true }
+bevy_trenchbroom_avian = { workspace = true }
 avian3d = { workspace = true }
 
 [lints]

examples/examples/trenchbroom.rs

@@ -9,6 +9,7 @@ use bevy::{
 };
 use bevy_rerecast::{debug::DetailNavmeshGizmo, prelude::*};
 use bevy_trenchbroom::prelude::*;
+use bevy_trenchbroom_avian::AvianPhysicsBackend;
 
 fn main() -> AppExit {
     App::new()
@@ -17,14 +18,17 @@ fn main() -> AppExit {
             ..default()
         }))
         .add_plugins(PhysicsPlugins::default())
-        .add_plugins(TrenchBroomPlugins(
-            TrenchBroomConfig::new("bevy_rerecast")
-                .assets_path("scenes/trenchbroom/assets")
-                .default_solid_spawn_hooks(|| {
-                    SpawnHooks::new()
-                        .convex_collider()
-                        .smooth_by_default_angle()
-                }),
+        .add_plugins((
+            TrenchBroomPlugins(
+                TrenchBroomConfig::new("bevy_rerecast")
+                    .assets_path("scenes/trenchbroom/assets")
+                    .default_solid_scene_hooks(|| {
+                        SceneHooks::new()
+                            .convex_collider()
+                            .smooth_by_default_angle()
+                    }),
+            ),
+            TrenchBroomPhysicsPlugin::new(AvianPhysicsBackend),
         ))
         .add_plugins((RemotePlugin::default(), RemoteHttpPlugin::default()))
         .add_plugins((NavmeshPlugins::default(), AvianBackendPlugin::default()))

readme.md

@@ -127,7 +127,7 @@ App::new()
 Next, download the editor by entering the following command in your terminal:
 
 ```bash
-cargo install bevy_rerecast_editor
+cargo install bevy_rerecast_editor --git https://github.com/janhohenheim/rerecast --locked
 ```
 
 And then run it:
@@ -210,6 +210,7 @@ Take a look at their repos for documentation on how to use them with rerecast.
 
 | bevy  | bevy_rerecast |
 |-------|---------------|
+| 0.18  | 0.4           |
 | 0.17  | 0.3           |
 | 0.16  | 0.2           |