1 files changed, 31 insertions, 22 deletions

diff --git a/core/src/rendering.rs b/core/src/rendering.rs
index f7a0189..9c9f9e4 100644
--- a/core/src/rendering.rs
+++ b/core/src/rendering.rs
@@ -1,7 +1,7 @@
 use super::core_shapes::*;
 use super::styles::{DefinedDashStyle, DefinedStrokeStyle, FillStyle, Pattern};
 use super::text::{DefinedFontDescription, FontDescription};
-use super::types::DefinedShapeContext;
+use super::types::DefinedCoreShapeContext;
 
 pub trait Renderer {
     fn move_to(&mut self, x: f64, y: f64);
@@ -20,7 +20,16 @@ pub trait Renderer {
 }
 
 pub trait Render {
-    fn render(&self, context: DefinedShapeContext, renderer: &mut dyn Renderer);
+    fn render(&self, context: DefinedCoreShapeContext, renderer: &mut dyn Renderer);
+}
+
+impl Render for DefinedCoreShape {
+    fn render(&self, context: DefinedCoreShapeContext, renderer: &mut dyn Renderer) {
+        match self {
+            Self::Rectangle(r) => r.render(context, renderer),
+            Self::Text(t) => t.render(context, renderer),
+        }
+    }
 }
 
 fn draw(fill: &FillStyle, stroke: &DefinedStrokeStyle, renderer: &mut dyn Renderer) {
@@ -47,7 +56,7 @@ fn draw(fill: &FillStyle, stroke: &DefinedStrokeStyle, renderer: &mut dyn Render
 }
 
 impl Render for Rectangle {
-    fn render(&self, context: DefinedShapeContext, renderer: &mut dyn Renderer) {
+    fn render(&self, context: DefinedCoreShapeContext, renderer: &mut dyn Renderer) {
         let bounds = &context.bounds;
         renderer.rectangle(bounds.left, bounds.top, bounds.width, bounds.height);
         draw(&context.fill, &context.stroke, renderer);
@@ -55,7 +64,7 @@ impl Render for Rectangle {
 }
 
 impl Render for DefinedText {
-    fn render(&self, context: DefinedShapeContext, renderer: &mut dyn Renderer) {
+    fn render(&self, context: DefinedCoreShapeContext, renderer: &mut dyn Renderer) {
         // TODO: select font, style, text shaping (renderer specific), etc.
         let bounds = &context.bounds;
         //renderer.move_to(bounds.left, bounds.top + self.font.size);
@@ -66,21 +75,21 @@ impl Render for DefinedText {
     }
 }
 
-impl Render for DefinedStraightPath {
-    fn render(&self, context: DefinedShapeContext, renderer: &mut dyn Renderer) {
-        let mut iter = self.points.iter();
-
-        let first_point = match iter.next() {
-            Some(point) => point,
-            None => return,
-        };
-
-        renderer.move_to(first_point.x, first_point.y);
-
-        for point in iter {
-            renderer.line_to(point.x, point.y);
-        }
-
-        draw(&context.fill, &context.stroke, renderer);
-    }
-}
+// impl Render for DefinedStraightPath {
+//     fn render(&self, context: DefinedShapeContext, renderer: &mut dyn Renderer) {
+//         let mut iter = self.points.iter();
+//
+//         let first_point = match iter.next() {
+//             Some(point) => point,
+//             None => return,
+//         };
+//
+//         renderer.move_to(first_point.x, first_point.y);
+//
+//         for point in iter {
+//             renderer.line_to(point.x, point.y);
+//         }
+//
+//         draw(&context.fill, &context.stroke, renderer);
+//     }
+// }