From 59f7af3f47deedec8d1820dcfad64898bc9bc209 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Tue, 6 Apr 2021 22:21:32 -0700 Subject: [PATCH] Rename "state" to "fsm_state" to avoid confusion --- core/editor/src/lib.rs | 6 +++--- core/editor/src/tools/ellipse.rs | 18 +++++++++--------- core/editor/src/tools/mod.rs | 8 ++++---- core/editor/src/tools/rectangle.rs | 2 +- core/editor/src/tools/select.rs | 22 +++++++++++----------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/editor/src/lib.rs b/core/editor/src/lib.rs index 46402c820..876c32444 100644 --- a/core/editor/src/lib.rs +++ b/core/editor/src/lib.rs @@ -20,11 +20,11 @@ pub use dispatcher::Callback; use dispatcher::Dispatcher; use document_core::Document; -use tools::ToolState; +use tools::ToolFsmState; use workspace::Workspace; pub struct EditorState { - tool_state: ToolState, + tool_state: ToolFsmState, workspace: Workspace, document: Document, } @@ -39,7 +39,7 @@ impl Editor { pub fn new(callback: Callback) -> Self { Self { state: EditorState { - tool_state: ToolState::new(), + tool_state: ToolFsmState::new(), workspace: Workspace::new(), document: Document::default(), }, diff --git a/core/editor/src/tools/ellipse.rs b/core/editor/src/tools/ellipse.rs index 4b4c90b29..4b7bc2be5 100644 --- a/core/editor/src/tools/ellipse.rs +++ b/core/editor/src/tools/ellipse.rs @@ -6,46 +6,46 @@ use document_core::Operation; #[derive(Default)] pub struct Ellipse { - state: EllipseToolState, + fsm_state: EllipseToolFsmState, } impl Tool for Ellipse { fn handle_input(&mut self, event: &Event, document: &Document) -> (Vec, Vec) { let mut responses = Vec::new(); let mut operations = Vec::new(); - self.state = self.state.transition(event, document, &mut responses, &mut operations); + self.fsm_state = self.fsm_state.transition(event, document, &mut responses, &mut operations); (responses, operations) } } #[derive(Clone, Copy, Debug, PartialEq, Eq)] -enum EllipseToolState { +enum EllipseToolFsmState { Ready, LmbDown, TransformSelected, } -impl Default for EllipseToolState { +impl Default for EllipseToolFsmState { fn default() -> Self { - EllipseToolState::Ready + EllipseToolFsmState::Ready } } -impl Fsm for EllipseToolState { +impl Fsm for EllipseToolFsmState { fn transition(self, event: &Event, document: &Document, responses: &mut Vec, operations: &mut Vec) -> Self { match (self, event) { - (EllipseToolState::Ready, Event::MouseDown(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => EllipseToolState::LmbDown, + (EllipseToolFsmState::Ready, Event::MouseDown(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => EllipseToolFsmState::LmbDown, // TODO - Check for left mouse button - (EllipseToolState::LmbDown, Event::MouseUp(mouse_state)) => { + (EllipseToolFsmState::LmbDown, Event::MouseUp(mouse_state)) => { operations.push(Operation::AddCircle { cx: mouse_state.position.x as f64, cy: mouse_state.position.y as f64, r: 10.0, }); - EllipseToolState::Ready + EllipseToolFsmState::Ready } _ => self, diff --git a/core/editor/src/tools/mod.rs b/core/editor/src/tools/mod.rs index 1bd7e80c5..3ffd3eb07 100644 --- a/core/editor/src/tools/mod.rs +++ b/core/editor/src/tools/mod.rs @@ -24,7 +24,7 @@ pub trait Fsm { fn transition(self, event: &Event, document: &Document, responses: &mut Vec, operations: &mut Vec) -> Self; } -pub struct ToolState { +pub struct ToolFsmState { pub mouse_state: MouseState, pub mod_keys: ModKeys, pub trace: Trace, @@ -35,9 +35,9 @@ pub struct ToolState { tool_settings: HashMap, } -impl Default for ToolState { +impl Default for ToolFsmState { fn default() -> Self { - ToolState { + ToolFsmState { mouse_state: MouseState::default(), mod_keys: ModKeys::default(), trace: Trace::new(), @@ -61,7 +61,7 @@ impl Default for ToolState { } } -impl ToolState { +impl ToolFsmState { pub fn new() -> Self { Self::default() } diff --git a/core/editor/src/tools/rectangle.rs b/core/editor/src/tools/rectangle.rs index c42b46c01..2383e77b2 100644 --- a/core/editor/src/tools/rectangle.rs +++ b/core/editor/src/tools/rectangle.rs @@ -12,7 +12,7 @@ impl Tool for Rectangle { } } -enum RectangleToolState { +enum RectangleToolFsmState { Ready, Dragging, } diff --git a/core/editor/src/tools/select.rs b/core/editor/src/tools/select.rs index 27da373ed..3c7f307c9 100644 --- a/core/editor/src/tools/select.rs +++ b/core/editor/src/tools/select.rs @@ -6,44 +6,44 @@ use document_core::Operation; #[derive(Default)] pub struct Select { - state: SelectToolState, + fsm_state: SelectToolFsmState, } impl Tool for Select { fn handle_input(&mut self, event: &Event, document: &Document) -> (Vec, Vec) { let mut responses = Vec::new(); let mut operations = Vec::new(); - self.state = self.state.transition(event, document, &mut responses, &mut operations); + self.fsm_state = self.fsm_state.transition(event, document, &mut responses, &mut operations); (responses, operations) } } #[derive(Clone, Copy, Debug, PartialEq, Eq)] -enum SelectToolState { +enum SelectToolFsmState { Ready, LmbDown, TransformSelected, } -impl Default for SelectToolState { +impl Default for SelectToolFsmState { fn default() -> Self { - SelectToolState::Ready + SelectToolFsmState::Ready } } -impl Fsm for SelectToolState { +impl Fsm for SelectToolFsmState { fn transition(self, event: &Event, document: &Document, responses: &mut Vec, operations: &mut Vec) -> Self { match (self, event) { - (SelectToolState::Ready, Event::MouseDown(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => SelectToolState::LmbDown, + (SelectToolFsmState::Ready, Event::MouseDown(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => SelectToolFsmState::LmbDown, - (SelectToolState::LmbDown, Event::MouseUp(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => SelectToolState::Ready, + (SelectToolFsmState::LmbDown, Event::MouseUp(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => SelectToolFsmState::Ready, - (SelectToolState::LmbDown, Event::MouseMove(mouse_state)) => SelectToolState::TransformSelected, + (SelectToolFsmState::LmbDown, Event::MouseMove(mouse_state)) => SelectToolFsmState::TransformSelected, - (SelectToolState::TransformSelected, Event::MouseMove(mouse_state)) => self, + (SelectToolFsmState::TransformSelected, Event::MouseMove(mouse_state)) => self, - (SelectToolState::TransformSelected, Event::MouseUp(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => SelectToolState::Ready, + (SelectToolFsmState::TransformSelected, Event::MouseUp(mouse_state)) if mouse_state.mouse_keys.contains(MouseKeys::LEFT) => SelectToolFsmState::Ready, _ => self, }