-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR adds support for `bevy_xpbd` as an alternative physics backend. ## Changes - Added `xpbd_collisions` feature - Added `rapier` and `xpbd` sub-modules for `collisions` - Added `xpbd_collision` example; a clone of `rapier_example`, but modified for `bevy_xpbd` - Updated `README.md` and `src/lib.rs` to have separate sections for `bevy_rapier` and `bevy_xpbd`. If you'd like it to be changed more, let me know :)
- Loading branch information
Showing
10 changed files
with
409 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| use std::time::Duration; | ||
|
|
||
| use bevy::{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; | ||
|
|
||
| #[derive(Debug, Resource)] | ||
| struct ClothMovement { | ||
| sign: f32, | ||
| t: f32, | ||
| } | ||
|
|
||
| fn main() { | ||
| App::new() | ||
| .insert_resource(AmbientLight { | ||
| color: Color::WHITE, | ||
| brightness: 1.0, | ||
| }) | ||
| .add_plugins(DefaultPlugins) | ||
| .add_plugins(PhysicsPlugins::default()) | ||
| .add_plugins(ResourceInspectorPlugin::<ClothConfig>::new()) | ||
| .add_plugins(WorldInspectorPlugin::default()) | ||
| .add_plugins(ClothPlugin) | ||
| .add_plugins(camera_plugin::CameraPlugin) | ||
| .insert_resource(ClothMovement { sign: -1.0, t: 0.0 }) | ||
| .add_systems(Startup, (spawn_cloth, setup)) | ||
| .add_systems( | ||
| Update, | ||
| ( | ||
| shoot_balls.run_if(on_timer(Duration::from_secs(6))), | ||
| move_cloth, | ||
| ), | ||
| ) | ||
| .run(); | ||
| } | ||
|
|
||
| fn setup( | ||
| mut commands: Commands, | ||
| mut materials: ResMut<Assets<StandardMaterial>>, | ||
| mut meshes: ResMut<Assets<Mesh>>, | ||
| ) { | ||
| commands.spawn(DirectionalLightBundle { | ||
| transform: Transform::from_rotation(Quat::from_rotation_y(5.0)), | ||
| ..Default::default() | ||
| }); | ||
| let mesh_handle = meshes.add(shape::Cube::new(2.0).into()); | ||
| [ | ||
| (Color::BLUE, [-10.0, 0.0]), | ||
| (Color::GREEN, [10.0, 0.0]), | ||
| (Color::YELLOW, [0.0, -10.0]), | ||
| (Color::RED, [0.0, 10.0]), | ||
| ] | ||
| .map(|(color, [x, z])| { | ||
| commands.spawn(( | ||
| PbrBundle { | ||
| mesh: mesh_handle.clone(), | ||
| transform: Transform::from_xyz(x, 1.0, z), | ||
| material: materials.add(StandardMaterial { | ||
| base_color: color, | ||
| double_sided: true, | ||
| ..Default::default() | ||
| }), | ||
| ..Default::default() | ||
| }, | ||
| Collider::cuboid(2.0, 2.0, 2.0), | ||
| RigidBody::Static, | ||
| )); | ||
| }); | ||
| commands.spawn(( | ||
| PbrBundle { | ||
| mesh: meshes.add(shape::Cube { size: 24.0 }.into()), | ||
| material: materials.add(Color::WHITE.into()), | ||
| transform: Transform::from_xyz(0.0, -12.0, 0.0), | ||
| ..Default::default() | ||
| }, | ||
| Collider::cuboid(24.0, 24.0, 24.0), | ||
| RigidBody::Static, | ||
| )); | ||
| } | ||
|
|
||
| fn spawn_cloth( | ||
| mut commands: Commands, | ||
| mut materials: ResMut<Assets<StandardMaterial>>, | ||
| mut meshes: ResMut<Assets<Mesh>>, | ||
| asset_server: Res<AssetServer>, | ||
| ) { | ||
| let flag_texture = asset_server.load("Bevy.png"); | ||
| let (size_x, size_y) = (60, 40); | ||
| let mesh = rectangle_mesh((size_x, size_y), (-Vec3::X * 0.5, -Vec3::Y * 0.5), Vec3::Z); | ||
| let cloth = ClothBuilder::new() | ||
| .with_pinned_vertex_ids(0..size_x) | ||
| .with_stick_generation(StickGeneration::Triangles); | ||
| commands.spawn(( | ||
| PbrBundle { | ||
| mesh: meshes.add(mesh), | ||
| material: materials.add(StandardMaterial { | ||
| base_color_texture: Some(flag_texture), | ||
| cull_mode: None, // Option required to render back faces correctly | ||
| double_sided: true, // Option required to render back faces correctly | ||
| ..Default::default() | ||
| }), | ||
| transform: Transform::from_xyz(15.0, 15.0, 15.0), | ||
| ..Default::default() | ||
| }, | ||
| cloth, | ||
| ClothCollider { | ||
| dampen_others: Some(0.02), | ||
| ..Default::default() | ||
| }, | ||
| Name::new("Cloth"), | ||
| )); | ||
| } | ||
|
|
||
| fn move_cloth( | ||
| time: Res<Time>, | ||
| mut query: Query<&mut Transform, With<ClothBuilder>>, | ||
| mut movement: ResMut<ClothMovement>, | ||
| ) { | ||
| let delta_time = time.delta_seconds(); | ||
| for mut transform in query.iter_mut() { | ||
| movement.t += delta_time * 2.0; | ||
| transform.translation.z += movement.sign * delta_time * 2.0; | ||
| if movement.t > 30.0 { | ||
| movement.t = 0.0; | ||
| movement.sign = -movement.sign; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn shoot_balls( | ||
| mut commands: Commands, | ||
| mut meshes: ResMut<Assets<Mesh>>, | ||
| mut materials: ResMut<Assets<StandardMaterial>>, | ||
| ) { | ||
| let mut rng = thread_rng(); | ||
| let radius = rng.gen_range(1.0..3.0); | ||
| commands.spawn(( | ||
| PbrBundle { | ||
| mesh: meshes.add( | ||
| shape::Icosphere { | ||
| radius, | ||
| subdivisions: 5, | ||
| } | ||
| .try_into() | ||
| .unwrap(), | ||
| ), | ||
| material: materials.add(Color::WHITE.into()), | ||
| transform: Transform::from_xyz(0.0, 0.0, -20.0), | ||
| ..Default::default() | ||
| }, | ||
| LinearVelocity(Vec3::new( | ||
| rng.gen_range(-5.0..5.0), | ||
| rng.gen_range(10.0..15.0), | ||
| rng.gen_range(20.0..30.0), | ||
| )), | ||
| RigidBody::Dynamic, | ||
| Collider::ball(radius), | ||
| Name::new("Ball"), | ||
| )); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.