Re-use fj_math::Triangle in fj_interop::mesh

crates/fj-export/src/lib.rs

@@ -70,7 +70,7 @@ fn export_3mf(mesh: &Mesh<Point<3>>, path: &Path) -> Result<(), Error> {
 fn export_stl(mesh: &Mesh<Point<3>>, path: &Path) -> Result<(), Error> {
     let points = mesh
         .triangles()
-        .map(|triangle| triangle.points)
+        .map(|triangle| triangle.inner.points())
         .collect::<Vec<_>>();
 
     let vertices = points.iter().map(|points| {
@@ -119,8 +119,8 @@ pub enum Error {
     #[error("no extension specified")]
     NoExtension,
 
-    /// Unrecognised extension found
-    #[error("unrecognised extension found `{0:?}`")]
+    /// Unrecognized extension found
+    #[error("unrecognized extension found `{0:?}`")]
     InvalidExtension(String),
 
     /// I/O error whilst exporting to file

crates/fj-interop/src/mesh.rs

@@ -38,11 +38,14 @@ where
     ///
     /// Returns true, if a triangle with any combination of the provided points
     /// is part of the mesh.
-    pub fn contains_triangle(&self, points: [impl Into<Point<3>>; 3]) -> bool {
-        let triangle = fj_math::Triangle::from_points(points).normalize();
+    pub fn contains_triangle(
+        &self,
+        triangle: impl Into<fj_math::Triangle<3>>,
+    ) -> bool {
+        let triangle = triangle.into().normalize();
 
         for t in &self.triangles {
-            let t = fj_math::Triangle::from_points(t.points).normalize();
+            let t = t.inner.normalize();
             if triangle == t {
                 return true;
             }
@@ -69,12 +72,21 @@ where
 
 impl Mesh<Point<3>> {
     /// Add a triangle to the mesh
-    pub fn push_triangle(&mut self, points: [Point<3>; 3], color: Color) {
-        for point in points {
+    pub fn push_triangle(
+        &mut self,
+        triangle: impl Into<fj_math::Triangle<3>>,
+        color: Color,
+    ) {
+        let triangle = triangle.into();
+
+        for point in triangle.points() {
             self.push_vertex(point);
         }
 
-        self.triangles.push(Triangle { points, color });
+        self.triangles.push(Triangle {
+            inner: triangle,
+            color,
+        });
     }
 }
 
@@ -100,7 +112,7 @@ pub type Index = u32;
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd)]
 pub struct Triangle {
     /// The points of the triangle
-    pub points: [Point<3>; 3],
+    pub inner: fj_math::Triangle<3>,
 
     /// The color of the triangle
     pub color: Color,

crates/fj-kernel/src/algorithms/triangulate/mod.rs

@@ -22,7 +22,7 @@ pub fn triangulate(
     for face in faces {
         if let Some(triangles) = face.triangles() {
             for &(triangle, color) in triangles {
-                mesh.push_triangle(triangle.points(), color);
+                mesh.push_triangle(triangle, color);
             }
             continue;
         }

crates/fj-viewer/src/camera.rs

@@ -2,7 +2,7 @@
 use std::f64::consts::FRAC_PI_2;
 
 use fj_interop::processed_shape::ProcessedShape;
-use fj_math::{Aabb, Point, Scalar, Transform, Triangle, Vector};
+use fj_math::{Aabb, Point, Scalar, Transform, Vector};
 
 use crate::screen::NormalizedPosition;
 
@@ -140,12 +140,10 @@ impl Camera {
         let mut min_t = None;
 
         for triangle in shape.mesh.triangles() {
-            let t = Triangle::from_points(triangle.points).cast_local_ray(
-                origin,
-                dir,
-                f64::INFINITY,
-                true,
-            );
+            let t =
+                triangle
+                    .inner
+                    .cast_local_ray(origin, dir, f64::INFINITY, true);
 
             if let Some(t) = t {
                 if t <= min_t.unwrap_or(t) {

crates/fj-viewer/src/graphics/vertices.rs

@@ -77,7 +77,7 @@ impl From<&Mesh<fj_math::Point<3>>> for Vertices {
         let mut m = Mesh::new();
 
         for triangle in mesh.triangles() {
-            let [a, b, c] = triangle.points;
+            let [a, b, c] = triangle.inner.points();
 
             let normal = (b - a).cross(&(c - a)).normalize();
             let color = triangle.color;