1 files changed, 59 insertions, 14 deletions

diff --git a/core/src/core_shapes.rs b/core/src/core_shapes.rs
index 805d82e..d8017ab 100644
--- a/core/src/core_shapes.rs
+++ b/core/src/core_shapes.rs
@@ -1,8 +1,44 @@
-use super::complex_shapes::{ComplexShape, DrawResult};
-use super::rendering::{Render, Renderer};
-use super::solving::{Constrainable, SolverContext, SolverModel};
-use super::types::*;
+pub struct CoreDrawable {
+    pub(crate) shape: CoreShape,
+    pub(crate) context: CoreShapeContext,
+}
+
+impl CoreDrawable {
+    pub fn new(shape: CoreShape, context: CoreShapeContext) -> Self {
+        Self { shape, context }
+    }
+}
+
+pub enum CoreShape {
+    Rectangle(Rectangle),
+    Text(Text),
+    // StraightPath(StraightPath),
+}
 
+impl From<Rectangle> for CoreShape {
+    fn from(rectangle: Rectangle) -> Self {
+        CoreShape::Rectangle(rectangle)
+    }
+}
+
+impl From<Text> for CoreShape {
+    fn from(text: Text) -> Self {
+        CoreShape::Text(text)
+    }
+}
+
+pub struct DefinedCoreDrawable {
+    pub(crate) shape: DefinedCoreShape,
+    pub(crate) context: DefinedCoreShapeContext,
+}
+
+pub enum DefinedCoreShape {
+    Rectangle(Rectangle),
+    Text(DefinedText),
+    // StraightPath(StraightPath),
+}
+
+/*
 pub trait CoreShape {
     fn constrain(
         &self,
@@ -23,19 +59,25 @@ impl<T: CoreShape + Clone + 'static> ComplexShape for T {
         panic!("Tried to decompose core shape")
     }
 }
+*/
 
 // TODO: add default
 #[derive(Copy, Clone, Debug, Default)]
 pub struct Rectangle {}
 
+/*
 impl CoreShape for Rectangle {
     fn to_render(&self, _model: &dyn SolverModel) -> Option<Box<dyn Render>> {
         Some(Box::new(*self))
     }
 }
+*/
+
+use crate::types::{CoreShapeContext, DefinedCoreShapeContext};
 
 pub use super::text::{DefinedText, Text};
 
+/*
 impl CoreShape for Text {
     fn constrain(
         &self,
@@ -62,18 +104,20 @@ impl CoreShape for Text {
             .map(|path| -> Box<dyn Render> { Box::new(path) })
     }
 }
+*/
 
-#[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>,
 }
@@ -84,3 +128,4 @@ impl CoreShape for StraightPath {
             .map(|path| -> Box<dyn Render> { Box::new(path) })
     }
 }
+*/