Skip to content

Commit 07e55ca

Browse files
committed
Merge remote-tracking branch 'Vrixyz/rapier-0.22' into custom-shape
2 parents a7cf839 + cbe3dd9 commit 07e55ca

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## Unreleased
44

5+
### Modified
6+
7+
- Update from rapier `0.21` to rapier `0.22`,
8+
see [rapier's changelog](https://github.com/dimforge/rapier/blob/master/CHANGELOG.md).
9+
510
### Added
611

712
- Added a `TriMeshFlags` parameter for `ComputedColliderShape`,

bevy_rapier_benches3d/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ edition = "2021"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
rapier3d = { features = ["profiler"], version = "0.21" }
13-
bevy_rapier3d = { version = "0.27.0-rc.1", path = "../bevy_rapier3d" }
14-
bevy = { version = "0.14.0-rc.3", default-features = false }
12+
rapier3d = { features = ["profiler"], version = "0.22" }
13+
bevy_rapier3d = { version = "0.27", path = "../bevy_rapier3d" }
14+
bevy = { version = "0.14", default-features = false }

src/geometry/shape_views/triangle.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ macro_rules! impl_ref_methods(
3737
///
3838
/// The normal points such that it is collinear to `AB × AC` (where `×` denotes the cross
3939
/// product).
40+
#[cfg(feature = "dim3")]
4041
#[inline]
4142
pub fn normal(&self) -> Option<Vect> {
4243
self.raw.normal().map(|n| (*n).into())
@@ -46,6 +47,7 @@ macro_rules! impl_ref_methods(
4647
///
4748
/// The vector points such that it is collinear to `AB × AC` (where `×` denotes the cross
4849
/// product).
50+
#[cfg(feature = "dim3")]
4951
#[inline]
5052
pub fn scaled_normal(&self) -> Vect {
5153
self.raw.scaled_normal().into()

0 commit comments

Comments
 (0)