diff --git a/client/web/wasm/src/wrappers.rs b/client/web/wasm/src/wrappers.rs
index 83901665c..3fc4008a0 100644
--- a/client/web/wasm/src/wrappers.rs
+++ b/client/web/wasm/src/wrappers.rs
@@ -84,6 +84,7 @@ pub fn translate_key(name: &str) -> events::Key {
"m" => K::KeyM,
"x" => K::KeyX,
"z" => K::KeyZ,
+ "y" => K::KeyY,
"0" => K::Key0,
"1" => K::Key1,
"2" => K::Key2,
diff --git a/core/document/src/lib.rs b/core/document/src/lib.rs
index 7b60bed09..8f0bc2f2c 100644
--- a/core/document/src/lib.rs
+++ b/core/document/src/lib.rs
@@ -1,6 +1,7 @@
pub mod operation;
-pub use kurbo::{Circle, Line, Point, Rect};
+mod shape_points;
+pub use kurbo::{Circle, Line, Point, Rect, Vec2};
pub use operation::Operation;
#[derive(Debug, Clone, PartialEq)]
@@ -9,6 +10,7 @@ pub enum LayerType {
Circle(Circle),
Rect(Rect),
Line(Line),
+ Shape(shape_points::ShapePoints),
}
impl LayerType {
@@ -24,6 +26,9 @@ impl LayerType {
Self::Line(l) => {
format!(r#"
"#, l.p0.x, l.p0.y, l.p1.x, l.p1.y)
}
+ Self::Shape(s) => {
+ format!(r#"
"#, s)
+ }
}
}
}
@@ -220,6 +225,20 @@ impl Document {
update_frontend(self.render());
}
+ Operation::AddShape {
+ path,
+ insert_index,
+ x0,
+ y0,
+ x1,
+ y1,
+ sides,
+ } => {
+ let s = shape_points::ShapePoints::new(Point::new(x0, y0), Vec2 { x: x0 - x1, y: y0 - y1 }, sides);
+ self.add_layer(&path, Layer::new(LayerType::Shape(s)), insert_index)?;
+
+ update_frontend(self.render());
+ }
Operation::DeleteLayer { path } => {
self.delete(&path)?;
diff --git a/core/document/src/operation.rs b/core/document/src/operation.rs
index 3c35bb178..80bd25927 100644
--- a/core/document/src/operation.rs
+++ b/core/document/src/operation.rs
@@ -24,6 +24,15 @@ pub enum Operation {
x1: f64,
y1: f64,
},
+ AddShape {
+ path: Vec
,
+ insert_index: isize,
+ x0: f64,
+ y0: f64,
+ x1: f64,
+ y1: f64,
+ sides: u8,
+ },
DeleteLayer {
path: Vec,
},
diff --git a/core/document/src/shape_points.rs b/core/document/src/shape_points.rs
new file mode 100644
index 000000000..125c49a4d
--- /dev/null
+++ b/core/document/src/shape_points.rs
@@ -0,0 +1,126 @@
+use std::{fmt, ops::Add};
+
+use kurbo::{PathEl, Point, Vec2};
+use log::info;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct ShapePoints {
+ center: kurbo::Point,
+ extent: kurbo::Vec2,
+ sides: u8,
+}
+
+impl ShapePoints {
+ /// A new shape from center, a point and the number of points.
+ #[inline]
+ pub fn new(center: impl Into, extent: impl Into, sides: u8) -> ShapePoints {
+ ShapePoints {
+ center: center.into(),
+ extent: extent.into(),
+ sides: sides,
+ }
+ }
+
+ // Gets the angle in radians between the longest line from the center and the apothem.
+ #[inline]
+ pub fn apothem_offset_angle(&self) -> f64 {
+ std::f64::consts::PI / (self.sides as f64)
+ }
+
+ // Gets the apothem (the shortest distance from the center to the edge)
+ #[inline]
+ pub fn apothem(&self) -> f64 {
+ self.apothem_offset_angle().cos() * (self.sides as f64)
+ }
+
+ // Gets the length of one side
+ #[inline]
+ pub fn side_length(&self) -> f64 {
+ self.apothem_offset_angle().sin() * (self.sides as f64) * (2 as f64)
+ }
+}
+
+impl std::fmt::Display for ShapePoints {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ fn rotate(v: &Vec2, theta: f64) -> Vec2 {
+ let cosine = theta.cos();
+ let sine = theta.sin();
+ return Vec2::new(v.x * cosine - v.y * sine, v.x * sine + v.y * cosine);
+ }
+ info!("sides{}", self.sides);
+ for i in 0..self.sides {
+ let radians = self.apothem_offset_angle() * ((i * 2 + (self.sides % 2)) as f64);
+ let offset = rotate(&self.extent, radians);
+ let point = self.center + offset;
+ write!(f, "{},{} ", point.x, point.y)?;
+ }
+
+ Ok(())
+ }
+}
+
+#[doc(hidden)]
+pub struct ShapePathIter {
+ shape: ShapePoints,
+ ix: usize,
+}
+
+impl Iterator for ShapePathIter {
+ type Item = PathEl;
+
+ fn next(&mut self) -> Option {
+ fn rotate(v: &Vec2, theta: f64) -> Vec2 {
+ let cosine = theta.cos();
+ let sine = theta.sin();
+ return Vec2::new(v.x * cosine - v.y * sine, v.x * sine + v.y * cosine);
+ }
+ self.ix += 1;
+ match self.ix {
+ 1 => Some(PathEl::MoveTo(self.shape.center + self.shape.extent)),
+ _ => {
+ let radians = self.shape.apothem_offset_angle() * ((self.ix * 2 + (self.shape.sides % 2) as usize) as f64);
+ let offset = rotate(&self.shape.extent, radians);
+ let point = self.shape.center + offset;
+ Some(PathEl::LineTo(point))
+ }
+ }
+ }
+}
+
+impl Add for ShapePoints {
+ type Output = ShapePoints;
+
+ #[inline]
+ fn add(self, movement: Vec2) -> ShapePoints {
+ ShapePoints {
+ center: self.center + movement,
+ extent: self.extent,
+ sides: self.sides,
+ }
+ }
+}
+
+impl kurbo::Shape for ShapePoints {
+ type PathElementsIter = ShapePathIter;
+ #[inline]
+ fn perimeter(&self, _accuracy: f64) -> f64 {
+ self.side_length() * (self.sides as f64)
+ }
+
+ #[inline]
+ fn area(&self) -> f64 {
+ self.apothem() * self.perimeter(2.1)
+ }
+
+ fn path_elements(&self, _tolerance: f64) -> Self::PathElementsIter {
+ todo!()
+ }
+
+ fn winding(&self, _pt: Point) -> i32 {
+ todo!()
+ }
+
+ fn bounding_box(&self) -> kurbo::Rect {
+ todo!()
+ }
+}
diff --git a/core/editor/src/dispatcher/events.rs b/core/editor/src/dispatcher/events.rs
index 1f75781a2..4b4d3c5fb 100644
--- a/core/editor/src/dispatcher/events.rs
+++ b/core/editor/src/dispatcher/events.rs
@@ -115,6 +115,7 @@ pub enum Key {
KeyV,
KeyX,
KeyZ,
+ KeyY,
Key0,
Key1,
Key2,
diff --git a/core/editor/src/dispatcher/mod.rs b/core/editor/src/dispatcher/mod.rs
index ec089e542..a1e37892f 100644
--- a/core/editor/src/dispatcher/mod.rs
+++ b/core/editor/src/dispatcher/mod.rs
@@ -75,6 +75,12 @@ impl Dispatcher {
tool_name: ToolType::Rectangle.to_string(),
});
}
+ Key::KeyY => {
+ editor_state.tool_state.active_tool_type = ToolType::Shape;
+ self.dispatch_response(Response::SetActiveTool {
+ tool_name: ToolType::Shape.to_string(),
+ });
+ }
Key::KeyE => {
editor_state.tool_state.active_tool_type = ToolType::Ellipse;
self.dispatch_response(Response::SetActiveTool {
diff --git a/core/editor/src/tools/shape.rs b/core/editor/src/tools/shape.rs
index 7e4e6c75a..8f5a68fb2 100644
--- a/core/editor/src/tools/shape.rs
+++ b/core/editor/src/tools/shape.rs
@@ -1,13 +1,80 @@
use crate::events::{Event, Response};
-use crate::tools::Tool;
+use crate::events::{Key, MouseKeys, ViewportPosition};
+use crate::tools::{Fsm, Tool};
use crate::Document;
use document_core::Operation;
#[derive(Default)]
-pub struct Shape;
+pub struct Shape {
+ fsm_state: ShapeToolFsmState,
+ data: ShapeToolData,
+}
impl Tool for Shape {
fn handle_input(&mut self, event: &Event, document: &Document) -> (Vec, Vec) {
- todo!();
+ let mut responses = Vec::new();
+ let mut operations = Vec::new();
+ self.fsm_state = self.fsm_state.transition(event, document, &mut self.data, &mut responses, &mut operations);
+
+ (responses, operations)
+ }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum ShapeToolFsmState {
+ Ready,
+ LmbDown,
+}
+
+impl Default for ShapeToolFsmState {
+ fn default() -> Self {
+ ShapeToolFsmState::Ready
+ }
+}
+#[derive(Clone, Debug, Default)]
+struct ShapeToolData {
+ drag_start: ViewportPosition,
+ sides: u8,
+}
+
+impl Fsm for ShapeToolFsmState {
+ type ToolData = ShapeToolData;
+
+ fn transition(self, event: &Event, document: &Document, data: &mut Self::ToolData, responses: &mut Vec, operations: &mut Vec) -> Self {
+ match (self, event) {
+ (ShapeToolFsmState::Ready, Event::MouseDown(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => {
+ data.drag_start = mouse_state.position;
+ ShapeToolFsmState::LmbDown
+ }
+ (ShapeToolFsmState::Ready, Event::KeyDown(Key::KeyZ)) => {
+ if let Some(id) = document.root.list_layers().last() {
+ operations.push(Operation::DeleteLayer { path: vec![*id] })
+ }
+ ShapeToolFsmState::Ready
+ }
+
+ // TODO - Check for left mouse button
+ (ShapeToolFsmState::LmbDown, Event::MouseUp(mouse_state)) => {
+ let r = data.drag_start.distance(&mouse_state.position);
+ log::info!("Draw Shape with radius: {:.2}", r);
+
+ let start = data.drag_start;
+ let end = mouse_state.position;
+ let sides = data.sides;
+ operations.push(Operation::AddShape {
+ path: vec![],
+ insert_index: -1,
+ x0: start.x as f64,
+ y0: start.y as f64,
+ x1: end.x as f64,
+ y1: end.y as f64,
+ sides: 6,
+ });
+
+ ShapeToolFsmState::Ready
+ }
+
+ _ => self,
+ }
}
}