Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to rapier 0.21 #547

Merged
merged 3 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_CACHE_KEY: rust-cache-20240617
RUST_CACHE_KEY: rust-cache-20240701

jobs:
check-fmt:
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## Unreleased

**This is an update from rapier 0.19 to Rapier 0.21 which includes several stability improvements
and new features. Please have a look at the
[0.20 and 0.21 changelogs](https://github.com/dimforge/rapier/blob/master/CHANGELOG.md) of Rapier.**

- Update to rapier `0.21`.
- Update to nalgebra `0.33`.

## v0.27.0-rc.1 (18 June 2024)

Comment on lines +3 to 13
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be merged into 1 as we havn't made a final release.

Mentionning both release candidates and final releases in changelog will only lead to misunderstandings

**This is an update to Rapier 0.20 which includes several stability improvements
Expand Down
4 changes: 2 additions & 2 deletions bevy_rapier2d/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ async-collider = ["bevy/bevy_asset", "bevy/bevy_scene"]

[dependencies]
bevy = { version = "0.14.0-rc.3", default-features = false }
nalgebra = { version = "0.32.6", features = ["convert-glam027"] }
rapier2d = "0.20"
nalgebra = { version = "0.33", features = ["convert-glam027"] }
rapier2d = "0.21"
bitflags = "2.4"
log = "0.4"
serde = { version = "1", features = ["derive"], optional = true }
Expand Down
4 changes: 2 additions & 2 deletions bevy_rapier3d/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ async-collider = ["bevy/bevy_asset", "bevy/bevy_scene"]

[dependencies]
bevy = { version = "0.14.0-rc.3", default-features = false }
nalgebra = { version = "0.32.6", features = ["convert-glam027"] }
rapier3d = "0.20"
nalgebra = { version = "0.33", features = ["convert-glam027"] }
rapier3d = "0.21"
bitflags = "2.4"
log = "0.4"
serde = { version = "1", features = ["derive"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ impl RapierContext {
query_pipeline,
(&scaled_shape).into(),
shape_mass,
collisions.iter().copied(),
collisions.iter(),
Copy link
Contributor Author

@Vrixyz Vrixyz Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an alternative is to pass &*collisions, to "reborrow" it immutably. I'm not sure if that needs a migration guide (it has to be compared with bevy_rapier 0.26, not master)

filter,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/systems/character_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pub fn update_character_controls(
&context.query_pipeline,
character_shape,
character_mass,
collisions.iter().copied(),
collisions.iter(),
filter,
)
}
Expand Down