Rework the ToolState and integrate it into the Editor struct (#48)

* Rework the ToolState and integrate it into the Editor struct

* Add asset manager sources to docs outline

core/editor/src/lib.rs

@@ -15,6 +15,15 @@ use workspace::Workspace;
 
 // TODO: serialize with serde to save the current editor state
 pub struct Editor {
-	tools: ToolState,
+	pub tools: ToolState,
 	workspace: Workspace,
 }
+
+impl Editor {
+	pub fn new() -> Self {
+		Self {
+			tools: ToolState::new(),
+			workspace: Workspace::new(),
+		}
+	}
+}

core/editor/src/tools/mod.rs

@@ -1,54 +1,67 @@
 use crate::Color;
-
-const TOOL_COUNT: usize = 10;
+use std::collections::HashMap;
 
 pub struct ToolState {
-	primary_color: Color,
-	secondary_color: Color,
-	active_tool: ToolType,
-	tool_settings: [ToolSettings; TOOL_COUNT],
+	pub primary_color: Color,
+	pub secondary_color: Color,
+	pub active_tool: ToolType,
+	tool_settings: HashMap<ToolType, ToolSettings>,
 }
 
 impl ToolState {
-	pub const fn default() -> ToolState {
+	pub fn new() -> Self {
 		ToolState {
 			primary_color: Color::BLACK,
 			secondary_color: Color::WHITE,
 			active_tool: ToolType::Select,
-			tool_settings: [ToolSettings::Select { append_mode: SelectAppendMode::New }; TOOL_COUNT],
-			// TODO: Initialize to sensible values
+			tool_settings: default_tool_settings(),
 		}
 	}
-	pub fn select_tool(&mut self, tool: ToolType) {
-		self.active_tool = tool
-	}
-	pub fn set_primary_color<T: Into<Color>>(&mut self, primary_color: T) {
-		self.primary_color = primary_color.into();
-	}
-	pub fn set_secondary_color<T: Into<Color>>(&mut self, secondary_color: T) {
-		self.secondary_color = secondary_color.into();
-	}
+}
+
+fn default_tool_settings() -> HashMap<ToolType, ToolSettings> {
+	let tool_init = |tool: &ToolType| (*tool, tool.default_settings());
+	[
+		tool_init(&ToolType::Select),
+		tool_init(&ToolType::Shape), // TODO: Add more tool defaults
+	]
+	.iter()
+	.cloned()
+	.collect()
 }
 
 #[repr(usize)]
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ToolType {
-	Select = 0,
-	Crop = 1,
-	Navigate = 2,
-	Sample = 3,
-	Path = 4,
-	Pen = 5,
-	Line = 6,
-	Rectangle = 7,
-	Ellipse = 8,
-	Shape = 9,
+	Select,
+	Crop,
+	Navigate,
+	Sample,
+	Path,
+	Pen,
+	Line,
+	Rectangle,
+	Ellipse,
+	Shape,
 	// all discriminats must be strictly smaller than TOOL_COUNT!
 }
 
+impl ToolType {
+	fn default_settings(&self) -> ToolSettings {
+		match self {
+			ToolType::Select => ToolSettings::Select { append_mode: SelectAppendMode::New },
+			ToolType::Shape => ToolSettings::Shape {
+				shape: Shape::Polygon { vertices: 3 },
+			},
+			_ => todo!(),
+		}
+	}
+}
+
 #[derive(Debug, Clone, Copy)]
 pub enum ToolSettings {
 	Select { append_mode: SelectAppendMode },
+	Shape { shape: Shape },
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -58,3 +71,9 @@ pub enum SelectAppendMode {
 	Subtract,
 	Intersect,
 }
+
+#[derive(Debug, Clone, Copy)]
+pub enum Shape {
+	Star { vertices: u32 },
+	Polygon { vertices: u32 },
+}

core/editor/src/workspace/mod.rs

@@ -7,6 +7,12 @@ pub struct Workspace {
 }
 
 impl Workspace {
+	pub fn new() -> Workspace {
+		Workspace {
+			hovered_panel: 0,
+			root: PanelGroup::new(),
+		}
+	}
 	// add panel / panel group
 	// delete panel / panel group
 	// move panel / panel group
@@ -18,6 +24,15 @@ struct PanelGroup {
 	layout_direction: LayoutDirection,
 }
 
+impl PanelGroup {
+	fn new() -> PanelGroup {
+		PanelGroup {
+			contents: vec![],
+			layout_direction: LayoutDirection::Horizontal,
+		}
+	}
+}
+
 enum Contents {
 	PanelArea(PanelArea),
 	Group(PanelGroup),