Merge pull request #98 from hannobraun/topology

Refactor construction of line segments

src/kernel/shapes/sketch.rs

@@ -1,9 +1,10 @@
+use nalgebra::point;
 use parry3d_f64::bounding_volume::AABB;
 
 use crate::{
     debug::DebugInfo,
     kernel::{
-        geometry::Surface,
+        geometry::{Curve, Line, Surface},
         topology::{
             edges::{Edge, Edges},
             faces::{Face, Faces},
@@ -45,10 +46,16 @@ impl Shape for fj::Sketch {
             // Can't panic, we passed `2` to `windows`.
             //
             // Can be cleaned up, once `array_windows` is stable.
-            let a = window[0];
-            let b = window[1];
+            let start = window[0];
+            let end = window[1];
 
-            edges.push(Edge::line_segment(a, b));
+            let line = Curve::Line(Line {
+                origin: start,
+                dir: end - start,
+            });
+            let edge = Edge::new(line, point![0.], point![1.]);
+
+            edges.push(edge);
         }
 
         Edges::single_cycle(edges)

src/kernel/topology/edges.rs

@@ -1,9 +1,9 @@
-use nalgebra::{point, vector};
+use nalgebra::vector;
 use parry2d_f64::shape::Segment as Segment2;
 use parry3d_f64::{math::Isometry, shape::Segment as Segment3};
 
 use crate::{
-    kernel::geometry::{Circle, Curve, Line, Surface},
+    kernel::geometry::{Circle, Curve, Surface},
     math::Point,
 };
 
@@ -209,6 +209,15 @@ pub struct Edge {
 }
 
 impl Edge {
+    /// Construct an edge
+    pub fn new(curve: Curve, start: Point<1>, end: Point<1>) -> Self {
+        Self {
+            curve,
+            vertices: Some([start, end]),
+            reverse: false,
+        }
+    }
+
     /// Create an arc
     ///
     /// So far, the name of this method is a bit ambitious, as only full circles
@@ -224,18 +233,6 @@ impl Edge {
         }
     }
 
-    /// Create a line segment
-    pub fn line_segment(start: Point<3>, end: Point<3>) -> Self {
-        Self {
-            curve: Curve::Line(Line {
-                origin: start,
-                dir: end - start,
-            }),
-            vertices: Some([point![0.], point![1.]]),
-            reverse: false,
-        }
-    }
-
     /// Reverse the edge
     pub fn reverse(&mut self) {
         self.reverse = !self.reverse;