Skip to content

Commit a4e9343

Browse files
Add a way to convert a parry shape to bevy mesh #628
2 parents 1873289 + c11fd65 commit a4e9343

24 files changed

+525
-35
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ jobs:
4949
- run: sudo apt update && sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev
5050
- run: cargo install cargo-all-features
5151
- name: Clippy for bevy_rapier2d
52-
run: cargo clippy --verbose -p bevy_rapier2d
52+
run: cargo clippy --verbose -p bevy_rapier2d --examples
5353
- name: Clippy for bevy_rapier3d
54-
run: cargo clippy --verbose -p bevy_rapier3d
54+
run: cargo clippy --verbose -p bevy_rapier3d --examples
5555
- name: Clippy for bevy_rapier2d (debug-render, simd, serde)
5656
run: cargo clippy --verbose -p bevy_rapier2d --features debug-render-2d,simd-stable,serde-serialize,picking-backend
5757
- name: Clippy for bevy_rapier3d (debug-render, simd, serde)

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
- Added optional feature `picking-backend` to support bevy_picking.
88
- See `picking_backend` module documentation for more details.
9+
- Added `geometry::to_bevy_mesh` module behind the feature `to-bevy-mesh` to help with converting parry shapes into bevy meshes.
910

1011
### Modified
1112

bevy_rapier2d/Cargo.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ rust.unexpected_cfgs = { level = "warn", check-cfg = [
2424
clippy = { needless_lifetimes = "allow" }
2525

2626
[features]
27-
default = ["dim2", "async-collider", "debug-render-2d", "picking-backend"]
27+
default = [
28+
"dim2",
29+
"async-collider",
30+
"debug-render-2d",
31+
"picking-backend",
32+
"to-bevy-mesh",
33+
]
2834
dim2 = []
2935
debug-render-2d = [
3036
"bevy/bevy_core_pipeline",
@@ -55,6 +61,7 @@ async-collider = [
5561
"bevy/bevy_render",
5662
"bevy/bevy_image",
5763
]
64+
to-bevy-mesh = ["bevy/bevy_render", "bevy/bevy_asset"]
5865

5966
[dependencies]
6067
bevy = { version = "0.15", default-features = false }

bevy_rapier2d/examples/boxes2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn main() {
1818
}
1919

2020
pub fn setup_graphics(mut commands: Commands) {
21-
commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
21+
commands.spawn((Camera2d, Transform::from_xyz(0.0, 20.0, 0.0)));
2222
}
2323

2424
pub fn setup_physics(mut commands: Commands) {

bevy_rapier2d/examples/contact_filter2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn main() {
4545
}
4646

4747
fn setup_graphics(mut commands: Commands) {
48-
commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
48+
commands.spawn((Camera2d, Transform::from_xyz(0.0, 20.0, 0.0)));
4949
}
5050

5151
pub fn setup_physics(mut commands: Commands) {

bevy_rapier2d/examples/custom_system_setup2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn despawn_one_box(
6161
}
6262

6363
fn setup_graphics(mut commands: Commands) {
64-
commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
64+
commands.spawn((Camera2d, Transform::from_xyz(0.0, 20.0, 0.0)));
6565
}
6666

6767
pub fn setup_physics(mut commands: Commands) {

bevy_rapier2d/examples/debug_despawn2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub fn setup_game(mut commands: Commands, mut game: ResMut<Game>) {
9292
byte_rgb(255, 0, 0),
9393
];
9494

95-
commands.spawn(Camera2d::default());
95+
commands.spawn(Camera2d);
9696

9797
setup_board(&mut commands, &game);
9898

bevy_rapier2d/examples/debugdump2.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ fn main() {
1414
RapierDebugRenderPlugin::default(),
1515
));
1616

17-
let mut debugdump_settings = schedule_graph::Settings::default();
18-
// Filter out some less relevant systems.
19-
debugdump_settings.include_system =
20-
Some(Box::new(|system: &(dyn System<In = (), Out = ()>)| {
17+
let debugdump_settings = schedule_graph::Settings {
18+
include_system: Some(Box::new(|system: &(dyn System<In = (), Out = ()>)| {
2119
if system.name().starts_with("bevy_pbr")
2220
|| system.name().starts_with("bevy_render")
2321
|| system.name().starts_with("bevy_gizmos")
@@ -27,7 +25,9 @@ fn main() {
2725
return false;
2826
}
2927
true
30-
}));
28+
})),
29+
..Default::default()
30+
};
3131
let dot = schedule_graph_dot(&mut app, PostUpdate, &debugdump_settings);
3232
println!("{dot}");
3333
}

bevy_rapier2d/examples/despawn2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub fn setup_graphics(
4343
resize.timer = Timer::from_seconds(6.0, TimerMode::Once);
4444
despawn.timer = Timer::from_seconds(5.0, TimerMode::Once);
4545

46-
commands.spawn((Camera2d::default(), Transform::from_xyz(0.0, 20.0, 0.0)));
46+
commands.spawn((Camera2d, Transform::from_xyz(0.0, 20.0, 0.0)));
4747
}
4848

4949
pub fn setup_physics(mut commands: Commands) {

bevy_rapier2d/examples/events2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn main() {
1919
}
2020

2121
pub fn setup_graphics(mut commands: Commands) {
22-
commands.spawn(Camera2d::default());
22+
commands.spawn(Camera2d);
2323
}
2424

2525
pub fn display_events(

0 commit comments

Comments
 (0)