Twist logic

plugins/board/miniboard/moveto/MoveTo.js

@@ -94,17 +94,6 @@ class MoveTo extends TickTask {
         return this;
     }
 
-    moveAlongLine(startX, startY, endX, endY) {
-        if (startX !== undefined) {
-            this.parent.x = startX;
-        }
-        if (startY !== undefined) {
-            this.parent.y = startY;
-        }
-        this.moveToTask.moveTo(endX, endY);
-        return this;
-    };
-
     update(time, delta) {
         if ((!this.isRunning) || (!this.enable)) {
             return this;

plugins/board/moveto/MoveTo.js

@@ -1,6 +1,7 @@
 import TickTask from '../../utils/componentbase/SceneUpdateTickTask.js';
 import Methods from './Methods.js';
-import MoveToTask from '../../behaviors/moveto/MoveTo.js';
+import MoveToTask from './movetotask/MoveToTask.js';
+import MoveNextLine from './movetotask/MoveNextLine.js';
 import GetChessData from '../chess/GetChessData.js';
 import GetValue from '../../utils/object/GetValue.js';
 
@@ -153,41 +154,6 @@ class MoveTo extends TickTask {
         return this;
     }
 
-    moveAlongLine(startX, startY, endX, endY) {
-        if (startX !== undefined) {
-            this.parent.x = startX;
-        }
-        if (startY !== undefined) {
-            this.parent.y = startY;
-        }
-        this.moveToTask.moveTo(endX, endY);
-        return this;
-    };
-
-    addMoveLine(startX, startY, endX, endY) {
-        if (!this.moveToTask.hasOwnProperty('nextlines')) {
-            this.moveToTask.nextlines = [];
-        }
-        this.moveToTask.nextlines.push(
-            [startX, startY, endX, endY]
-        );
-        return this;
-    };
-
-    moveNextLine() {
-        var nextlines = this.moveToTask.nextlines;
-        if (!nextlines) {
-            return false;
-        }
-        if (nextlines.length === 0) {
-            return false;
-        }
-        // has next line
-        this.moveAlongLine.apply(this, nextlines[0]);
-        nextlines.length = 0;
-        return true;
-    }
-
     update(time, delta) {
         if ((!this.isRunning) || (!this.enable)) {
             return this;
@@ -196,7 +162,7 @@ class MoveTo extends TickTask {
         var moveToTask = this.moveToTask;
         moveToTask.update(time, delta);
         if (!moveToTask.isRunning) {
-            if (!this.moveNextLine()) {
+            if (!MoveNextLine.call(this)) {
                 this.complete();
             }
             return this;

plugins/board/moveto/MoveToTile.js

@@ -1,5 +1,7 @@
 import GetValue from '../../utils/object/GetValue.js';
 import GetSneakTileZ from './GetSneakTileZ.js';
+import MoveAloneLine from './movetotask/MoveAloneLine.js';
+import AddMoveLine from './movetotask/AddMoveLine.js';
 
 var MoveToTile = function (tileX, tileY, direction) {
     var board = this.chessData.board;
@@ -55,7 +57,7 @@ var MoveToTile = function (tileX, tileY, direction) {
         if ((neighborTileXY.x === tileX) && (neighborTileXY.y === tileY)) {
             // not a wrapped neighbor
             var out = board.tileXYToWorldXY(tileX, tileY, true);
-            this.moveAlongLine(undefined, undefined, out.x, out.y);
+            MoveAloneLine.call(this, undefined, undefined, out.x, out.y);
         } else {
             // wrapped neighbor
             // line 0
@@ -67,7 +69,7 @@ var MoveToTile = function (tileX, tileY, direction) {
             var startY = out.y;
             var endX = (startX + originNeighborWorldX) / 2;
             var endY = (startY + originNeighborWorldY) / 2;
-            this.moveAlongLine(undefined, undefined, endX, endY);
+            MoveAloneLine.call(this, undefined, undefined, endX, endY);
             // line 1
             var oppositeDirection = board.getOppositeDirection(tileX, tileY, direction);
             board.grid.getNeighborTileXY(tileX, tileY, oppositeDirection, neighborTileXY);
@@ -79,11 +81,11 @@ var MoveToTile = function (tileX, tileY, direction) {
             endY = out.y;
             startX = (originNeighborWorldX + endX) / 2;
             startY = (originNeighborWorldY + endY) / 2;
-            this.addMoveLine(startX, startY, endX, endY);
+            AddMoveLine.call(this, startX, startY, endX, endY);
         }
     } else {
         var out = board.tileXYToWorldXY(tileX, tileY, true);
-        this.moveAlongLine(undefined, undefined, out.x, out.y);
+        MoveAloneLine.call(this, undefined, undefined, out.x, out.y);
     }
 
     var tileZ = myTileXYZ.z;

plugins/board/moveto/movetotask/AddMoveLine.js

@@ -0,0 +1,11 @@
+var AddMoveLine = function (startX, startY, endX, endY) {
+    if (!this.moveToTask.hasOwnProperty('nextlines')) {
+        this.moveToTask.nextlines = [];
+    }
+    this.moveToTask.nextlines.push(
+        [startX, startY, endX, endY]
+    );
+    return this;
+};
+
+export default AddMoveLine;

plugins/board/moveto/movetotask/MoveAloneLine.js

@@ -0,0 +1,12 @@
+var MoveAloneLine = function (startX, startY, endX, endY) {
+    if (startX !== undefined) {
+        this.parent.x = startX;
+    }
+    if (startY !== undefined) {
+        this.parent.y = startY;
+    }
+    this.moveToTask.moveTo(endX, endY);
+    return this;
+};
+
+export default MoveAloneLine;

plugins/board/moveto/movetotask/MoveNextLine.js

@@ -0,0 +1,17 @@
+import MoveAloneLine from './MoveAloneLine.js';
+
+var MoveNextLine = function () {
+    var nextlines = this.moveToTask.nextlines;
+    if (!nextlines) {
+        return false;
+    }
+    if (nextlines.length === 0) {
+        return false;
+    }
+    // has next line
+    MoveAloneLine.apply(this, nextlines[0]);
+    nextlines.length = 0;
+    return true;
+}
+
+export default MoveNextLine;

plugins/board/moveto/movetotask/MoveToTask.js

@@ -0,0 +1,2 @@
+import MoveToTask from '../../../behaviors/moveto/MoveTo.js';
+export default MoveToTask;