Feat/bevy 0.14 (#26)

.github/workflows/rust.yml

@@ -40,7 +40,7 @@ jobs:
       - name: build moving example
         run: cargo clippy --example moving
       - name: build rapier example
-        run: cargo clippy --features xpbd_collisions --example xpbd_collision
+        run: cargo clippy --features avian_collisions --example avian_collision
       - name: build rapier example
         run: cargo clippy --features rapier_collisions --example rapier_collision
       - name: build anchors example

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+* Physics improvements (#25)
+* Bevy `0.14`
+* Migrated from `bevy_xpbd` to `avian`
+* (**BREAKING**) Renamed `xpbd_collisions` feature to `avian_collisions`
+* Renamed `xpbd_collision_example` to `avian_collision_example`
+
 ## 0.8.0
 
 * Bump `bevy` to `0.13.x`

Cargo.toml

@@ -15,37 +15,37 @@ documentation = "https://docs.rs/bevy_silk"
 [features]
 default = []
 rapier_collisions = ["bevy_rapier3d"]
-xpbd_collisions = ["bevy_xpbd_3d"]
+avian_collisions = ["avian3d"]
 
 [dependencies]
 # Error handling
 thiserror = "1.0"
 
 [dependencies.bevy]
-version = "0.13"
+version = "0.14"
 default-features = false
-features = ["bevy_render", "bevy_asset"]
+features = ["bevy_render", "bevy_asset", "bevy_color"]
 
 [dependencies.bevy_rapier3d]
-version = "0.26"
+version = "0.27"
 optional = true
 default-features = false
 features = ["dim3", "async-collider"]
 
-[dependencies.bevy_xpbd_3d]
-version = "0.4"
+[dependencies.avian3d]
+version = "0.1"
 optional = true
 default-features = false
-features = ["3d", "f32", "async-collider", "default-collider", "parry-f32"]
+features = ["3d", "f32", "default-collider", "parry-f32"]
 
 [dev-dependencies]
-bevy-inspector-egui = "0.24"
+bevy-inspector-egui = "0.25"
 rand = "0.8"
-bevy_xpbd_3d = "0.4"
-bevy_rapier3d = "0.26"
+avian3d = "0.1"
+bevy_rapier3d = "0.27"
 
 [dev-dependencies.bevy]
-version = "0.13"
+version = "0.14"
 features = [
   "bevy_asset",
   "bevy_winit",
@@ -77,9 +77,9 @@ path = "examples/rapier_collision_example.rs"
 required-features = ["rapier_collisions"]
 
 [[example]]
-name = "xpbd_collision"
-path = "examples/xpbd_collision_example.rs"
-required-features = ["xpbd_collisions"]
+name = "avian_collision"
+path = "examples/avian_collision_example.rs"
+required-features = ["avian_collisions"]
 
 [[example]]
 name = "anchors"

README.md

@@ -96,7 +96,7 @@ For example you can pin some cloth vertices to the cloth entity's
 `GlobalTransform`:
 
 ```rust
-use bevy::prelude::Color;
+use bevy::color::{palettes::css::*, Color};
 use bevy_silk::prelude::*;
 
 let cloth = ClothBuilder::new()
@@ -105,9 +105,9 @@ let cloth = ClothBuilder::new()
     // Adds a single pinned vertex id
     .with_pinned_vertex_id(10)
     // Adds pinned vertex colors using an Iterator
-    .with_pinned_vertex_colors([Color::WHITE, Color::BLACK].into_iter())
+    .with_pinned_vertex_colors([Color::from(WHITE), Color::from(BLACK)].into_iter())
     // Adds a single pinned vertex color
-    .with_pinned_vertex_color(Color::YELLOW)
+    .with_pinned_vertex_color(Color::from(YELLOW))
     // Adds pinned vertex positions
     .with_pinned_vertex_positions(|pos| pos.x > 0.0 && pos.z <= 5.0);
 ```
@@ -116,7 +116,7 @@ For more anchoring options, for example to specify a custom entity to pin
 the vertices to:
 
 ```rust
-use bevy::prelude::*;
+use bevy::{color::palettes::css::*, prelude::*};
 use bevy_silk::prelude::*;
 
 fn spawn(mut commands: Commands) {
@@ -148,9 +148,12 @@ fn spawn(mut commands: Commands) {
         // Adds a single pinned vertex id
         .with_anchored_vertex_id(10, anchor_to_self)
         // Adds pinned vertex colors using an Iterator
-        .with_anchored_vertex_colors([Color::WHITE, Color::BLACK].into_iter(), anchor_to_a)
+        .with_anchored_vertex_colors(
+            [Color::from(WHITE), Color::from(BLACK)].into_iter(),
+            anchor_to_a,
+        )
         // Adds a single pinned vertex color
-        .with_anchored_vertex_color(Color::YELLOW, anchor_to_self)
+        .with_anchored_vertex_color(Color::from(YELLOW), anchor_to_self)
         // Adds pinned vertex positions
         .with_anchored_vertex_positions(|pos| pos.x > 0.0 && pos.z <= 5.0, anchor_to_self);
 }
@@ -226,9 +229,9 @@ fn main() {
 
 ## Collisions
 
-Both [`bevy_rapier`] and [`bevy_xpbd`] are supported for cloth interactions
+Both [`bevy_rapier`] and [`avian`] are supported for cloth interactions
 with colliders. They can be enabled with the `rapier_collisions` and
-`xpbd_collisions` features respectively.
+`avian_collisions` features respectively.
 
 > Note: Collision support is still experimental for now and is not suited
 > for production use. Feedback is welcome!
@@ -265,9 +268,9 @@ Three `bevy_rapier` components will be automatically inserted:
 You can customize what collisions will be checked by specifying
 `CollisionGroups`. (See the [`bevy_rapier` docs](https://rapier.rs/docs/user_guides/bevy_plugin/colliders#collision-groups-and-solver-groups)).
 
-### `bevy_xpbd`
+### `avian` (previously `bevy_xpbd`)
 
-Add `bevy_xpbd_3d::PhysicsPlugins` to your app and a `ClothCollider`
+Add `avian3d::PhysicsPlugins` to your app and a `ClothCollider`
 to your entity to enable collisions:
 
 ```rust
@@ -286,15 +289,15 @@ fn spawn(mut commands: Commands) {
 }
 ```
 
-Three `bevy_xpbd` components will be automatically inserted:
+Three `avian3d` components will be automatically inserted:
 
 * a `RigidBody::Kinematic`
 * a `Collider` which will be updated every frame to follow the cloth bounds
   (AABB)
 * a `Sensor` used for avoiding default collision solving.
 
 You can customize what collisions will be checked by specifying
-`CollisionLayers`. (See the [`bevy_xpbd` docs](https://docs.rs/bevy_xpbd_3d/latest/bevy_xpbd_3d/components/struct.CollisionLayers.html)).
+`CollisionLayers`. (See the [`avian` docs](https://docs.rs/avian3d/latest/avian3d/collision/struct.CollisionLayers.html)).
 
 ## Mesh utils
 
@@ -318,7 +321,7 @@ useful for classic cloth uses like flags or capes
     value in `ClothConfig::acceleration_smoothing`.
 
 [`bevy_rapier`]: https://github.com/dimforge/bevy_rapier
-[`bevy_xpbd`]: https://github.com/Jondolf/bevy_xpbd
+[`avian`]: https://github.com/Jondolf/avian
 
 <!-- cargo-sync-readme end -->
 

examples/anchors_example.rs

@@ -1,4 +1,7 @@
-use bevy::prelude::*;
+use bevy::{
+    color::palettes::css::{BLUE, GREEN, RED, YELLOW},
+    prelude::*,
+};
 use bevy_inspector_egui::quick::{ResourceInspectorPlugin, WorldInspectorPlugin};
 use bevy_silk::prelude::*;
 
@@ -30,10 +33,10 @@ fn setup(
     });
     let mesh_handle = meshes.add(Cuboid::default());
     [
-        (Color::BLUE, [-10.0, 0.0]),
-        (Color::GREEN, [10.0, 0.0]),
-        (Color::YELLOW, [0.0, -10.0]),
-        (Color::RED, [0.0, 10.0]),
+        (Color::from(BLUE), [-10.0, 0.0]),
+        (Color::from(GREEN), [10.0, 0.0]),
+        (Color::from(YELLOW), [0.0, -10.0]),
+        (Color::from(RED), [0.0, 10.0]),
     ]
     .map(|(color, [x, z])| {
         commands.spawn(PbrBundle {
@@ -59,7 +62,7 @@ fn spawn_cloth(
         .spawn((
             PbrBundle {
                 mesh: anchor_mesh.clone(),
-                material: materials.add(Color::RED),
+                material: materials.add(Color::from(RED)),
                 transform: Transform::from_xyz(-15.0, 15.0, 15.0),
                 ..Default::default()
             },
@@ -70,7 +73,7 @@ fn spawn_cloth(
         .spawn((
             PbrBundle {
                 mesh: anchor_mesh,
-                material: materials.add(Color::GREEN),
+                material: materials.add(Color::from(GREEN)),
                 transform: Transform::from_xyz(15.0, 15.0, 15.0),
                 ..Default::default()
             },

examples/xpbd_collision_example.rs → examples/avian_collision_example.rs

@@ -1,9 +1,13 @@
 use std::time::Duration;
 
-use bevy::{prelude::*, time::common_conditions::on_timer};
+use avian3d::prelude::*;
+use bevy::{
+    color::palettes::css::{BLUE, GREEN, RED, YELLOW},
+    prelude::*,
+    time::common_conditions::on_timer,
+};
 use bevy_inspector_egui::quick::{ResourceInspectorPlugin, WorldInspectorPlugin};
 use bevy_silk::prelude::*;
-use bevy_xpbd_3d::prelude::*;
 use rand::{thread_rng, Rng};
 
 mod camera_plugin;
@@ -49,10 +53,10 @@ fn setup(
     });
     let mesh_handle = meshes.add(Cuboid::new(2.0, 2.0, 2.0));
     [
-        (Color::BLUE, [-10.0, 0.0]),
-        (Color::GREEN, [10.0, 0.0]),
-        (Color::YELLOW, [0.0, -10.0]),
-        (Color::RED, [0.0, 10.0]),
+        (Color::from(BLUE), [-10.0, 0.0]),
+        (Color::from(GREEN), [10.0, 0.0]),
+        (Color::from(YELLOW), [0.0, -10.0]),
+        (Color::from(RED), [0.0, 10.0]),
     ]
     .map(|(color, [x, z])| {
         commands.spawn((

examples/balloon_example.rs

@@ -1,4 +1,7 @@
-use bevy::prelude::*;
+use bevy::{
+    color::palettes::css::{BLUE, GREEN, RED, YELLOW},
+    prelude::*,
+};
 use bevy_inspector_egui::quick::{ResourceInspectorPlugin, WorldInspectorPlugin};
 use bevy_silk::prelude::*;
 
@@ -31,10 +34,10 @@ fn setup(
     commands.spawn(DirectionalLightBundle::default());
     let mesh_handle = meshes.add(Cuboid::default());
     [
-        (Color::BLUE, [-10.0, 0.0]),
-        (Color::GREEN, [10.0, 0.0]),
-        (Color::YELLOW, [0.0, -10.0]),
-        (Color::RED, [0.0, 10.0]),
+        (Color::from(BLUE), [-10.0, 0.0]),
+        (Color::from(GREEN), [10.0, 0.0]),
+        (Color::from(YELLOW), [0.0, -10.0]),
+        (Color::from(RED), [0.0, 10.0]),
     ]
     .map(|(color, [x, z])| {
         commands.spawn(PbrBundle {
@@ -58,7 +61,7 @@ fn spawn_cloth(
     commands.spawn((
         PbrBundle {
             mesh: meshes.add(Sphere::new(5.).mesh().ico(10).unwrap()),
-            material: materials.add(Color::YELLOW),
+            material: materials.add(Color::from(YELLOW)),
             transform: Transform::from_xyz(0.0, 2.0, 0.0),
             ..Default::default()
         },

examples/flag_example.rs

@@ -1,4 +1,7 @@
-use bevy::prelude::*;
+use bevy::{
+    color::palettes::css::{BLUE, GREEN, RED, YELLOW},
+    prelude::*,
+};
 use bevy_inspector_egui::quick::{ResourceInspectorPlugin, WorldInspectorPlugin};
 use bevy_silk::prelude::*;
 
@@ -45,10 +48,10 @@ fn setup(
     });
     let mesh_handle = meshes.add(Cuboid::default());
     [
-        (Color::BLUE, [-10.0, 0.0]),
-        (Color::GREEN, [10.0, 0.0]),
-        (Color::YELLOW, [0.0, -10.0]),
-        (Color::RED, [0.0, 10.0]),
+        (Color::from(BLUE), [-10.0, 0.0]),
+        (Color::from(GREEN), [10.0, 0.0]),
+        (Color::from(YELLOW), [0.0, -10.0]),
+        (Color::from(RED), [0.0, 10.0]),
     ]
     .map(|(color, [x, z])| {
         commands.spawn(PbrBundle {
@@ -121,7 +124,7 @@ fn spawn_cloth(
         })
         .collect();
     mesh.insert_attribute(Mesh::ATTRIBUTE_COLOR, colors);
-    let cloth = ClothBuilder::new().with_pinned_vertex_color(Color::RED);
+    let cloth = ClothBuilder::new().with_pinned_vertex_color(Color::from(RED));
     commands.spawn((
         PbrBundle {
             mesh: meshes.add(mesh),

examples/moving_example.rs

@@ -1,4 +1,7 @@
-use bevy::prelude::*;
+use bevy::{
+    color::palettes::css::{BLUE, GREEN, RED, YELLOW},
+    prelude::*,
+};
 use bevy_inspector_egui::quick::{ResourceInspectorPlugin, WorldInspectorPlugin};
 use bevy_silk::prelude::*;
 
@@ -44,10 +47,10 @@ fn setup(
 ) {
     let mesh_handle = meshes.add(Cuboid::default());
     [
-        (Color::BLUE, [-10.0, 0.0]),
-        (Color::GREEN, [10.0, 0.0]),
-        (Color::YELLOW, [0.0, -10.0]),
-        (Color::RED, [0.0, 10.0]),
+        (Color::from(GREEN), [10.0, 0.0]),
+        (Color::from(BLUE), [-10.0, 0.0]),
+        (Color::from(YELLOW), [0.0, -10.0]),
+        (Color::from(RED), [0.0, 10.0]),
     ]
     .map(|(color, [x, z])| {
         commands.spawn(PbrBundle {

examples/rapier_collision_example.rs

@@ -1,6 +1,10 @@
 use std::time::Duration;
 
-use bevy::{prelude::*, time::common_conditions::on_timer};
+use bevy::{
+    color::palettes::css::{BLUE, GREEN, RED, YELLOW},
+    prelude::*,
+    time::common_conditions::on_timer,
+};
 use bevy_inspector_egui::quick::{ResourceInspectorPlugin, WorldInspectorPlugin};
 use bevy_rapier3d::prelude::*;
 use bevy_silk::prelude::*;
@@ -49,10 +53,10 @@ fn setup(
     });
     let mesh_handle = meshes.add(Cuboid::new(2.0, 2.0, 2.0));
     [
-        (Color::BLUE, [-10.0, 0.0]),
-        (Color::GREEN, [10.0, 0.0]),
-        (Color::YELLOW, [0.0, -10.0]),
-        (Color::RED, [0.0, 10.0]),
+        (Color::from(BLUE), [-10.0, 0.0]),
+        (Color::from(GREEN), [10.0, 0.0]),
+        (Color::from(YELLOW), [0.0, -10.0]),
+        (Color::from(RED), [0.0, 10.0]),
     ]
     .map(|(color, [x, z])| {
         commands.spawn((

src/components/cloth.rs

@@ -316,6 +316,7 @@ impl Cloth {
 }
 
 #[cfg(test)]
+#[allow(clippy::unwrap_used)]
 mod tests {
     use super::*;
     use crate::mesh::rectangle_mesh;