Moved cursor in selection check to selection tool

js/Tool.js

@@ -6,6 +6,7 @@ var tool = {};
 class Tool {
 	name = "AbstractTool";
 	isSelected = false;
+	switchFunction = undefined;
 	
 	// Cursor and brush size
 	cursorType = {};

js/tools/LassoSelectionTool.js

@@ -1,9 +1,9 @@
 class LassoSelectionTool extends SelectionTool {
     currentPixels = []
+    currSelection = {}
 
     constructor (name, options, switchFunc, moveTool) {
         super(name, options, switchFunc, moveTool);
-
         Events.on('click', this.mainButton, switchFunc, this);
     }
 
@@ -79,4 +79,8 @@ class LassoSelectionTool extends SelectionTool {
         currFile.VFXLayer.context.fill();
         currFile.VFXLayer.context.closePath();
     }
+
+    getSelection() {
+
+    }
 }

js/tools/MoveSelectionTool.js

@@ -59,7 +59,7 @@ class MoveSelectionTool extends DrawingTool {
     onStart(mousePos, mouseTarget) {
         super.onStart(mousePos, mouseTarget);
 
-        if (!this.cursorInSelectedArea(mousePos) && 
+        if (!this.selectionTool.cursorInSelectedArea(mousePos) && 
             !Util.isChildOfByClass(mouseTarget, "editor-top-menu")) {
             this.endSelection();
         }
@@ -101,7 +101,7 @@ class MoveSelectionTool extends DrawingTool {
     onHover(mousePos) {
         super.onHover(mousePos);
 
-        if (this.cursorInSelectedArea(mousePos)) {
+        if (this.selectionTool.cursorInSelectedArea(mousePos)) {
             currFile.canvasView.style.cursor = 'move';
         }
         else {
@@ -109,20 +109,6 @@ class MoveSelectionTool extends DrawingTool {
         }
     }
 
-    cursorInSelectedArea(cursorPos) {        
-        // Getting the coordinates relatively to the canvas
-        let x = cursorPos[0] / currFile.zoom;
-        let y = cursorPos[1] / currFile.zoom;
-    
-        if (this.currSelection.left <= x && x <= this.currSelection.right) {
-            if (y <= this.currSelection.bottom && y >= this.currSelection.top) {
-                return true;
-            }
-            return false;
-        }
-        return false;
-    }    
-
     endSelection() {
         if (this.currSelection == undefined)
             return;

js/tools/RectangularSelectionTool.js

@@ -1,13 +1,8 @@
 class RectangularSelectionTool extends SelectionTool {
-    switchFunc = undefined;
-    moveTool = undefined;
     currSelection = {};
 
     constructor (name, options, switchFunc, moveTool) {
-        super(name, options, switchFunc);
+        super(name, options, switchFunc, moveTool);
-
-        this.switchFunc = switchFunc;
-        this.moveTool = moveTool;
         Events.on('click', this.mainButton, switchFunc, this);
     }
 
@@ -209,4 +204,18 @@ class RectangularSelectionTool extends SelectionTool {
 
         return ret;
     }
+
+    cursorInSelectedArea(cursorPos) {        
+        // Getting the coordinates relatively to the canvas
+        let x = cursorPos[0] / currFile.zoom;
+        let y = cursorPos[1] / currFile.zoom;
+    
+        if (this.currSelection.left <= x && x <= this.currSelection.right) {
+            if (y <= this.currSelection.bottom && y >= this.currSelection.top) {
+                return true;
+            }
+            return false;
+        }
+        return false;
+    }    
 }

js/tools/SelectionTool.js

@@ -1,9 +1,19 @@
 class SelectionTool extends Tool {
-    constructor(name, options, switchFunc) {
+    switchFunc = undefined;
-        super(name, options, switchFunc);
+    moveTool = undefined;
+
+    constructor(name, options, switchFunc, moveTool) {
+        super(name, options);
+
+        this.moveTool = moveTool;
+        this.switchFunc = switchFunc;
     }
 
     cutSelection() {}
+
     pasteSelection(){}
+
     copySelection(){}
+    
+    cursorInSelectedArea(){}
 }