Refactor tools to avoid state keeping

TrueDoctor · TrueDoctor · commit 2245c6523e45 · 2021-08-05T08:05:22.000+02:00
diff --git a/core/editor/src/document/document_file.rs b/core/editor/src/document/document_file.rs
@@ -418,7 +418,6 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 					FlipAxis::Y => DVec2::new(1., -1.),
 				};
 				if let Some([min, max]) = self.document.combined_viewport_bounding_box(self.selected_layers().map(|x| x.as_slice())) {
-					let size = max - min;
 					let center = (max + min) / 2.;
 					let bbox_trans = DAffine2::from_translation(-center);
 					for path in self.selected_layers() {
diff --git a/core/editor/src/input/input_mapper.rs b/core/editor/src/input/input_mapper.rs
@@ -112,6 +112,7 @@ macro_rules! mapping {
 
 impl Default for Mapping {
 	fn default() -> Self {
+		use Key::*;
 		let mappings = mapping![
 			entry! {action=DocumentsMessage::PasteLayers{path: vec![], insert_index: -1}, key_down=KeyV, modifiers=[KeyControl]},
 			entry! {action=MovementMessage::EnableSnapping, key_down=KeyShift},
@@ -130,31 +131,19 @@ impl Default for Mapping {
 			entry! {action=RectangleMessage::DragStop, key_up=Lmb},
 			entry! {action=RectangleMessage::Abort, key_down=Rmb},
 			entry! {action=RectangleMessage::Abort, key_down=KeyEscape},
-			entry! {action=RectangleMessage::Resize(ResizeMessage::Center), key_down=KeyAlt},
-			entry! {action=RectangleMessage::Resize(ResizeMessage::UnCenter), key_up=KeyAlt},
-			entry! {action=RectangleMessage::Resize(ResizeMessage::PointerMove), message=InputMapperMessage::PointerMove},
-			entry! {action=RectangleMessage::Resize(ResizeMessage::LockAspectRatio), key_down=KeyShift},
-			entry! {action=RectangleMessage::Resize(ResizeMessage::UnlockAspectRatio), key_up=KeyShift},
+			entry! {action=RectangleMessage::Resize{center: KeyAlt, lock_ratio: KeyShift}, message=InputMapperMessage::PointerMove},
 			// Ellipse
 			entry! {action=EllipseMessage::DragStart, key_down=Lmb},
 			entry! {action=EllipseMessage::DragStop, key_up=Lmb},
 			entry! {action=EllipseMessage::Abort, key_down=Rmb},
 			entry! {action=EllipseMessage::Abort, key_down=KeyEscape},
-			entry! {action=EllipseMessage::Resize(ResizeMessage::Center), key_down=KeyAlt},
-			entry! {action=EllipseMessage::Resize(ResizeMessage::UnCenter), key_up=KeyAlt},
-			entry! {action=EllipseMessage::Resize(ResizeMessage::PointerMove), message=InputMapperMessage::PointerMove},
-			entry! {action=EllipseMessage::Resize(ResizeMessage::LockAspectRatio), key_down=KeyShift},
-			entry! {action=EllipseMessage::Resize(ResizeMessage::UnlockAspectRatio), key_up=KeyShift},
+			entry! {action=EllipseMessage::Resize{center: KeyAlt, lock_ratio: KeyShift}, message=InputMapperMessage::PointerMove},
 			// Shape
 			entry! {action=ShapeMessage::DragStart, key_down=Lmb},
 			entry! {action=ShapeMessage::DragStop, key_up=Lmb},
 			entry! {action=ShapeMessage::Abort, key_down=Rmb},
 			entry! {action=ShapeMessage::Abort, key_down=KeyEscape},
-			entry! {action=ShapeMessage::Resize(ResizeMessage::Center), key_down=KeyAlt},
-			entry! {action=ShapeMessage::Resize(ResizeMessage::UnCenter), key_up=KeyAlt},
-			entry! {action=ShapeMessage::Resize(ResizeMessage::PointerMove), message=InputMapperMessage::PointerMove},
-			entry! {action=ShapeMessage::Resize(ResizeMessage::LockAspectRatio), key_down=KeyShift},
-			entry! {action=ShapeMessage::Resize(ResizeMessage::UnlockAspectRatio), key_up=KeyShift},
+			entry! {action=ShapeMessage::Resize{center: KeyAlt, lock_ratio: KeyShift}, message=InputMapperMessage::PointerMove},
 			// Line
 			entry! {action=LineMessage::Center, key_down=KeyAlt},
 			entry! {action=LineMessage::UnCenter, key_up=KeyAlt},
diff --git a/core/editor/src/input/input_preprocessor.rs b/core/editor/src/input/input_preprocessor.rs
@@ -7,7 +7,6 @@ use bitflags::bitflags;
 
 #[doc(inline)]
 pub use document_core::DocumentResponse;
-use glam::DVec2;
 
 #[impl_message(Message, InputPreprocessor)]
 #[derive(PartialEq, Clone, Debug)]
diff --git a/core/editor/src/input/keyboard.rs b/core/editor/src/input/keyboard.rs
@@ -112,7 +112,7 @@ impl<const LENGTH: usize> BitVector<LENGTH> {
 		let (offset, bit) = Self::convert_index(bitvector_index);
 		self.0[offset] ^= bit;
 	}
-	pub fn get(&mut self, bitvector_index: usize) -> bool {
+	pub fn get(&self, bitvector_index: usize) -> bool {
 		let (offset, bit) = Self::convert_index(bitvector_index);
 		(self.0[offset] & bit) != 0
 	}
diff --git a/core/editor/src/lib.rs b/core/editor/src/lib.rs
@@ -76,7 +76,6 @@ pub mod message_prelude {
 	pub use crate::tool::tools::path::{PathMessage, PathMessageDiscriminant};
 	pub use crate::tool::tools::pen::{PenMessage, PenMessageDiscriminant};
 	pub use crate::tool::tools::rectangle::{RectangleMessage, RectangleMessageDiscriminant};
-	pub use crate::tool::tools::resize::{ResizeMessage, ResizeMessageDiscriminant};
 	pub use crate::tool::tools::select::{SelectMessage, SelectMessageDiscriminant};
 	pub use crate::tool::tools::shape::{ShapeMessage, ShapeMessageDiscriminant};
 	pub use crate::LayerId;
diff --git a/core/editor/src/tool/tools/ellipse.rs b/core/editor/src/tool/tools/ellipse.rs
@@ -1,3 +1,4 @@
+use crate::input::keyboard::Key;
 use crate::input::InputPreprocessor;
 use crate::tool::{DocumentToolData, Fsm, ToolActionHandlerData};
 use crate::{document::DocumentMessageHandler, message_prelude::*};
@@ -17,7 +18,7 @@ pub struct Ellipse {
 pub enum EllipseMessage {
 	DragStart,
 	DragStop,
-	Resize(ResizeMessage),
+	Resize { center: Key, lock_ratio: Key },
 	Abort,
 }
 
@@ -28,7 +29,7 @@ impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Ellipse {
 	fn actions(&self) -> ActionList {
 		use EllipseToolFsmState::*;
 		match self.fsm_state {
-			Ready => actions!(EllipseMessageDiscriminant; DragStart, Resize),
+			Ready => actions!(EllipseMessageDiscriminant; DragStart),
 			Dragging => actions!(EllipseMessageDiscriminant; DragStop,  Abort, Resize),
 		}
 	}
@@ -86,8 +87,12 @@ impl Fsm for EllipseToolFsmState {
 
 					Dragging
 				}
-				(state, Resize(message)) => {
-					shape_data.process_action(message, input, responses);
+				(state, Resize { center, lock_ratio }) => {
+					if let Some(message) = shape_data.calculate_transform(center, lock_ratio, input) {
+						responses.push_back(message);
+						log::debug!("dragging");
+					}
+
 					state
 				}
 				(Dragging, DragStop) => {
diff --git a/core/editor/src/tool/tools/rectangle.rs b/core/editor/src/tool/tools/rectangle.rs
@@ -1,3 +1,4 @@
+use crate::input::keyboard::Key;
 use crate::input::InputPreprocessor;
 use crate::tool::{DocumentToolData, Fsm, ToolActionHandlerData};
 use crate::{document::DocumentMessageHandler, message_prelude::*};
@@ -17,7 +18,7 @@ pub struct Rectangle {
 pub enum RectangleMessage {
 	DragStart,
 	DragStop,
-	Resize(ResizeMessage),
+	Resize { center: Key, lock_ratio: Key },
 	Abort,
 }
 
@@ -28,7 +29,7 @@ impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Rectangle {
 	fn actions(&self) -> ActionList {
 		use RectangleToolFsmState::*;
 		match self.fsm_state {
-			Ready => actions!(RectangleMessageDiscriminant; DragStart, Resize),
+			Ready => actions!(RectangleMessageDiscriminant; DragStart),
 			Dragging => actions!(RectangleMessageDiscriminant; DragStop,  Abort, Resize),
 		}
 	}
@@ -86,8 +87,10 @@ impl Fsm for RectangleToolFsmState {
 
 					Dragging
 				}
-				(state, Resize(message)) => {
-					shape_data.process_action(message, input, responses);
+				(state, Resize { center, lock_ratio }) => {
+					if let Some(message) = shape_data.calculate_transform(center, lock_ratio, input) {
+						responses.push_back(message);
+					}
 
 					state
 				}
diff --git a/core/editor/src/tool/tools/resize.rs b/core/editor/src/tool/tools/resize.rs
@@ -1,3 +1,4 @@
+use crate::input::keyboard::Key;
 use crate::input::{mouse::ViewportPosition, InputPreprocessor};
 use crate::message_prelude::*;
 use document_core::Operation;
@@ -6,51 +7,18 @@ use glam::{DAffine2, Vec2Swizzles};
 #[derive(Clone, Debug, Default)]
 pub struct Resize {
 	pub drag_start: ViewportPosition,
-	pub drag_current: ViewportPosition,
-	pub constrain_to_square: bool,
-	pub center_around_cursor: bool,
 	pub path: Option<Vec<LayerId>>,
 }
-
-#[impl_message]
-#[derive(PartialEq, Clone, Debug, Hash)]
-pub enum ResizeMessage {
-	PointerMove,
-	Center,
-	UnCenter,
-	LockAspectRatio,
-	UnlockAspectRatio,
-}
-
-impl<'a> MessageHandler<ResizeMessage, &InputPreprocessor> for Resize {
-	fn process_action(&mut self, action: ResizeMessage, ipp: &InputPreprocessor, responses: &mut VecDeque<Message>) {
-		self.drag_current = ipp.mouse.position;
-		use ResizeMessage::*;
-		match action {
-			PointerMove => self.drag_current = ipp.mouse.position,
-			LockAspectRatio => self.constrain_to_square = true,
-			UnlockAspectRatio => self.constrain_to_square = false,
-			Center => self.center_around_cursor = true,
-			UnCenter => self.center_around_cursor = false,
-		}
-		if let Some(message) = self.calculate_transform() {
-			responses.push_back(message);
-		}
-	}
-	fn actions(&self) -> ActionList {
-		vec![]
-	}
-}
 impl Resize {
-	fn calculate_transform(&self) -> Option<Message> {
+	pub fn calculate_transform(&self, center: Key, lock_ratio: Key, ipp: &InputPreprocessor) -> Option<Message> {
 		let mut start = self.drag_start.as_f64();
-		let stop = self.drag_current.as_f64();
+		let stop = ipp.mouse.position.as_f64();
 
 		let mut size = stop - start;
-		if self.constrain_to_square {
+		if ipp.keyboard.get(center as usize) {
 			size = size.abs().max(size.abs().yx()) * size.signum();
 		}
-		if self.center_around_cursor {
+		if ipp.keyboard.get(lock_ratio as usize) {
 			start -= size / 2.;
 		}
 
diff --git a/core/editor/src/tool/tools/shape.rs b/core/editor/src/tool/tools/shape.rs
@@ -1,3 +1,4 @@
+use crate::input::keyboard::Key;
 use crate::input::InputPreprocessor;
 use crate::tool::{DocumentToolData, Fsm, ShapeType, ToolActionHandlerData, ToolOptions, ToolType};
 use crate::{document::DocumentMessageHandler, message_prelude::*};
@@ -17,7 +18,7 @@ pub struct Shape {
 pub enum ShapeMessage {
 	DragStart,
 	DragStop,
-	Resize(ResizeMessage),
+	Resize { center: Key, lock_ratio: Key },
 	Abort,
 }
 
@@ -28,7 +29,7 @@ impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Shape {
 	fn actions(&self) -> ActionList {
 		use ShapeToolFsmState::*;
 		match self.fsm_state {
-			Ready => actions!(ShapeMessageDiscriminant; DragStart, Resize),
+			Ready => actions!(ShapeMessageDiscriminant; DragStart),
 			Dragging => actions!(ShapeMessageDiscriminant; DragStop,  Abort, Resize),
 		}
 	}
@@ -93,8 +94,10 @@ impl Fsm for ShapeToolFsmState {
 
 					Dragging
 				}
-				(state, Resize(message)) => {
-					shape_data.process_action(message, input, responses);
+				(state, Resize { center, lock_ratio }) => {
+					if let Some(message) = shape_data.calculate_transform(center, lock_ratio, input) {
+						responses.push_back(message);
+					}
 
 					state
 				}

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ impl<const LENGTH: usize> BitVector<LENGTH> {`
`112`	`112`	`let (offset, bit) = Self::convert_index(bitvector_index);`
`113`	`113`	`self.0[offset] ^= bit;`
`114`	`114`	`}`
`115`		`- pub fn get(&mut self, bitvector_index: usize) -> bool {`
	`115`	`+ pub fn get(&self, bitvector_index: usize) -> bool {`
`116`	`116`	`let (offset, bit) = Self::convert_index(bitvector_index);`
`117`	`117`	`(self.0[offset] & bit) != 0`
`118`	`118`	`}`