core: re-add StraightPath core shape

1 files changed, 24 insertions, 18 deletions

diff --git a/core/src/core_shapes.rs b/core/src/core_shapes.rs
index d8017ab..e6d79c9 100644
--- a/core/src/core_shapes.rs
+++ b/core/src/core_shapes.rs
@@ -1,3 +1,7 @@
+use crate::types::{CoreShapeContext, DefinedCoreShapeContext, DefinedPoint2D, Point2D};
+
+pub use super::text::{DefinedText, Text};
+
 pub struct CoreDrawable {
     pub(crate) shape: CoreShape,
     pub(crate) context: CoreShapeContext,
@@ -12,7 +16,7 @@ impl CoreDrawable {
 pub enum CoreShape {
     Rectangle(Rectangle),
     Text(Text),
-    // StraightPath(StraightPath),
+    StraightPath(StraightPath),
 }
 
 impl From<Rectangle> for CoreShape {
@@ -27,6 +31,12 @@ impl From<Text> for CoreShape {
     }
 }
 
+impl From<StraightPath> for CoreShape {
+    fn from(path: StraightPath) -> Self {
+        CoreShape::StraightPath(path)
+    }
+}
+
 pub struct DefinedCoreDrawable {
     pub(crate) shape: DefinedCoreShape,
     pub(crate) context: DefinedCoreShapeContext,
@@ -35,7 +45,7 @@ pub struct DefinedCoreDrawable {
 pub enum DefinedCoreShape {
     Rectangle(Rectangle),
     Text(DefinedText),
-    // StraightPath(StraightPath),
+    StraightPath(DefinedStraightPath),
 }
 
 /*
@@ -61,7 +71,6 @@ impl<T: CoreShape + Clone + 'static> ComplexShape for T {
 }
 */
 
-// TODO: add default
 #[derive(Copy, Clone, Debug, Default)]
 pub struct Rectangle {}
 
@@ -73,10 +82,7 @@ impl CoreShape for Rectangle {
 }
 */
 
-use crate::types::{CoreShapeContext, DefinedCoreShapeContext};
-
-pub use super::text::{DefinedText, Text};
-
+// TODO: re-enable this in some way
 /*
 impl CoreShape for Text {
     fn constrain(
@@ -106,22 +112,22 @@ impl CoreShape for Text {
 }
 */
 
-// #[derive(Clone, Debug, Default)]
-// pub struct StraightPath {
-//     pub(crate) points: Vec<Point2D>,
-// }
-//
-// impl StraightPath {
-//     pub fn new(points: Vec<Point2D>) -> Self {
-//         Self { points }
-//     }
-// }
+#[derive(Clone, Debug, Default)]
+pub struct StraightPath {
+    pub(crate) points: Vec<Point2D>,
+}
+
+impl StraightPath {
+    pub fn new(points: Vec<Point2D>) -> Self {
+        Self { points }
+    }
+}
 
-/*
 pub struct DefinedStraightPath {
     pub(crate) points: Vec<DefinedPoint2D>,
 }
 
+/*
 impl CoreShape for StraightPath {
     fn to_render(&self, model: &dyn SolverModel) -> Option<Box<dyn Render>> {
         self.fixate(model)