add support for images, and some chores

- SVG files not yet supported
- Remove dead commented code
- Add inherent constraints for text, path, and images
- Formatting

1 files changed, 25 insertions, 4 deletions

diff --git a/core/src/rendering.rs b/core/src/rendering.rs
index 73daa2a..9c719c4 100644
--- a/core/src/rendering.rs
+++ b/core/src/rendering.rs
@@ -1,7 +1,11 @@
-use super::core_shapes::*;
-use super::styles::{DefinedDashStyle, DefinedStrokeStyle, FillStyle, Pattern};
-use super::text::{DefinedFontDescription, FontDescription};
-use super::types::DefinedCoreShapeContext;
+use std::path::Path;
+
+use crate::{
+    core_shapes::*,
+    styles::{DefinedDashStyle, DefinedStrokeStyle, FillStyle, Pattern},
+    text::{DefinedFontDescription, DefinedText, FontDescription},
+    types::DefinedCoreShapeContext,
+};
 
 pub trait Renderer {
     // Must be called once before any drawing happens
@@ -19,6 +23,9 @@ pub trait Renderer {
     // For a font of size 1.
     fn text_extents(&self, text: &str, font: &FontDescription) -> (f64, f64);
     fn show_text(&mut self, text: &str, font: &DefinedFontDescription);
+
+    fn show_image(&mut self, path: &Path, x: f64, y: f64, width: f64, height: f64);
+    fn geometry_for_image(&mut self, path: &Path) -> (f64, f64);
 }
 
 pub trait Render {
@@ -31,6 +38,7 @@ impl Render for DefinedCoreShape {
             Self::Rectangle(r) => r.render(context, renderer),
             Self::Text(t) => t.render(context, renderer),
             Self::StraightPath(p) => p.render(context, renderer),
+            Self::Image(i) => i.render(context, renderer),
         }
     }
 }
@@ -96,3 +104,16 @@ impl Render for DefinedStraightPath {
         draw(&context.fill, &context.stroke, renderer);
     }
 }
+
+impl Render for Image {
+    fn render(&self, context: DefinedCoreShapeContext, renderer: &mut dyn Renderer) {
+        // TODO: what about pattern, and fill color? Do we do something with that?
+        renderer.show_image(
+            &self.path,
+            context.bounds.left,
+            context.bounds.top,
+            context.bounds.width,
+            context.bounds.height,
+        );
+    }
+}