X-Git-Url: https://git.auder.net/assets/current/git-favicon.png?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=640ccca1e26345137c607e94fc96d372aaef32eb;hb=3b959cfaf3d3a28373d7ebb48d80087150a98006;hp=03a5b6e3a218ef1260f6d202a16b547d75273f2e;hpb=4473050c257453abb37cd53d8d1e6e941c49bf91;p=vchess.git

diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index 03a5b6e3..640ccca1 100644
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -1,157 +1,148 @@
 <script>
-// This can work for squared boards (2 or 4 players), with some adaptations (TODO)
-// TODO: for 3 players, write a "board3.js"
-
 import { getSquareId, getSquareFromId } from "@/utils/squareId";
 import { ArrayFun } from "@/utils/array";
-
+import { store } from "@/store";
 export default {
-  name: 'my-board',
+  name: "my-board",
   // Last move cannot be guessed from here, and is required to highlight squares
   // vr: object to check moves, print board...
-  // mode: HH, HC or analyze
-  // userColor: for mode HH or HC
-  props: ["vr","lastMove","mode","orientation","userColor","vname"],
-  data: function () {
+  // userColor is left undefined for an external observer
+  props: [
+    "vr",
+    "lastMove",
+    "analyze",
+    "score",
+    "incheck",
+    "orientation",
+    "userColor",
+    "vname"
+  ],
+  data: function() {
     return {
-      hints: (!localStorage["hints"] ? true : localStorage["hints"] === "1"),
-      bcolor: localStorage["bcolor"] || "lichess", //lichess, chesscom or chesstempo
       possibleMoves: [], //filled after each valid click/dragstart
       choices: [], //promotion pieces, or checkered captures... (as moves)
       selectedPiece: null, //moving piece (or clicked piece)
-      incheck: [],
       start: {}, //pixels coordinates + id of starting square (click or drag)
+      settings: store.state.settings
     };
   },
   render(h) {
-    if (!this.vr)
-      return;
-    const [sizeX,sizeY] = [V.size.x,V.size.y];
+    if (!this.vr) {
+      // Return empty div of class 'game' to avoid error when setting size
+      return h("div", {
+        class: {
+          game: true
+        }
+      });
+    }
+    const [sizeX, sizeY] = [V.size.x, V.size.y];
     // Precompute hints squares to facilitate rendering
     let hintSquares = ArrayFun.init(sizeX, sizeY, false);
-    this.possibleMoves.forEach(m => { hintSquares[m.end.x][m.end.y] = true; });
+    this.possibleMoves.forEach(m => {
+      hintSquares[m.end.x][m.end.y] = true;
+    });
     // Also precompute in-check squares
     let incheckSq = ArrayFun.init(sizeX, sizeY, false);
-    this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; });
-    const squareWidth = 40; //TODO: compute this
-    const choices = h(
-      'div',
-      {
-        attrs: { "id": "choices" },
-        'class': { 'row': true },
-        style: {
-          "display": this.choices.length>0?"block":"none",
-          "top": "-" + ((sizeY/2)*squareWidth+squareWidth/2) + "px",
-          "width": (this.choices.length * squareWidth) + "px",
-          "height": squareWidth + "px",
-        },
-      },
-      this.choices.map(m => { //a "choice" is a move
-        return h('div',
-          {
-            'class': {
-              'board': true,
-              ['board'+sizeY]: true,
-            },
-            style: {
-              'width': (100/this.choices.length) + "%",
-              'padding-bottom': (100/this.choices.length) + "%",
-            },
-          },
-          [h('img',
-            {
-              attrs: { "src": '/images/pieces/' +
-                V.getPpath(m.appear[0].c+m.appear[0].p) + '.svg' },
-              'class': { 'choice-piece': true },
-              on: {
-                "click": e => { this.play(m); this.choices=[]; },
-                // NOTE: add 'touchstart' event to fix a problem on smartphones
-                "touchstart": e => { this.play(m); this.choices=[]; },
-              },
-            })
-          ]
-        );
-      })
-    );
-    // Create board element (+ reserves if needed by variant or mode)
+    this.incheck.forEach(sq => {
+      incheckSq[sq[0]][sq[1]] = true;
+    });
+
     const lm = this.lastMove;
-    const showLight = this.hints && this.vname != "Dark";
+    const showLight = this.settings.highlight && V.ShowMoves == "all";
+    const orientation = !V.CanFlip ? "w" : this.orientation;
+    // Ensure that squares colors do not change when board is flipped
+    const lightSquareMod = (sizeX + sizeY) % 2;
+    const showPiece = (x, y) => {
+      return (
+        this.vr.board[x][y] != V.EMPTY &&
+        (!this.vr.enlightened || this.analyze || this.score != "*" ||
+          (!!this.userColor && this.vr.enlightened[this.userColor][x][y]))
+      );
+    };
+    const inHighlight = (x, y) => {
+      return showLight && !!lm && (
+        (lm.end.x == x && lm.end.y == y) ||
+        (lm.start.x == x && lm.start.y == y));
+    };
+    const inShadow = (x, y) => {
+      return (
+        !this.analyze &&
+        this.score == "*" &&
+        this.vr.enlightened &&
+        (!this.userColor || !this.vr.enlightened[this.userColor][x][y])
+      );
+    };
+    // Create board element (+ reserves if needed by variant)
     const gameDiv = h(
-      'div',
+      "div",
       {
-        'class': {
-          'game': true,
-          'clearer': true,
-        },
+        class: {
+          game: true,
+          clearer: true
+        }
       },
       [...Array(sizeX).keys()].map(i => {
-        let ci = (this.orientation=='w' ? i : sizeX-i-1);
+        const ci = orientation == "w" ? i : sizeX - i - 1;
         return h(
-          'div',
+          "div",
           {
-            'class': {
-              'row': true,
+            class: {
+              row: true
             },
-            style: { 'opacity': this.choices.length>0?"0.5":"1" },
+            style: { opacity: this.choices.length > 0 ? "0.5" : "1" }
           },
           [...Array(sizeY).keys()].map(j => {
-            let cj = (this.orientation=='w' ? j : sizeY-j-1);
+            const cj = orientation == "w" ? j : sizeY - j - 1;
             let elems = [];
-            if (this.vr.board[ci][cj] != V.EMPTY && (this.vname!="Dark"
-              || this.gameOver || this.mode == "analyze"
-              || this.vr.enlightened[this.userColor][ci][cj]))
-            {
+            if (showPiece(ci, cj)) {
               elems.push(
-                h(
-                  'img',
-                  {
-                    'class': {
-                      'piece': true,
-                      'ghost': !!this.selectedPiece
-                        && this.selectedPiece.parentNode.id == "sq-"+ci+"-"+cj,
-                    },
-                    attrs: {
-                      src: require("@/assets/images/pieces/" +
-                        V.getPpath(this.vr.board[ci][cj]) + ".svg"),
-                    },
+                h("img", {
+                  class: {
+                    piece: true,
+                    ghost:
+                      !!this.selectedPiece &&
+                      this.selectedPiece.parentNode.id == "sq-" + ci + "-" + cj
+                  },
+                  attrs: {
+                    src:
+                      "/images/pieces/" +
+                      this.vr.getPpath(this.vr.board[ci][cj], this.userColor, this.score) +
+                      ".svg"
                   }
-                )
+                })
               );
             }
-            if (this.hints && hintSquares[ci][cj])
-            {
+            if (this.settings.hints && hintSquares[ci][cj]) {
               elems.push(
-                h(
-                  'img',
-                  {
-                    'class': {
-                      'mark-square': true,
-                    },
-                    attrs: {
-                      src: "/images/mark.svg",
-                    },
+                h("img", {
+                  class: {
+                    "mark-square": true
+                  },
+                  attrs: {
+                    src: "/images/mark.svg"
                   }
-                )
+                })
               );
             }
+            const lightSquare = (ci + cj) % 2 == lightSquareMod;
             return h(
-              'div',
+              "div",
               {
-                'class': {
-                  'board': true,
-                  ['board'+sizeY]: true,
-                  'light-square': (i+j)%2==0,
-                  'dark-square': (i+j)%2==1,
-                  [this.bcolor]: true,
-                  'in-shadow': this.vname=="Dark" && !this.gameOver
-                    && this.mode != "analyze"
-                    && !this.vr.enlightened[this.userColor][ci][cj],
-                  'highlight': showLight && !!lm && lm.end.x == ci && lm.end.y == cj,
-                  'incheck': showLight && incheckSq[ci][cj],
+                class: {
+                  board: true,
+                  ["board" + sizeY]: true,
+                  "light-square": lightSquare,
+                  "dark-square": !lightSquare,
+                  [this.settings.bcolor]: true,
+                  "in-shadow": inShadow(ci, cj),
+                  "highlight-light": inHighlight(ci, cj) && lightSquare,
+                  "highlight-dark": inHighlight(ci, cj) && !lightSquare,
+                  "incheck-light": showLight && lightSquare && incheckSq[ci][cj],
+                  "incheck-dark": showLight && !lightSquare && incheckSq[ci][cj]
                 },
                 attrs: {
-                  id: getSquareId({x:ci,y:cj}),
-                },
+                  id: getSquareId({ x: ci, y: cj })
+                }
               },
               elems
             );
@@ -159,189 +150,222 @@ export default {
         );
       })
     );
-    let elementArray = [choices, gameDiv];
-    if (!!this.vr.reserve)
-    {
-      const shiftIdx = (this.userColor=="w" ? 0 : 1);
+    let elementArray = [gameDiv];
+    const playingColor = this.userColor || "w"; //default for an observer
+    if (this.vr.reserve) {
+      const shiftIdx = playingColor == "w" ? 0 : 1;
       let myReservePiecesArray = [];
-      for (let i=0; i<V.RESERVE_PIECES.length; i++)
-      {
-        myReservePiecesArray.push(h('div',
-        {
-          'class': {'board':true, ['board'+sizeY]:true},
-          attrs: { id: getSquareId({x:sizeX+shiftIdx,y:i}) }
-        },
-        [
-          h('img',
-          {
-            'class': {"piece":true, "reserve":true},
-            attrs: {
-              "src": "/images/pieces/" +
-                this.vr.getReservePpath(this.userColor,i) + ".svg",
-            }
-          }),
-          h('sup',
-            {"class": { "reserve-count": true } },
-            [ this.vr.reserve[this.userColor][V.RESERVE_PIECES[i]] ]
+      for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
+        myReservePiecesArray.push(
+          h(
+            "div",
+            {
+              class: { board: true, ["board" + sizeY]: true },
+              attrs: { id: getSquareId({ x: sizeX + shiftIdx, y: i }) }
+            },
+            [
+              h("img", {
+                class: { piece: true, reserve: true },
+                attrs: {
+                  src:
+                    "/images/pieces/" +
+                    this.vr.getReservePpath(i, playingColor) +
+                    ".svg"
+                }
+              }),
+              h("sup", { class: { "reserve-count": true } }, [
+                this.vr.reserve[playingColor][V.RESERVE_PIECES[i]]
+              ])
+            ]
           )
-        ]));
+        );
       }
       let oppReservePiecesArray = [];
-      const oppCol = V.GetOppCol(this.userColor);
-      for (let i=0; i<V.RESERVE_PIECES.length; i++)
-      {
-        oppReservePiecesArray.push(h('div',
-        {
-          'class': {'board':true, ['board'+sizeY]:true},
-          attrs: { id: getSquareId({x:sizeX+(1-shiftIdx),y:i}) }
-        },
-        [
-          h('img',
-          {
-            'class': {"piece":true, "reserve":true},
-            attrs: {
-              "src": "/images/pieces/" +
-                this.vr.getReservePpath(oppCol,i) + ".svg",
-            }
-          }),
-          h('sup',
-            {"class": { "reserve-count": true } },
-            [ this.vr.reserve[oppCol][V.RESERVE_PIECES[i]] ]
+      const oppCol = V.GetOppCol(playingColor);
+      for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
+        oppReservePiecesArray.push(
+          h(
+            "div",
+            {
+              class: { board: true, ["board" + sizeY]: true },
+              attrs: { id: getSquareId({ x: sizeX + (1 - shiftIdx), y: i }) }
+            },
+            [
+              h("img", {
+                class: { piece: true, reserve: true },
+                attrs: {
+                  src:
+                    "/images/pieces/" +
+                    this.vr.getReservePpath(i, oppCol) +
+                    ".svg"
+                }
+              }),
+              h("sup", { class: { "reserve-count": true } }, [
+                this.vr.reserve[oppCol][V.RESERVE_PIECES[i]]
+              ])
+            ]
           )
-        ]));
+        );
       }
-      let reserves = h('div',
+      let reserves = h(
+        "div",
         {
-          'class':{
-            'game': true,
-            "reserve-div": true,
-          },
+          class: {
+            game: true,
+            "reserve-div": true
+          }
         },
         [
-          h('div',
+          h(
+            "div",
             {
-              'class': {
-                'row': true,
-                "reserve-row-1": true,
-              },
+              class: {
+                row: true,
+                "reserve-row-1": true
+              }
             },
             myReservePiecesArray
           ),
-          h('div',
-            { 'class': { 'row': true }},
-            oppReservePiecesArray
-          )
+          h("div", { class: { row: true } }, oppReservePiecesArray)
         ]
       );
       elementArray.push(reserves);
     }
-    return h(
-      'div',
-      {
-        'class': {
-          "col-sm-12": true,
-          "col-md-10": true,
-          "col-md-offset-1": true,
-          "col-lg-8": true,
-          "col-lg-offset-2": true,
+    const boardElt = document.querySelector(".game");
+    if (this.choices.length > 0 && !!boardElt) {
+      //no choices to show at first drawing
+      const squareWidth = boardElt.offsetWidth / sizeY;
+      const offset = [boardElt.offsetTop, boardElt.offsetLeft];
+      const choices = h(
+        "div",
+        {
+          attrs: { id: "choices" },
+          class: { row: true },
+          style: {
+            top: offset[0] + (sizeY / 2) * squareWidth - squareWidth / 2 + "px",
+            left:
+              offset[1] +
+              (squareWidth * (sizeY - this.choices.length)) / 2 +
+              "px",
+            width: this.choices.length * squareWidth + "px",
+            height: squareWidth + "px"
+          }
         },
-        // NOTE: click = mousedown + mouseup
+        this.choices.map(m => {
+          //a "choice" is a move
+          return h(
+            "div",
+            {
+              class: {
+                board: true,
+                ["board" + sizeY]: true
+              },
+              style: {
+                width: 100 / this.choices.length + "%",
+                "padding-bottom": 100 / this.choices.length + "%"
+              }
+            },
+            [
+              h("img", {
+                attrs: {
+                  src:
+                    "/images/pieces/" +
+                    this.vr.getPpath(m.appear[0].c + m.appear[0].p) +
+                    ".svg"
+                },
+                class: { "choice-piece": true },
+                on: {
+                  click: () => {
+                    this.play(m);
+                    this.choices = [];
+                  }
+                }
+              })
+            ]
+          );
+        })
+      );
+      elementArray.unshift(choices);
+    }
+    let onEvents = {};
+    // NOTE: click = mousedown + mouseup
+    if ("ontouchstart" in window) {
+      onEvents = {
         on: {
-          mousedown: this.mousedown,
-          mousemove: this.mousemove,
-          mouseup: this.mouseup,
           touchstart: this.mousedown,
           touchmove: this.mousemove,
-          touchend: this.mouseup,
-        },
-      },
-      elementArray
-    );
+          touchend: this.mouseup
+        }
+      };
+    } else {
+      onEvents = {
+        on: {
+          mousedown: this.mousedown,
+          mousemove: this.mousemove,
+          mouseup: this.mouseup
+        }
+      };
+    }
+    return h("div", onEvents, elementArray);
   },
   methods: {
     mousedown: function(e) {
-      e = e || window.event;
-      let ingame = false;
-      let elem = e.target;
-      while (!ingame && elem !== null)
-      {
-        if (elem.classList.contains("game"))
-        {
-          ingame = true;
-          break;
-        }
-        elem = elem.parentElement;
-      }
-      if (!ingame) //let default behavior (click on button...)
-        return;
+      // Abort if a piece is already being processed, or target is not a piece.
+      // NOTE: just looking at classList[0] because piece is the first assigned class
+      if (!!this.selectedPiece || e.target.classList[0] != "piece") return;
       e.preventDefault(); //disable native drag & drop
-      if (!this.selectedPiece && e.target.classList.contains("piece"))
-      {
-        // Next few lines to center the piece on mouse cursor
-        let rect = e.target.parentNode.getBoundingClientRect();
-        this.start = {
-          x: rect.x + rect.width/2,
-          y: rect.y + rect.width/2,
-          id: e.target.parentNode.id
-        };
-        this.selectedPiece = e.target.cloneNode();
-        this.selectedPiece.style.position = "absolute";
-        this.selectedPiece.style.top = 0;
-        this.selectedPiece.style.display = "inline-block";
-        this.selectedPiece.style.zIndex = 3000;
-        const startSquare = getSquareFromId(e.target.parentNode.id);
-        this.possibleMoves = [];
-        const color = this.mode=="analyze" || this.gameOver
-          ? this.vr.turn
-          : this.userColor;
-        if (this.vr.canIplay(color,startSquare))
-          this.possibleMoves = this.vr.getPossibleMovesFrom(startSquare);
-        // Next line add moving piece just after current image
-        // (required for Crazyhouse reserve)
-        e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling);
-      }
+      let parent = e.target.parentNode; //the surrounding square
+      // Next few lines to center the piece on mouse cursor
+      let rect = parent.getBoundingClientRect();
+      this.start = {
+        x: rect.x + rect.width / 2,
+        y: rect.y + rect.width / 2,
+        id: parent.id
+      };
+      this.selectedPiece = e.target.cloneNode();
+      let spStyle = this.selectedPiece.style;
+      spStyle.position = "absolute";
+      spStyle.top = 0;
+      spStyle.display = "inline-block";
+      spStyle.zIndex = 3000;
+      const startSquare = getSquareFromId(parent.id);
+      this.possibleMoves = [];
+      const color = this.analyze ? this.vr.turn : this.userColor;
+      if (this.vr.canIplay(color, startSquare))
+        this.possibleMoves = this.vr.getPossibleMovesFrom(startSquare);
+      // Next line add moving piece just after current image
+      // (required for Crazyhouse reserve)
+      parent.insertBefore(this.selectedPiece, e.target.nextSibling);
     },
     mousemove: function(e) {
-      if (!this.selectedPiece)
-        return;
-      e = e || window.event;
-      // If there is an active element, move it around
-      if (!!this.selectedPiece)
-      {
-        const [offsetX,offsetY] = !!e.clientX
-          ? [e.clientX,e.clientY] //desktop browser
-          : [e.changedTouches[0].pageX, e.changedTouches[0].pageY]; //smartphone
-        this.selectedPiece.style.left = (offsetX-this.start.x) + "px";
-        this.selectedPiece.style.top = (offsetY-this.start.y) + "px";
-      }
+      if (!this.selectedPiece) return;
+      // There is an active element: move it around
+      const [offsetX, offsetY] = e.clientX
+        ? [e.clientX, e.clientY] //desktop browser
+        : [e.changedTouches[0].pageX, e.changedTouches[0].pageY]; //smartphone
+      this.selectedPiece.style.left = offsetX - this.start.x + "px";
+      this.selectedPiece.style.top = offsetY - this.start.y + "px";
     },
     mouseup: function(e) {
-      if (!this.selectedPiece)
-        return;
-      e = e || window.event;
-      // Read drop target (or parentElement, parentNode... if type == "img")
+      if (!this.selectedPiece) return;
+      // There is an active element: obtain the move from start and end squares
       this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords
-      const [offsetX,offsetY] = !!e.clientX
-        ? [e.clientX,e.clientY]
+      const [offsetX, offsetY] = e.clientX
+        ? [e.clientX, e.clientY]
         : [e.changedTouches[0].pageX, e.changedTouches[0].pageY];
       let landing = document.elementFromPoint(offsetX, offsetY);
       this.selectedPiece.style.zIndex = 3000;
       // Next condition: classList.contains(piece) fails because of marks
-      while (landing.tagName == "IMG")
-        landing = landing.parentNode;
+      while (landing.tagName == "IMG") landing = landing.parentNode;
       if (this.start.id == landing.id)
-      {
-        // A click: selectedPiece and possibleMoves are already filled
+        // One or multi clicks on same piece
         return;
-      }
-      // OK: process move attempt
+      // OK: process move attempt, landing is a square node
       let endSquare = getSquareFromId(landing.id);
       let moves = this.findMatchingMoves(endSquare);
       this.possibleMoves = [];
-      if (moves.length > 1)
-        this.choices = moves;
-      else if (moves.length==1)
-        this.play(moves[0]);
+      if (moves.length > 1) this.choices = moves;
+      else if (moves.length == 1) this.play(moves[0]);
       // Else: impossible move
       this.selectedPiece.parentNode.removeChild(this.selectedPiece);
       delete this.selectedPiece;
@@ -351,18 +375,78 @@ export default {
       // Run through moves list and return the matching set (if promotions...)
       let moves = [];
       this.possibleMoves.forEach(function(m) {
-        if (endSquare[0] == m.end.x && endSquare[1] == m.end.y)
-          moves.push(m);
+        if (endSquare[0] == m.end.x && endSquare[1] == m.end.y) moves.push(m);
       });
       return moves;
     },
     play: function(move) {
-      this.$emit('play-move', move);
-    },
-  },
+      this.$emit("play-move", move);
+    }
+  }
 };
 </script>
 
-<style lang="sass">
-// TODO: styles to see pieces!
+<style lang="sass" scoped>
+.game.reserve-div
+  margin-bottom: 18px
+
+.reserve-count
+  padding-left: 40%
+
+.reserve-row-1
+  margin-bottom: 15px
+
+// NOTE: no variants with reserve of size != 8
+
+.game
+  width: 100%
+  margin: 0
+  .board
+    cursor: pointer
+
+#choices
+  margin: 0
+  position: absolute
+  z-index: 300
+  overflow-y: inherit
+  background-color: rgba(0,0,0,0)
+  img
+    cursor: pointer
+    background-color: #e6ee9c
+    &:hover
+      background-color: skyblue
+    &.choice-piece
+      width: 100%
+      height: auto
+      display: block
+
+img.ghost
+  position: absolute
+  opacity: 0.4
+  top: 0
+
+.highlight-light
+  background-color: rgba(0, 204, 102, 0.7) !important
+.highlight-dark
+  background-color: rgba(0, 204, 102, 0.9) !important
+
+.incheck-light
+  background-color: rgba(204, 51, 0, 0.7) !important
+.incheck-dark
+  background-color: rgba(204, 51, 0, 0.9) !important
+
+.light-square.lichess
+  background-color: #f0d9b5;
+.dark-square.lichess
+  background-color: #b58863;
+
+.light-square.chesscom
+  background-color: #e5e5ca;
+.dark-square.chesscom
+  background-color: #6f8f57;
+
+.light-square.chesstempo
+  background-color: #fdfdfd;
+.dark-square.chesstempo
+  background-color: #88a0a8;
 </style>