Added back rect selection

js/tools/RectangularSelectionTool.js

@@ -1,7 +1,13 @@
 class RectangularSelectionTool extends SelectionTool {
-    constructor (name, options, switchFunc) {
+    switchFunc = undefined;
+    moveTool = undefined;
+    currSelection = {};
+
+    constructor (name, options, switchFunc, moveTool) {
         super(name, options, switchFunc);
 
+        this.switchFunc = switchFunc;
+        this.moveTool = moveTool;
         Events.on('click', this.mainButton, switchFunc, this);
     }
 
@@ -33,14 +39,14 @@ class RectangularSelectionTool extends SelectionTool {
         }
 
         // Drawing the rect
-        this.drawRect(this.startMousePos[0], this.startMousePos[1]);
+        this.drawSelection(this.startMousePos[0], this.startMousePos[1]);
     }
 
     onDrag(mousePos) {
         super.onDrag(mousePos);
 
         // Drawing the rect
-        this.drawRect(Math.round(mousePos[0] / zoom) + 0.5, Math.round(mousePos[1] / zoom) + 0.5);
+        this.drawSelection(Math.round(mousePos[0] / zoom) + 0.5, Math.round(mousePos[1] / zoom) + 0.5);
     }
 
     onEnd(mousePos) {
@@ -62,6 +68,33 @@ class RectangularSelectionTool extends SelectionTool {
             this.endMousePos[1] = this.startMousePos[1];
             this.startMousePos[1] = tmp;
         }
+
+        // Switch to the move tool so that the user can move the selection
+        this.switchFunc(this.moveTool);
+        // Preparing data for the move tool
+        let dataWidth = this.endMousePos[0] - this.startMousePos[0];
+        let dataHeight = this.endMousePos[1] - this.startMousePos[1];
+
+        this.currSelection = {
+            left: this.startMousePos[0], right: this.endMousePos[0], 
+            top: this.startMousePos[1], bottom: this.endMousePos[1], 
+
+            width: dataWidth,
+            height: dataHeight,
+            
+            data: currentLayer.context.getImageData(
+                this.startMousePos[0], this.startMousePos[1], 
+                dataWidth + 1, dataHeight + 1)
+        };
+        
+        // Moving the selection to the TMP layer. It will be moved back to the original
+        // layer if the user will cancel or end the selection
+        currentLayer.context.clearRect(this.startMousePos[0] - 0.5, this.startMousePos[1] - 0.5, 
+            dataWidth + 1, dataHeight + 1);
+        // Moving those pixels from the current layer to the tmp layer
+        TMPLayer.context.putImageData(this.currSelection.data, this.startMousePos[0], this.startMousePos[1]);
+
+        this.moveTool.setSelectionData(this.currSelection, this);
     }
 
     onSelect() {
@@ -72,7 +105,7 @@ class RectangularSelectionTool extends SelectionTool {
         super.onDeselect();
     }
 
-    drawRect(x, y) {
+    drawSelection(x, y) {
         // Getting the vfx context
         let vfxContext = VFXLayer.context;
     
@@ -88,4 +121,37 @@ class RectangularSelectionTool extends SelectionTool {
     
         vfxContext.stroke();
     }
+
+    /** Moves the rect ants to the specified position 
+     * 
+     * @param {*} x X coordinate of the rect ants
+     * @param {*} y Y coordinat of the rect ants
+     * @param {*} width Width of the selection
+     * @param {*} height Height of the selectione
+     * 
+     * @return The data regarding the current position and size of the selection
+     */
+    moveAnts(x, y, width, height) {
+        // Getting the vfx context
+        let vfxContext = VFXLayer.context;
+        let ret = this.currSelection;
+
+        // Clearing the vfx canvas
+        vfxContext.clearRect(0, 0, VFXLayer.canvas.width, VFXLayer.canvas.height);
+        vfxContext.lineWidth = 1;
+        vfxContext.setLineDash([4]);
+
+        // Fixing the coordinates
+        this.currSelection.left = Math.round(Math.round(x) - 0.5 - Math.round(width / 2)) + 0.5;
+        this.currSelection.top = Math.round(Math.round(y) - 0.5 - Math.round(height / 2)) + 0.5;
+        this.currSelection.right = this.currSelection.left + Math.round(width);
+        this.currSelection.bottom = this.currSelection.top + Math.round(height);
+
+        // Drawing the rect
+        vfxContext.beginPath();
+        vfxContext.rect(this.currSelection.left, this.currSelection.top, width, height);
+        vfxContext.stroke();
+
+        return ret;
+    }
 }