Merge pull request #1293 from hannobraun/update

Update dependencies
hannobraun · Oct 31, 2022 · 2f608f6 · 2f608f6
2 parents 69ff6de + 0f8ef5f
commit 2f608f6
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fj-host/Cargo.toml b/crates/fj-host/Cargo.toml
@@ -15,7 +15,6 @@ categories.workspace = true
 cargo_metadata = "0.15.0"
 crossbeam-channel = "0.5.6"
 fj.workspace = true
-fj-interop.workspace = true
 libloading = "0.7.2"
 notify = "5.0.0"
 thiserror = "1.0.35"
diff --git a/crates/fj-kernel/Cargo.toml b/crates/fj-kernel/Cargo.toml
@@ -14,7 +14,6 @@ categories.workspace = true
 fj-interop.workspace = true
 fj-math.workspace = true
 parking_lot = "0.12.0"
-parry2d-f64 = "0.10.0"
 pretty_assertions = "1.3.0"
 robust-predicates = "0.1.4"
 spade = "2.0.0"

diff --git a/crates/fj-math/Cargo.toml b/crates/fj-math/Cargo.toml
@@ -15,6 +15,6 @@ approx = "0.5.1"
 decorum = "0.3.1"
 nalgebra = "0.31.3"
 num-traits = "0.2.15"
-parry2d-f64 = "0.10.0"
-parry3d-f64 = "0.10.0"
+parry2d-f64 = "0.11.1"
+parry3d-f64 = "0.11.1"
 robust-predicates = "0.1.4"
diff --git a/crates/fj-math/src/aabb.rs b/crates/fj-math/src/aabb.rs
@@ -57,11 +57,11 @@ impl Aabb<2> {
             .into_iter()
             .map(|point| point.into().to_na())
             .collect();
-        parry2d_f64::bounding_volume::AABB::from_points(&points).into()
+        parry2d_f64::bounding_volume::Aabb::from_points(&points).into()
     }
 
     /// Construct a 2-dimensional AABB from a Parry AABB
-    pub fn from_parry(aabb: parry2d_f64::bounding_volume::AABB) -> Self {
+    pub fn from_parry(aabb: parry2d_f64::bounding_volume::Aabb) -> Self {
         Self {
             min: aabb.mins.into(),
             max: aabb.maxs.into(),
@@ -80,20 +80,20 @@ impl Aabb<3> {
             .into_iter()
             .map(|point| point.into().to_na())
             .collect();
-        parry3d_f64::bounding_volume::AABB::from_points(&points).into()
+        parry3d_f64::bounding_volume::Aabb::from_points(&points).into()
     }
 
     /// Construct a 3-dimensional AABB from a Parry AABB
-    pub fn from_parry(aabb: parry3d_f64::bounding_volume::AABB) -> Self {
+    pub fn from_parry(aabb: parry3d_f64::bounding_volume::Aabb) -> Self {
         Self {
             min: aabb.mins.into(),
             max: aabb.maxs.into(),
         }
     }
 
     /// Convert the AABB to a Parry AABB
-    pub fn to_parry(self) -> parry3d_f64::bounding_volume::AABB {
-        parry3d_f64::bounding_volume::AABB {
+    pub fn to_parry(self) -> parry3d_f64::bounding_volume::Aabb {
+        parry3d_f64::bounding_volume::Aabb {
             mins: self.min.to_na(),
             maxs: self.max.to_na(),
         }
@@ -128,14 +128,14 @@ impl Aabb<3> {
     }
 }
 
-impl From<parry2d_f64::bounding_volume::AABB> for Aabb<2> {
-    fn from(aabb: parry2d_f64::bounding_volume::AABB) -> Self {
+impl From<parry2d_f64::bounding_volume::Aabb> for Aabb<2> {
+    fn from(aabb: parry2d_f64::bounding_volume::Aabb) -> Self {
         Self::from_parry(aabb)
     }
 }
 
-impl From<parry3d_f64::bounding_volume::AABB> for Aabb<3> {
-    fn from(aabb: parry3d_f64::bounding_volume::AABB) -> Self {
+impl From<parry3d_f64::bounding_volume::Aabb> for Aabb<3> {
+    fn from(aabb: parry3d_f64::bounding_volume::Aabb) -> Self {
         Self::from_parry(aabb)
     }
 }