diff --git a/Cargo.lock b/Cargo.lock index a1079ea..594f5cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1404,14 +1404,15 @@ dependencies = [ [[package]] name = "bevy_trenchbroom" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ed5bb471e9b65df4c4b6313de1578577f6bab75466e73af66e8d145d7bf49c" +checksum = "626fb4b9f584abe91fd5af018214b5b87d8a335f992a5feec2a2b912c83c3fd0" dependencies = [ "anyhow", "avian3d", "bevy", "bevy_materialize", + "bevy_mesh", "bevy_reflect", "bevy_trenchbroom_macros", "default-struct-builder", @@ -1429,13 +1430,14 @@ dependencies = [ "serde", "strum", "thiserror 2.0.12", + "wgpu-types", ] [[package]] name = "bevy_trenchbroom_macros" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d705a6b59b24c75bb34f71b84249fb5625a53298e0737870613fa1a799e67993" +checksum = "8de529df5f174d541f12cc81bfac0f3161373817f26fbd1feef422baa982d4b4" dependencies = [ "heck", "proc-macro2", @@ -2942,9 +2944,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "image" -version = "0.25.5" +version = "0.25.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b" +checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a" dependencies = [ "bytemuck", "byteorder-lite", @@ -3266,9 +3268,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "loop9" @@ -4301,9 +4303,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.37.2" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003" +checksum = "bf763ab1c7a3aa408be466efc86efe35ed1bd3dd74173ed39d6b0d0a6f0ba148" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index b76e91d..1d86997 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,11 +20,15 @@ avian3d = { version = "0.2.1", default-features = false, features = [ "parallel", ] } bevy = "0.15.3" -bevy_trenchbroom = { version = "0.6.5", features = ["auto_register", "avian"] } +bevy_trenchbroom = { version = "0.7", features = [ + "auto_register", + "avian", + "client", +] } nil = "0.14.0" bevy_asset_loader = "0.22.0" bevy_sprite3d = "4.0.0" -rand = "0.8.5" +rand = "=0.8.5" bevy-inspector-egui = { version = "0.30", optional = true } bevy_polyline = "0.11.0" diff --git a/src/tb_entities.rs b/src/tb_entities.rs index a65f292..5000850 100644 --- a/src/tb_entities.rs +++ b/src/tb_entities.rs @@ -45,19 +45,19 @@ impl SpawnPoint { #[derive(SolidClass, Component, Reflect, Default)] #[reflect(Component)] -#[geometry(GeometryProvider::new().convex_collider().render())] +#[geometry(GeometryProvider::new().convex_collider())] pub struct Worldspawn; #[derive(SolidClass, Component, Reflect, Default)] #[reflect(Component)] #[require(Transform)] -#[geometry(GeometryProvider::new().convex_collider().render())] +#[geometry(GeometryProvider::new().convex_collider())] pub struct Crates; #[derive(SolidClass, Component, Reflect, Default)] #[reflect(Component)] #[require(Transform)] -#[geometry(GeometryProvider::new().convex_collider().render())] +#[geometry(GeometryProvider::new().convex_collider())] pub struct NamedEntity { pub name: String, } @@ -65,7 +65,7 @@ pub struct NamedEntity { #[derive(SolidClass, Component, Reflect, Default)] #[reflect(Component)] #[require(Transform, Target)] -#[geometry(GeometryProvider::new().convex_collider().render())] +#[geometry(GeometryProvider::new().convex_collider())] pub struct Platform; #[derive(PointClass, Component, Reflect, Default)] @@ -78,7 +78,7 @@ pub struct PlatformTarget { #[derive(SolidClass, Component, Reflect, Default)] #[reflect(Component)] #[require(Transform, Target)] -#[geometry(GeometryProvider::new().convex_collider().render())] +#[geometry(GeometryProvider::new().convex_collider())] pub struct Movable { pub name: String, }