Skip to content

Commit

Permalink
Have stone removal X's be territory color (or grey/red)
Browse files Browse the repository at this point in the history
  • Loading branch information
@anoek
anoek committed Jun 26, 2024
1 parent 0775222 commit 89d4554
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 16 deletions.
47 changes: 39 additions & 8 deletions src/Goban/CanvasRenderer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,7 @@ export class GobanCanvas extends Goban implements GobanCanvasInterface {
}

/* Draw stones & hovers */
let draw_red_x = false;
let draw_removal_x = false;
{
if (
stone_color /* if there is really a stone here */ ||
Expand Down Expand Up @@ -1738,12 +1738,12 @@ export class GobanCanvas extends Goban implements GobanCanvasInterface {
this.score_estimator.removal[j][i]) ||
pos.stone_removed
) {
draw_red_x = true;
draw_removal_x = true;
}
}
}
if (
draw_red_x ||
draw_removal_x ||
(this.mode === "analyze" &&
this.analyze_tool === "removal" &&
this.last_hover_square &&
Expand All @@ -1756,6 +1756,9 @@ export class GobanCanvas extends Goban implements GobanCanvasInterface {
this.last_hover_square.x === i &&
this.last_hover_square.y === j)
) {
const color =
this.engine.board[j][i] === JGOFNumericPlayerColor.BLACK ? "black" : "white";

const opacity = this.engine.board[j][i] ? 1.0 : 0.2;
ctx.lineCap = "square";
ctx.save();
Expand All @@ -1767,7 +1770,27 @@ export class GobanCanvas extends Goban implements GobanCanvasInterface {
ctx.lineTo(cx + r, cy + r);
ctx.moveTo(cx + r, cy - r);
ctx.lineTo(cx - r, cy + r);
ctx.strokeStyle = "#ff0000";

if (pos.score === "black" && color === "white") {
ctx.strokeStyle = this.theme_white_text_color;
} else if (pos.score === "white" && color === "black") {
ctx.strokeStyle = this.theme_black_text_color;
} else if (
(pos.score === "white" && color === "white") ||
(pos.score === "black" && color === "black")
) {
// score point for the same color where the stone is removed
// should call special attention to it
ctx.strokeStyle = "#ff0000";
} else {
// otherwise, no score but removed stones can happen when
// territory isn't properly sealed, so we are going to mark
// it grey to avoid calling too much attention, but still
// denote that removing these stones doesn't result in
// the territory being territory yet.
ctx.strokeStyle = "#888888";
}

ctx.stroke();
ctx.restore();
draw_last_move = false;
Expand Down Expand Up @@ -2295,7 +2318,7 @@ export class GobanCanvas extends Goban implements GobanCanvasInterface {
}

/* Draw stones & hovers */
let draw_red_x = false;
let draw_removal_x = false;
{
if (
stone_color /* if there is really a stone here */ ||
Expand Down Expand Up @@ -2389,15 +2412,15 @@ export class GobanCanvas extends Goban implements GobanCanvasInterface {
//(this.mode === "analyze" && pos.stone_removed)
pos.stone_removed
) {
draw_red_x = true;
draw_removal_x = true;
}

ret += (translucent ? "T" : "") + color + ",";
}
}

if (
draw_red_x ||
draw_removal_x ||
(this.mode === "analyze" &&
this.analyze_tool === "removal" &&
this.last_hover_square &&
Expand All @@ -2410,7 +2433,15 @@ export class GobanCanvas extends Goban implements GobanCanvasInterface {
this.last_hover_square.x === i &&
this.last_hover_square.y === j)
) {
ret += "redX";
const color =
this.engine.board[j][i] === JGOFNumericPlayerColor.BLACK ? "black" : "white";
if (pos.score === "black" && color === "white") {
ret += "whiteX";
} else if (pos.score === "white" && color === "black") {
ret += "blackX";
} else {
ret += "redX";
}
}

/* Draw square highlights if any */
Expand Down
47 changes: 39 additions & 8 deletions src/Goban/SVGRenderer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,7 @@ export class SVGRenderer extends Goban implements GobanSVGInterface {
}

/* Draw stones & hovers */
let draw_red_x = false;
let draw_removal_x = false;
{
if (
stone_color /* if there is really a stone here */ ||
Expand Down Expand Up @@ -1657,13 +1657,13 @@ export class SVGRenderer extends Goban implements GobanSVGInterface {
//(this.mode === "analyze" && pos.stone_removed)
pos.stone_removed
) {
draw_red_x = true;
draw_removal_x = true;
}
}
}

if (
draw_red_x ||
draw_removal_x ||
(this.mode === "analyze" &&
this.analyze_tool === "removal" &&
this.last_hover_square &&
Expand All @@ -1679,7 +1679,30 @@ export class SVGRenderer extends Goban implements GobanSVGInterface {
const r = Math.max(1, this.metrics.mid * 0.75);
const cross = document.createElementNS("http://www.w3.org/2000/svg", "path");
cross.setAttribute("class", "removal-cross");
cross.setAttribute("stroke", "#ff0000");
const color =
this.engine.board[j][i] === JGOFNumericPlayerColor.BLACK ? "black" : "white";

if (pos.score === "black" && color === "white") {
cross.setAttribute("stroke", this.theme_white_text_color);
} else if (pos.score === "white" && color === "black") {
cross.setAttribute("stroke", this.theme_black_text_color);
} else if (
(pos.score === "white" && color === "white") ||
(pos.score === "black" && color === "black")
) {
// score point for the same color where the stone is removed
// should call special attention to it
cross.setAttribute("stroke", "#ff0000");
} else {
// otherwise, no score but removed stones can happen when
// territory isn't properly sealed, so we are going to mark
// it grey to avoid calling too much attention, but still
// denote that removing these stones doesn't result in
// the territory being territory yet.
cross.setAttribute("stroke", "#888888");
}

//cross.setAttribute("stroke", "#ff0000");
cross.setAttribute("stroke-width", `${this.square_size * 0.125}px`);
cross.setAttribute("fill", "none");
cross.setAttribute(
Expand Down Expand Up @@ -2241,7 +2264,7 @@ export class SVGRenderer extends Goban implements GobanSVGInterface {
}

/* Draw stones & hovers */
let draw_red_x = false;
let draw_removal_x = false;
{
if (
stone_color /* if there is really a stone here */ ||
Expand Down Expand Up @@ -2344,15 +2367,15 @@ export class SVGRenderer extends Goban implements GobanSVGInterface {
//(this.mode === "analyze" && pos.stone_removed)
pos.stone_removed
) {
draw_red_x = true;
draw_removal_x = true;
}

ret += (translucent ? "T" : "") + color + ",";
}
}

if (
draw_red_x ||
draw_removal_x ||
(this.mode === "analyze" &&
this.analyze_tool === "removal" &&
this.last_hover_square &&
Expand All @@ -2365,7 +2388,15 @@ export class SVGRenderer extends Goban implements GobanSVGInterface {
this.last_hover_square.x === i &&
this.last_hover_square.y === j)
) {
ret += "redX";
const color =
this.engine.board[j][i] === JGOFNumericPlayerColor.BLACK ? "black" : "white";
if (pos.score === "black" && color === "white") {
ret += "whiteX";
} else if (pos.score === "white" && color === "black") {
ret += "blackX";
} else {
ret += "redX";
}
}

/* Draw square highlights if any */
Expand Down

0 comments on commit 89d4554

Please sign in to comment.