Merge pull request #504 from hannobraun/math

Make some small improvements to the `fj_math` API
hannobraun · Apr 26, 2022 · c847da2 · c847da2
2 parents 1233f21 + 3c74a74
commit c847da2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/crates/fj-math/src/aabb.rs b/crates/fj-math/src/aabb.rs
@@ -73,6 +73,14 @@ impl Aabb<3> {
         self.to_parry().extents().into()
     }
 
+    /// Compute an AABB that includes an additional point
+    pub fn include_point(self, point: &Point<3>) -> Self {
+        let mut aabb = self.to_parry();
+        aabb.take_point(point.to_na());
+
+        Self::from_parry(aabb)
+    }
+
     /// Merge this AABB with another
     pub fn merged(&self, other: &Self) -> Self {
         self.to_parry().merged(&other.to_parry()).into()

diff --git a/crates/fj-math/src/point.rs b/crates/fj-math/src/point.rs
@@ -148,11 +148,14 @@ impl<const D: usize> ops::Neg for Point<D> {
     }
 }
 
-impl<const D: usize> ops::Add<Vector<D>> for Point<D> {
+impl<V, const D: usize> ops::Add<V> for Point<D>
+where
+    V: Into<Vector<D>>,
+{
     type Output = Self;
 
-    fn add(self, rhs: Vector<D>) -> Self::Output {
-        self.to_na().add(rhs.to_na()).into()
+    fn add(self, rhs: V) -> Self::Output {
+        self.to_na().add(rhs.into().to_na()).into()
     }
 }
 

diff --git a/crates/fj-math/src/vector.rs b/crates/fj-math/src/vector.rs
@@ -244,11 +244,14 @@ impl<const D: usize> ops::Neg for Vector<D> {
     }
 }
 
-impl<const D: usize> ops::Add<Self> for Vector<D> {
+impl<V, const D: usize> ops::Add<V> for Vector<D>
+where
+    V: Into<Self>,
+{
     type Output = Self;
 
-    fn add(self, rhs: Self) -> Self::Output {
-        self.to_na().add(rhs.to_na()).into()
+    fn add(self, rhs: V) -> Self::Output {
+        self.to_na().add(rhs.into().to_na()).into()
     }
 }