Draft code reorganisation (+ fix Alice rules + stateless VariantRules object)

[vchess.git] / public / javascripts / utils / printDiagram.js

diff --git a/public/javascripts/utils/printDiagram.js b/public/javascripts/utils/printDiagram.js
index 61c726e..9f7a020 100644 (file)
--- a/public/javascripts/utils/printDiagram.js
+++ b/public/javascripts/utils/printDiagram.js
@@ -1,41 +1,104 @@
-// Assuming V(ariantRules) class is loaded.
-// args: object with position (mandatory), orientation, marks (optional)
-function getDiagram(args)
+// Turn (human) marks into coordinates
+function getMarkArray(marks)
 {
-       const [sizeX,sizeY] = [V.size.x,V.size.y];
-       // Obtain array of pieces images names
-       const board = VariantRules.GetBoard(args.position);
-       const orientation = args.orientation || "w";
-       let markArray = [];
-       if (!!args.marks)
+       if (!marks || marks == "-")
+               return [];
+       let markArray = doubleArray(V.size.x, V.size.y, false);
+       const squares = marks.split(",");
+       for (let i=0; i<squares.length; i++)
        {
-               // Turn (human) marks into coordinates
-               markArray = doubleArray(sizeX, sizeY, false);
-               let squares = args.marks.split(",");
-               for (let i=0; i<squares.length; i++)
+               const coords = V.SquareToCoords(squares[i]);
+               markArray[coords.x][coords.y] = true;
+       }
+       return markArray;
+}
+
+// Turn (human) shadow indications into coordinates
+function getShadowArray(shadow)
+{
+       if (!shadow || shadow == "-")
+               return [];
+       let shadowArray = doubleArray(V.size.x, V.size.y, false);
+       const squares = shadow.split(",");
+       for (let i=0; i<squares.length; i++)
+       {
+               const rownum = V.size.x - parseInt(squares[i]);
+               if (!isNaN(rownum))
+               {
+                       // Shadow a full row
+                       for (let i=0; i<V.size.y; i++)
+                               shadowArray[rownum][i] = true;
+                       continue;
+               }
+               if (squares[i].length == 1)
                {
-                       const res = /^([a-z]+)([0-9]+)$/i.exec(squares[i]);
-                       const coords = V.SquareToCoords(res);
-                       markArray[coords.x][coords.y] = true;
+                       // Shadow a full column
+                       const colnum = V.ColumnToCoord(squares[i]);
+                       for (let i=0; i<V.size.x; i++)
+                               shadowArray[i][colnum] = true;
+                       continue;
                }
+               if (squares[i].indexOf("-") >= 0)
+               {
+                       // Shadow a range of squares, horizontally or vertically
+                       const firstLastSq = squares[i].split("-");
+                       const range =
+                       [
+                               V.SquareToCoords(firstLastSq[0]),
+                               V.SquareToCoords(firstLastSq[1])
+                       ];
+                       const step =
+                       [
+                               range[1].x == range[0].x
+                                       ? 0
+                                       : (range[1].x - range[0].x) / Math.abs(range[1].x - range[0].x),
+                               range[1].y == range[0].y
+                                       ? 0
+                                       : (range[1].y - range[0].y) / Math.abs(range[1].y - range[0].y)
+                       ];
+                       // Convention: range always from smaller to larger number
+                       for (let x=range[0].x, y=range[0].y; x <= range[1].x && y <= range[1].y;
+                               x += step[0], y += step[1])
+                       {
+                               shadowArray[x][y] = true;
+                       }
+                       continue;
+               }
+               // Shadow just one square:
+               const coords = V.SquareToCoords(squares[i]);
+               shadowArray[coords.x][coords.y] = true;
        }
+       return shadowArray;
+}
+
+// args: object with position (mandatory), and
+// orientation, marks, shadow (optional)
+function getDiagram(args)
+{
+       // Obtain the array of pieces images names:
+       const board = VariantRules.GetBoard(args.position);
+       const orientation = args.orientation || "w";
+       const markArray = getMarkArray(args.marks);
+       const shadowArray = getShadowArray(args.shadow);
        let boardDiv = "";
        const [startX,startY,inc] = orientation == 'w'
                ? [0, 0, 1]
-               : [sizeX-1, sizeY-1, -1];
-       for (let i=startX; i>=0 && i<sizeX; i+=inc)
+               : [V.size.x-1, V.size.y-1, -1];
+       for (let i=startX; i>=0 && i<V.size.x; i+=inc)
        {
                boardDiv += "<div class='row'>";
-               for (let j=startY; j>=0 && j<sizeY; j+=inc)
+               for (let j=startY; j>=0 && j<V.size.y; j+=inc)
                {
-                       boardDiv += "<div class='board board" + sizeY + " " +
-                               ((i+j)%2==0 ? "light-square-diag" : "dark-square-diag") + "'>";
+                       boardDiv += "<div class='board board" + V.size.y + " " +
+                               ((i+j)%2==0 ? "light-square-diag" : "dark-square-diag") +
+                               (shadowArray.length > 0 && shadowArray[i][j] ? " in-shadow" : "") +
+                               "'>";
                        if (board[i][j] != V.EMPTY)
                        {
                                boardDiv += "<img src='/images/pieces/" +
                                        V.getPpath(board[i][j]) + ".svg' class='piece'/>";
                        }
-                       if (!!args.marks && markArray[i][j])
+                       if (markArray.length > 0 && markArray[i][j])
                                boardDiv += "<img src='/images/mark.svg' class='mark-square'/>";
                        boardDiv += "</div>";
                }