Added back rect selection

js/tools/MoveSelectionTool.js

@@ -1,14 +1,39 @@
 class MoveSelectionTool extends Tool {
-    constructor (name, options, switchFunc) {
+    currSelection = undefined;
+    selectionTool = undefined;
+    endTool = undefined;
+    switchFunc = undefined;
+
+    constructor (name, options, switchFunc, endTool) {
         super(name, options, switchFunc);
+
+        this.switchFunc = switchFunc;
+        this.endTool = endTool;
     }
 
     onStart(mousePos) {
         super.onStart(mousePos);
+
+        if (!this.cursorInSelectedArea(mousePos)) {
+            this.endSelection();
+        }
     }
 
     onDrag(mousePos) {
         super.onDrag(mousePos);
+
+        if (this.cursorInSelectedArea(mousePos)) {
+            this.currSelection = this.selectionTool.moveAnts(mousePos[0]/zoom, 
+                mousePos[1]/zoom, this.currSelection.width, this.currSelection.height);
+
+            // clear the entire tmp layer
+            TMPLayer.context.clearRect(0, 0, TMPLayer.canvas.width, TMPLayer.canvas.height);
+            // put the image data on the tmp layer with offset
+            TMPLayer.context.putImageData(
+                this.currSelection.data, 
+                Math.round(mousePos[0] / zoom) - this.currSelection.width / 2, 
+                Math.round(mousePos[1] / zoom) - this.currSelection.height / 2);
+        }
     }
 
     onEnd(mousePos) {
@@ -16,10 +41,90 @@ class MoveSelectionTool extends Tool {
     }
 
     onSelect() {
-        super.onSelect(mousePos);
+        super.onSelect();
     }
 
     onDeselect() {
-        super.onDeselect(mousePos);
+        super.onDeselect();
+    }
+
+    setSelectionData(data, tool) {
+        this.currSelection = data;
+        this.selectionTool = tool;
+        this.firstTimeMove = true;
+    }
+
+    onHover(mousePos) {
+        super.onHover(mousePos);
+
+        if (this.cursorInSelectedArea(mousePos)) {
+            canvasView.style.cursor = 'move';
+        }
+        else {
+            canvasView.style.cursor = 'default';
+        }
+    }
+
+    cursorInSelectedArea(cursorPos) {        
+        // Getting the coordinates relatively to the canvas
+        let x = cursorPos[0] / zoom;
+        let y = cursorPos[1] / 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() {
+        // Clearing the tmp (move preview) and vfx (ants) layers
+        TMPLayer.context.clearRect(0, 0, TMPLayer.canvas.width, TMPLayer.canvas.height);
+        VFXLayer.context.clearRect(0, 0, VFXLayer.canvas.width, VFXLayer.canvas.height);
+
+        // I have to save the underlying data, so that the transparent pixels in the clipboard 
+        // don't override the coloured pixels in the canvas
+        let underlyingImageData = currentLayer.context.getImageData(
+            this.currSelection.left, this.currSelection.top, 
+            this.currSelection.width, this.currSelection.height
+        );
+        
+        for (let i=0; i<underlyingImageData.data.length; i+=4) {
+            let currentMovePixel = [
+                this.currSelection.data.data[i], this.currSelection.data.data[i+1], 
+                this.currSelection.data.data[i+2], this.currSelection.data.data[i+3]
+            ];
+
+            let currentUnderlyingPixel = [
+                underlyingImageData.data[i], underlyingImageData.data[i+1], 
+                underlyingImageData.data[i+2], underlyingImageData.data[i+3]
+            ];
+
+            // If the pixel of the clipboard is empty, but the one below it isn't, I use the pixel below
+            if (Util.isPixelEmpty(currentMovePixel)) {
+                if (!Util.isPixelEmpty(underlyingImageData)) {
+                    this.currSelection.data.data[i] = currentUnderlyingPixel[0];
+                    this.currSelection.data.data[i+1] = currentUnderlyingPixel[1];
+                    this.currSelection.data.data[i+2] = currentUnderlyingPixel[2];
+                    this.currSelection.data.data[i+3] = currentUnderlyingPixel[3];
+                }
+            }
+        }
+
+        currentLayer.context.putImageData(
+            this.currSelection.data, 
+            this.currSelection.left, 
+            this.currSelection.top);
+
+        this.currSelection = undefined;
+        currentLayer.updateLayerPreview();
+        VFXLayer.canvas.style.zIndex = MIN_Z_INDEX;
+
+        // Saving history
+        new HistoryState().EditCanvas();
+        // Switch to brush
+        this.switchFunc(this.endTool);
     }
 }