Improve Ellipse Tool (#98)

core/document/src/layers/ellipse.rs

@@ -0,0 +1,37 @@
+use super::style;
+use super::LayerData;
+
+use std::fmt::Write;
+
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
+pub struct Ellipse {
+	shape: kurbo::Ellipse,
+	style: style::PathStyle,
+}
+
+impl Ellipse {
+	pub fn new(center: impl Into<kurbo::Point>, radii: impl Into<kurbo::Vec2>, rotation: f64, style: style::PathStyle) -> Ellipse {
+		Ellipse {
+			shape: kurbo::Ellipse::new(center, radii, rotation),
+			style,
+		}
+	}
+}
+
+impl LayerData for Ellipse {
+	fn render(&mut self, svg: &mut String) {
+		let kurbo::Vec2 { x: rx, y: ry } = self.shape.radii();
+		let kurbo::Point { x: cx, y: cy } = self.shape.center();
+
+		let _ = write!(
+			svg,
+			r#"<ellipse cx="0" cy="0" rx="{}" ry="{}" transform="translate({} {}) rotate({})" {} />"#,
+			rx,
+			ry,
+			cx,
+			cy,
+			self.shape.rotation().to_degrees(),
+			self.style.render(),
+		);
+	}
+}

core/document/src/layers/mod.rs

@@ -3,6 +3,9 @@ pub mod style;
 pub mod circle;
 pub use circle::Circle;
 
+pub mod ellipse;
+pub use ellipse::Ellipse;
+
 pub mod line;
 pub use line::Line;
 
@@ -26,6 +29,7 @@ pub trait LayerData {
 pub enum LayerDataTypes {
 	Folder(Folder),
 	Circle(Circle),
+	Ellipse(Ellipse),
 	Rect(Rect),
 	Line(Line),
 	PolyLine(PolyLine),
@@ -37,6 +41,7 @@ impl LayerDataTypes {
 		match self {
 			Self::Folder(f) => f.render(svg),
 			Self::Circle(c) => c.render(svg),
+			Self::Ellipse(e) => e.render(svg),
 			Self::Rect(r) => r.render(svg),
 			Self::Line(l) => l.render(svg),
 			Self::PolyLine(pl) => pl.render(svg),