Merge pull request #1455 from hannobraun/line

Return line coordinates from `Line::from_points`

crates/fj-kernel/src/algorithms/sweep/vertex.rs

@@ -1,4 +1,4 @@
-use fj_math::{Line, Point, Scalar, Vector};
+use fj_math::{Point, Scalar, Vector};
 
 use crate::{
     geometry::path::SurfacePath,
@@ -87,14 +87,10 @@ impl Sweep for (Handle<Vertex>, Handle<Surface>) {
         // Armed with those coordinates, creating the `Curve` of the output
         // `Edge` is straight-forward.
         let curve = {
-            let line = Line::from_points(points_surface);
+            let path = SurfacePath::line_from_points(points_surface);
 
-            Curve::new(
-                surface.clone(),
-                SurfacePath::Line(line),
-                edge_global.curve().clone(),
-            )
-            .insert(objects)
+            Curve::new(surface.clone(), path, edge_global.curve().clone())
+                .insert(objects)
         };
 
         let vertices_surface = {

crates/fj-kernel/src/builder/surface.rs

@@ -1,4 +1,4 @@
-use fj_math::{Line, Point, Vector};
+use fj_math::{Point, Vector};
 
 use crate::{
     geometry::{path::GlobalPath, surface::SurfaceGeometry},
@@ -26,7 +26,7 @@ impl SurfaceBuilder for PartialSurface {
     fn plane_from_points(points: [impl Into<Point<3>>; 3]) -> Self {
         let [a, b, c] = points.map(Into::into);
 
-        let u = GlobalPath::Line(Line::from_points([a, b]));
+        let u = GlobalPath::line_from_points([a, b]);
         let v = c - a;
 
         Self {

crates/fj-kernel/src/geometry/path.rs

@@ -44,10 +44,11 @@ impl SurfacePath {
 
     /// Construct a line from two points
     pub fn line_from_points(points: [impl Into<Point<2>>; 2]) -> Self {
-        Self::Line(Line::from_points(points))
+        let (line, _) = Line::from_points(points);
+        Self::Line(line)
     }
 
-    /// Convert a point on the path into global coordinates
+    /// Convert a point on the path into surface coordinates
     pub fn point_from_path_coords(
         &self,
         point: impl Into<Point<1>>,
@@ -103,7 +104,8 @@ impl GlobalPath {
 
     /// Construct a line from two points
     pub fn line_from_points(points: [impl Into<Point<3>>; 2]) -> Self {
-        Self::Line(Line::from_points(points))
+        let (line, _) = Line::from_points(points);
+        Self::Line(line)
     }
 
     /// Access the origin of the path's coordinate system

crates/fj-math/src/line.rs

@@ -31,13 +31,21 @@ impl<const D: usize> Line<D> {
 
     /// Create a line from two points
     ///
+    /// Also returns the lines coordinates of the provided points on the new
+    /// line.
+    ///
     /// # Panics
     ///
     /// Panics, if the points are coincident.
-    pub fn from_points(points: [impl Into<Point<D>>; 2]) -> Self {
+    pub fn from_points(
+        points: [impl Into<Point<D>>; 2],
+    ) -> (Self, [Point<1>; 2]) {
         let [a, b] = points.map(Into::into);
 
-        Self::from_origin_and_direction(a, b - a)
+        let line = Self::from_origin_and_direction(a, b - a);
+        let coords = [[0.], [1.]].map(Point::from);
+
+        (line, coords)
     }
 
     /// Create a line from two points that include line coordinates
@@ -175,11 +183,11 @@ mod tests {
 
     #[test]
     fn is_coincident_with() {
-        let line = Line::from_points([[0., 0.], [1., 0.]]);
+        let (line, _) = Line::from_points([[0., 0.], [1., 0.]]);
 
-        let a = Line::from_points([[0., 0.], [1., 0.]]);
-        let b = Line::from_points([[0., 0.], [-1., 0.]]);
-        let c = Line::from_points([[0., 1.], [1., 1.]]);
+        let (a, _) = Line::from_points([[0., 0.], [1., 0.]]);
+        let (b, _) = Line::from_points([[0., 0.], [-1., 0.]]);
+        let (c, _) = Line::from_points([[0., 1.], [1., 1.]]);
 
         assert!(line.is_coincident_with(&a));
         assert!(line.is_coincident_with(&b));