X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=5a21771db5075458c97a748a53f3999e0b46edc1;hb=baa6f86f72e3b697ec2fcd34913986b2fa5f02eb;hp=8a42d34eaff8738e53078c9d68396d212e3a7e36;hpb=cd49e617866590dbc68530ad961b109cdbe1ce55;p=vchess.git
diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index 8a42d34e..5a21771d 100644
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -22,10 +22,11 @@ export default {
mobileBrowser: ("ontouchstart" in window),
possibleMoves: [], //filled after each valid click/dragstart
choices: [], //promotion pieces, or checkered captures... (as moves)
+ containerPos: null,
selectedPiece: null, //moving piece (or clicked piece)
start: null, //pixels coordinates + id of starting square (click or drag)
startArrow: null,
- movingArrow: { x: -1, y: -1 },
+ movingArrow: null,
arrows: [], //object of {start: x,y / end: x,y}
circles: {}, //object of squares' ID --> true (TODO: use a set?)
click: "",
@@ -36,11 +37,10 @@ export default {
render(h) {
if (!this.vr) {
// Return empty div of class 'game' to avoid error when setting size
- return h("div", {
- class: {
- game: true
- }
- });
+ return h(
+ "div",
+ { "class": { game: true } }
+ );
}
const [sizeX, sizeY] = [V.size.x, V.size.y];
// Precompute hints squares to facilitate rendering
@@ -68,11 +68,11 @@ export default {
}
const showLight = (
this.settings.highlight &&
- ["all","highlight"].includes(V.ShowMoves)
+ ["all", "highlight"].includes(V.ShowMoves)
);
const showCheck = (
this.settings.highlight &&
- ["all","highlight","byrow"].includes(V.ShowMoves)
+ ["all", "highlight", "byrow"].includes(V.ShowMoves)
);
const orientation = !V.CanFlip ? "w" : this.orientation;
// Ensure that squares colors do not change when board is flipped
@@ -100,6 +100,7 @@ export default {
const gameDiv = h(
"div",
{
+ attrs: { id: "gamePosition" },
"class": {
game: true,
clearer: true
@@ -120,27 +121,28 @@ export default {
const squareId = "sq-" + ci + "-" + cj;
let elems = [];
if (showPiece(ci, cj)) {
- elems.push(
- h("img", {
- "class": {
- piece: true,
- ghost:
- !!this.selectedPiece &&
- this.selectedPiece.parentNode.id == squareId
- },
- attrs: {
- src:
- "/images/pieces/" +
- this.vr.getPpath(
- this.vr.board[ci][cj],
- // Extra args useful for some variants:
- this.userColor,
- this.score,
- this.orientation) +
- V.IMAGE_EXTENSION
- }
- })
- );
+ let pieceSpecs = {
+ "class": {
+ piece: true,
+ ghost:
+ !!this.selectedPiece &&
+ this.selectedPiece.parentNode.id == squareId
+ },
+ attrs: {
+ src:
+ "/images/pieces/" +
+ this.vr.getPpath(
+ this.vr.board[ci][cj],
+ // Extra args useful for some variants:
+ this.userColor,
+ this.score,
+ this.orientation) +
+ V.IMAGE_EXTENSION
+ }
+ };
+ if (this.arrows.length == 0)
+ pieceSpecs["style"] = { position: "absolute" };
+ elems.push(h("img", pieceSpecs));
}
if (this.settings.hints && hintSquares[ci][cj]) {
elems.push(
@@ -173,12 +175,16 @@ export default {
"class": {
board: true,
["board" + sizeY]: true,
- "light-square": lightSquare,
- "dark-square": !lightSquare,
+ "light-square":
+ !V.Notoodark && lightSquare && !V.Monochrome,
+ "dark-square":
+ !V.Notoodark && (!lightSquare || !!V.Monochrome),
+ "middle-square": V.Notoodark,
[this.settings.bcolor]: true,
"in-shadow": inShadow(ci, cj),
"highlight-light": inHighlight(ci, cj) && lightSquare,
- "highlight-dark": inHighlight(ci, cj) && !lightSquare,
+ "highlight-dark":
+ inHighlight(ci, cj) && (V.Monochrome || !lightSquare),
"incheck-light":
showCheck && lightSquare && incheckSq[ci][cj],
"incheck-dark":
@@ -197,6 +203,8 @@ export default {
if (!!this.vr.reserve) {
const playingColor = this.userColor || "w"; //default for an observer
const shiftIdx = playingColor == "w" ? 0 : 1;
+ // Some variants have more than sizeY reserve pieces (Clorange: 10)
+ const reserveSquareNb = Math.max(sizeY, V.RESERVE_PIECES.length);
let myReservePiecesArray = [];
for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
const qty = this.vr.reserve[playingColor][V.RESERVE_PIECES[i]];
@@ -204,12 +212,13 @@ export default {
h(
"div",
{
- "class": { board: true, ["board" + sizeY]: true },
+ "class": { board: true, ["board" + reserveSquareNb]: true },
attrs: { id: getSquareId({ x: sizeX + shiftIdx, y: i }) },
style: { opacity: qty > 0 ? 1 : 0.35 }
},
[
h("img", {
+ // NOTE: class "reserve" not used currently
"class": { piece: true, reserve: true },
attrs: {
src:
@@ -218,7 +227,14 @@ export default {
".svg"
}
}),
- h("sup", { "class": { "reserve-count": true } }, [ qty ])
+ h(
+ "sup",
+ {
+ "class": { "reserve-count": true },
+ style: { top: "calc(100% + 5px)" }
+ },
+ [ qty ]
+ )
]
)
);
@@ -231,7 +247,7 @@ export default {
h(
"div",
{
- "class": { board: true, ["board" + sizeY]: true },
+ "class": { board: true, ["board" + reserveSquareNb]: true },
attrs: { id: getSquareId({ x: sizeX + (1 - shiftIdx), y: i }) },
style: { opacity: qty > 0 ? 1 : 0.35 }
},
@@ -245,7 +261,14 @@ export default {
".svg"
}
}),
- h("sup", { "class": { "reserve-count": true } }, [ qty ])
+ h(
+ "sup",
+ {
+ "class": { "reserve-count": true },
+ style: { top: "calc(100% + 5px)" }
+ },
+ [ qty ]
+ )
]
)
);
@@ -256,7 +279,8 @@ export default {
);
// Center reserves, assuming same number of pieces for each side:
const nbReservePieces = myReservePiecesArray.length;
- const marginLeft = ((100 - nbReservePieces * (100 / sizeY)) / 2) + "%";
+ const marginLeft =
+ ((100 - nbReservePieces * (100 / reserveSquareNb)) / 2) + "%";
const reserveTop =
h(
"div",
@@ -311,12 +335,10 @@ export default {
}
elementArray.push(gameDiv);
if (!!this.vr.reserve) elementArray.push(reserveBottom);
- const boardElt = document.querySelector(".game");
- // boardElt might be undefine (at first drawing),
- // but it won't be used in this case.
- const squareWidth = (!!boardElt ? boardElt.offsetWidth / sizeY : 42);
+ const boardElt = document.getElementById("gamePosition");
+ // boardElt might be undefine (at first drawing)
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 maxNbeltsPerRow = Math.min(this.choices.length, sizeY);
let topOffset = offset[0] + (sizeY / 2) * squareWidth - squareWidth / 2;
@@ -391,98 +413,6 @@ export default {
);
elementArray.unshift(choices);
}
- if (
- !this.mobileBrowser &&
- (this.arrows.length > 0 || this.movingArrow.x >= 0)
- ) {
- let svgArrows = [];
- const arrowWidth = squareWidth / 4;
- this.arrows.forEach(a => {
- const endPoint = this.adjustEndArrow(a.start, a.end, squareWidth);
- svgArrows.push(
- h(
- "path",
- {
- "class": { "svg-arrow": true },
- attrs: {
- d: (
- "M" + a.start.x + "," + a.start.y + " " +
- "L" + endPoint.x + "," + endPoint.y
- ),
- style: "stroke-width:" + arrowWidth + "px"
- }
- }
- )
- );
- });
- if (this.movingArrow.x >= 0) {
- const endPoint =
- this.adjustEndArrow(this.startArrow, this.movingArrow, squareWidth);
- svgArrows.push(
- h(
- "path",
- {
- "class": { "svg-arrow": true },
- attrs: {
- d: (
- "M" + this.startArrow.x + "," + this.startArrow.y + " " +
- "L" + endPoint.x + "," + endPoint.y
- ),
- style: "stroke-width:" + arrowWidth + "px"
- }
- }
- )
- );
- }
- // Add SVG element for drawing arrows
- elementArray.push(
- h(
- "svg",
- {
- attrs: {
- id: "arrowCanvas",
- stroke: "none"
- }
- },
- [
- h(
- "defs",
- {},
- [
- h(
- "marker",
- {
- attrs: {
- id: "arrow",
- markerWidth: (2 * arrowWidth) + "px",
- markerHeight: (3 * arrowWidth) + "px",
- markerUnits: "userSpaceOnUse",
- refX: "0",
- refY: (1.5 * arrowWidth) + "px",
- orient: "auto"
- }
- },
- [
- h(
- "path",
- {
- "class": { "arrow-head": true },
- attrs: {
- d: (
- "M0,0 L0," + (3 * arrowWidth) + " L" +
- (2 * arrowWidth) + "," + (1.5 * arrowWidth) + " z"
- )
- }
- }
- )
- ]
- )
- ]
- )
- ].concat(svgArrows)
- )
- );
- }
let onEvents = {};
// NOTE: click = mousedown + mouseup
if (this.mobileBrowser) {
@@ -503,7 +433,16 @@ export default {
}
};
}
- return h("div", onEvents, elementArray);
+ return (
+ h(
+ "div",
+ Object.assign({ attrs: { id: "rootBoardElement" } }, onEvents),
+ elementArray
+ )
+ );
+ },
+ updated: function() {
+ this.re_setDrawings();
},
methods: {
blockContextMenu: function(e) {
@@ -515,18 +454,163 @@ export default {
this.startArrow = null;
this.arrows = [];
this.circles = {};
+ const curCanvas = document.getElementById("arrowCanvas");
+ if (!!curCanvas) curCanvas.parentNode.removeChild(curCanvas);
},
- adjustEndArrow: function(start, end, squareWidth) {
+ coordsToXY: function(coords, top, left, squareWidth) {
+ return {
+ // [1] for x and [0] for y because conventions in rules are inversed.
+ x: (
+ left + window.scrollX +
+ (
+ squareWidth *
+ (this.orientation == 'w' ? coords[1] : (V.size.y - coords[1]))
+ )
+ ),
+ y: (
+ top + window.scrollY +
+ (
+ squareWidth *
+ (this.orientation == 'w' ? coords[0] : (V.size.x - coords[0]))
+ )
+ )
+ };
+ },
+ computeEndArrow: function(start, end, top, left, squareWidth) {
+ const endCoords = this.coordsToXY(end, top, left, squareWidth);
+ const delta = [endCoords.x - start.x, endCoords.y - start.y];
+ const dist = Math.sqrt(delta[0] * delta[0] + delta[1] * delta[1]);
// Simple heuristic for now, just remove 1/3 square.
// TODO: should depend on the orientation.
- const delta = [end.x - start.x, end.y - start.y];
- const dist = Math.sqrt(delta[0] * delta[0] + delta[1] * delta[1]);
const fracSqWidth = squareWidth / 3;
return {
- x: end.x - delta[0] * fracSqWidth / dist,
- y: end.y - delta[1] * fracSqWidth / dist
+ x: endCoords.x - delta[0] * fracSqWidth / dist,
+ y: endCoords.y - delta[1] * fracSqWidth / dist
};
},
+ drawCurrentArrow: function() {
+ const boardElt = document.getElementById("gamePosition");
+ const squareWidth = boardElt.offsetWidth / V.size.y;
+ const bPos = boardElt.getBoundingClientRect();
+ const aStart =
+ this.coordsToXY(
+ [this.startArrow[0] + 0.5, this.startArrow[1] + 0.5],
+ bPos.top, bPos.left, squareWidth);
+ const aEnd =
+ this.computeEndArrow(
+ aStart, [this.movingArrow[0] + 0.5, this.movingArrow[1] + 0.5],
+ bPos.top, bPos.left, squareWidth);
+ let currentArrow = document.getElementById("currentArrow");
+ const d =
+ "M" + aStart.x + "," + aStart.y + " " + "L" + aEnd.x + "," + aEnd.y;
+ const arrowWidth = squareWidth / 4;
+ if (!!currentArrow) currentArrow.setAttribute("d", d);
+ else {
+ let domArrow =
+ document.createElementNS("http://www.w3.org/2000/svg", "path");
+ domArrow.classList.add("svg-arrow");
+ domArrow.id = "currentArrow";
+ domArrow.setAttribute("d", d);
+ domArrow.style = "stroke-width:" + arrowWidth + "px";
+ document.getElementById("arrowCanvas")
+ .insertAdjacentElement("beforeend", domArrow);
+ }
+ },
+ addArrow: function(arrow) {
+ this.arrows.push(arrow);
+ // Also add to DOM:
+ const boardElt = document.getElementById("gamePosition");
+ const squareWidth = boardElt.offsetWidth / V.size.y;
+ const bPos = boardElt.getBoundingClientRect();
+ const newArrow =
+ this.getSvgArrow(arrow, bPos.top, bPos.left, squareWidth);
+ document.getElementById("arrowCanvas")
+ .insertAdjacentElement("beforeend", newArrow);
+ },
+ getSvgArrow: function(arrow, top, left, squareWidth) {
+ const aStart =
+ this.coordsToXY(
+ [arrow.start[0] + 0.5, arrow.start[1] + 0.5],
+ top, left, squareWidth);
+ const aEnd =
+ this.computeEndArrow(
+ aStart, [arrow.end[0] + 0.5, arrow.end[1] + 0.5],
+ top, left, squareWidth);
+ const arrowWidth = squareWidth / 4;
+ let path =
+ document.createElementNS("http://www.w3.org/2000/svg", "path");
+ path.classList.add("svg-arrow");
+ path.setAttribute(
+ "d",
+ "M" + aStart.x + "," + aStart.y + " " + "L" + aEnd.x + "," + aEnd.y
+ );
+ path.style = "stroke-width:" + arrowWidth + "px";
+ return path;
+ },
+ re_setDrawings: function() {
+ // Remove current canvas, if any
+ const curCanvas = document.getElementById("arrowCanvas");
+ if (!!curCanvas) curCanvas.parentNode.removeChild(curCanvas);
+ // Add some drawing on board (for some variants + arrows and circles)
+ const boardElt = document.getElementById("gamePosition");
+ const squareWidth = boardElt.offsetWidth / V.size.y;
+ const bPos = boardElt.getBoundingClientRect();
+ let svgArrows = [];
+ this.arrows.forEach(a => {
+ svgArrows.push(this.getSvgArrow(a, bPos.top, bPos.left, squareWidth));
+ });
+ let vLines = [];
+ if (!!V.Lines) {
+ V.Lines.forEach(line => {
+ const lStart =
+ this.coordsToXY(line[0], bPos.top, bPos.left, squareWidth);
+ const lEnd =
+ this.coordsToXY(line[1], bPos.top, bPos.left, squareWidth);
+ let path =
+ document.createElementNS("http://www.w3.org/2000/svg", "path");
+ if (line[0][0] == line[1][0] || line[0][1] == line[1][1])
+ path.classList.add("svg-line");
+ else
+ // "Diagonals" are drawn with a lighter color (TODO: generalize)
+ path.classList.add("svg-diag");
+ path.setAttribute(
+ "d",
+ "M" + lStart.x + "," + lStart.y + " " +
+ "L" + lEnd.x + "," + lEnd.y
+ );
+ vLines.push(path);
+ });
+ }
+ let arrowCanvas =
+ document.createElementNS("http://www.w3.org/2000/svg", "svg");
+ arrowCanvas.id = "arrowCanvas";
+ arrowCanvas.setAttribute("stroke", "none");
+ let defs =
+ document.createElementNS("http://www.w3.org/2000/svg", "defs");
+ const arrowWidth = squareWidth / 4;
+ let marker =
+ document.createElementNS("http://www.w3.org/2000/svg", "marker");
+ marker.id = "arrow";
+ marker.setAttribute("markerWidth", (2 * arrowWidth) + "px");
+ marker.setAttribute("markerHeight", (3 * arrowWidth) + "px");
+ marker.setAttribute("markerUnits", "userSpaceOnUse");
+ marker.setAttribute("refX", "0");
+ marker.setAttribute("refY", (1.5 * arrowWidth) + "px");
+ marker.setAttribute("orient", "auto");
+ let head =
+ document.createElementNS("http://www.w3.org/2000/svg", "path");
+ head.classList.add("arrow-head");
+ head.setAttribute(
+ "d",
+ "M0,0 L0," + (3 * arrowWidth) + " L" +
+ (2 * arrowWidth) + "," + (1.5 * arrowWidth) + " z"
+ );
+ marker.appendChild(head);
+ defs.appendChild(marker);
+ arrowCanvas.appendChild(defs);
+ svgArrows.concat(vLines).forEach(av => arrowCanvas.appendChild(av));
+ document.getElementById("rootBoardElement").appendChild(arrowCanvas);
+ },
mousedown: function(e) {
e.preventDefault();
if (!this.mobileBrowser && e.which != 3)
@@ -535,6 +619,8 @@ export default {
if (this.mobileBrowser || e.which == 1) {
// Mouse left button
if (!this.start) {
+ this.containerPos =
+ document.getElementById("boardContainer").getBoundingClientRect();
// NOTE: classList[0] is enough: 'piece' is the first assigned class
const withPiece = (e.target.classList[0] == "piece");
// Emit the click event which could be used by some variants
@@ -576,27 +662,49 @@ export default {
}
} else if (e.which == 3) {
// Mouse right button
+ this.containerPos =
+ document.getElementById("gamePosition").getBoundingClientRect();
let elem = e.target;
// Next loop because of potential marks
while (elem.tagName == "IMG") elem = elem.parentNode;
- // To center the arrow in square:
- const rect = elem.getBoundingClientRect();
- this.startArrow = {
- x: rect.x + rect.width / 2,
- y: rect.y + rect.width / 2,
- id: elem.id
- };
+ this.startArrow = getSquareFromId(elem.id);
}
},
mousemove: function(e) {
if (!this.selectedPiece && !this.startArrow) return;
+ // Cancel if off boardContainer
+ const [offsetX, offsetY] =
+ this.mobileBrowser
+ ? [e.changedTouches[0].clientX, e.changedTouches[0].clientY]
+ : [e.clientX, e.clientY];
+ if (
+ offsetX < this.containerPos.left ||
+ offsetX > this.containerPos.right ||
+ offsetY < this.containerPos.top ||
+ offsetY > this.containerPos.bottom
+ ) {
+ if (!!this.selectedPiece) {
+ this.selectedPiece.parentNode.removeChild(this.selectedPiece);
+ delete this.selectedPiece;
+ this.selectedPiece = null;
+ this.start = null;
+ this.possibleMoves = []; //in case of
+ this.click = "";
+ let selected = document.querySelector(".ghost");
+ if (!!selected) selected.classList.remove("ghost");
+ }
+ else {
+ this.startArrow = null;
+ this.movingArrow = null;
+ const currentArrow = document.getElementById("currentArrow");
+ if (!!currentArrow)
+ currentArrow.parentNode.removeChild(currentArrow);
+ }
+ return;
+ }
e.preventDefault();
if (!!this.selectedPiece) {
// There is an active element: move it around
- const [offsetX, offsetY] =
- this.mobileBrowser
- ? [e.changedTouches[0].pageX, e.changedTouches[0].pageY]
- : [e.clientX, e.clientY];
Object.assign(
this.selectedPiece.style,
{
@@ -610,12 +718,13 @@ export default {
// Next loop because of potential marks
while (elem.tagName == "IMG") elem = elem.parentNode;
// To center the arrow in square:
- if (elem.id != this.startArrow.id) {
- const rect = elem.getBoundingClientRect();
- this.movingArrow = {
- x: rect.x + rect.width / 2,
- y: rect.y + rect.width / 2
- };
+ const movingCoords = getSquareFromId(elem.id);
+ if (
+ movingCoords[0] != this.startArrow[0] ||
+ movingCoords[1] != this.startArrow[1]
+ ) {
+ this.movingArrow = movingCoords;
+ this.drawCurrentArrow();
}
}
},
@@ -629,8 +738,9 @@ export default {
this.selectedPiece = null;
this.processMoveAttempt(e);
} else if (e.which == 3) {
+ if (!this.startArrow) return;
// Mouse right button
- this.movingArrow = { x: -1, y: -1 };
+ this.movingArrow = null;
this.processArrowAttempt(e);
}
},
@@ -645,7 +755,7 @@ export default {
// Obtain the move from start and end squares
const [offsetX, offsetY] =
this.mobileBrowser
- ? [e.changedTouches[0].pageX, e.changedTouches[0].pageY]
+ ? [e.changedTouches[0].clientX, e.changedTouches[0].clientY]
: [e.clientX, e.clientY];
let landing = document.elementFromPoint(offsetX, offsetY);
// Next condition: classList.contains(piece) fails because of marks
@@ -676,21 +786,21 @@ export default {
let landing = document.elementFromPoint(offsetX, offsetY);
// Next condition: classList.contains(piece) fails because of marks
while (landing.tagName == "IMG") landing = landing.parentNode;
- if (this.startArrow.id == landing.id)
+ const landingCoords = getSquareFromId(landing.id);
+ if (
+ this.startArrow[0] == landingCoords[0] &&
+ this.startArrow[1] == landingCoords[1]
+ ) {
// Draw (or erase) a circle
this.$set(this.circles, landing.id, !this.circles[landing.id]);
+ }
else {
// OK: add arrow, landing is a new square
- const rect = landing.getBoundingClientRect();
- this.arrows.push({
- start: {
- x: this.startArrow.x,
- y: this.startArrow.y
- },
- end: {
- x: rect.x + rect.width / 2,
- y: rect.y + rect.width / 2
- }
+ const currentArrow = document.getElementById("currentArrow");
+ currentArrow.parentNode.removeChild(currentArrow);
+ this.addArrow({
+ start: this.startArrow,
+ end: landingCoords
});
}
this.startArrow = null;
@@ -710,14 +820,44 @@ export default {
};
+
+