From 4c4fbede6e14a6562637689be2a310cff9f955e4 Mon Sep 17 00:00:00 2001
From: Nicola <47360416+unsettledgames@users.noreply.github.com>
Date: Sun, 9 Jan 2022 23:53:28 +0100
Subject: [PATCH] Started magic wand

---
 js/ToolManager.js         |  2 ++
 js/pixel-editor.js        |  3 ++-
 js/tools/MagicWandTool.js | 17 +++++++++++++++++
 svg/magicwand.svg         |  8 ++++++++
 views/tools-menu.hbs      |  2 ++
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 js/tools/MagicWandTool.js
 create mode 100644 svg/magicwand.svg

diff --git a/js/ToolManager.js b/js/ToolManager.js
index 021e5d4..9b1714b 100644
--- a/js/ToolManager.js
+++ b/js/ToolManager.js
@@ -18,6 +18,8 @@ const ToolManager = (() => {
         {type: 'cursor', style:'crosshair'}, switchTool, tools["moveselection"]);
     tools["lassoselect"] = new LassoSelectionTool("lassoselect", 
         {type: 'cursor', style:'crosshair'}, switchTool, tools["moveselection"]);
+    tools["magicwand"] = new MagicWandTool("magicwand", 
+        {type: 'cursor', style:'crosshair'}, switchTool, tools["movetool"]);
     
     currTool = tools["brush"];
     currTool.onSelect();
diff --git a/js/pixel-editor.js b/js/pixel-editor.js
index ad3fca5..f02d734 100644
--- a/js/pixel-editor.js
+++ b/js/pixel-editor.js
@@ -41,9 +41,10 @@
 //=include tools/EyeDropperTool.js
 //=include tools/PanTool.js
 //=include tools/ZoomTool.js
+//=include tools/MoveSelectionTool.js
 //=include tools/RectangularSelectionTool.js
 //=include tools/LassoSelectionTool.js
-//=include tools/MoveSelectionTool.js
+//=include tools/MagicWandTool.js
 
 /** MODULES AND MENUS **/
 //=include SplashPage.js
diff --git a/js/tools/MagicWandTool.js b/js/tools/MagicWandTool.js
new file mode 100644
index 0000000..b73d46b
--- /dev/null
+++ b/js/tools/MagicWandTool.js
@@ -0,0 +1,17 @@
+class MagicWandTool extends SelectionTool {
+    constructor (name, options, switchFunc, moveTool) {
+        super(name, options, switchFunc, moveTool);
+        Events.on('click', this.mainButton, switchFunc, this);
+    }
+
+    onEnd(mousePos) {
+        super.onStart(mousePos);
+    }
+
+    getSelection() {
+        // this.currSelection should be filled
+
+        this.drawSelectedArea();
+    }
+    
+}
\ No newline at end of file
diff --git a/svg/magicwand.svg b/svg/magicwand.svg
new file mode 100644
index 0000000..dd8f263
--- /dev/null
+++ b/svg/magicwand.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 221.559 221.559" style="enable-background:new 0 0 221.559 221.559;" xml:space="preserve">
+<path d="M143.869,102.927l-26.016-26.016l28.652-28.652l26.014,26.018L143.869,102.927z M26.016,220.779l107.247-107.246
+	l-26.017-26.016L0,194.762L26.016,220.779z M84.795,24.35v11.838H72.959v10h11.836v11.837h10V46.188h11.838v-10H94.795V24.35H84.795
+	z M182.887,0.779v11.836h-11.838v10h11.838v11.837h10V22.616h11.836v-10h-11.836V0.779H182.887z M221.559,73.776h-11.836V61.938h-10
+	v11.838h-11.838v10h11.838v11.835h10V83.776h11.836V73.776z"/>
+</svg>
diff --git a/views/tools-menu.hbs b/views/tools-menu.hbs
index a50b534..4608518 100644
--- a/views/tools-menu.hbs
+++ b/views/tools-menu.hbs
@@ -52,6 +52,8 @@
 
 	<li><button title = "Lasso Selection Tool (Q)" id = "lassoselect-button">{{svg "lasso.svg" width = "26" height = "26"}}</button></li>
 
+	<li><button title = "Magic Wand Tool (W)" id = "magicwand-button">{{svg "magicwand.svg" width = "26" height = "26"}}</button></li>
+
 	<li><button title="Eyedropper Tool (E)" id="eyedropper-button">{{svg "eyedropper.svg" width="24" height="24"}}</button></li>
 
 	<li><button title="Pan Tool (P)" id="pan-button">{{svg "pan.svg" width="24" height="24"}}</button></li>