Skip to content

Commit

Permalink
refactor / rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@h908714124
h908714124 committed Aug 12, 2024
1 parent 655c3ef commit 3d33773
Show file tree
Hide file tree
Showing 5 changed files with 181 additions and 171 deletions.
2 changes: 1 addition & 1 deletion src/main/client/src/Router.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
} from "./Lobby.jsx"
import {
Game,
} from "./Game.jsx"
} from "./feature/game/Game.jsx"
import {
base,
StompContext,
Expand Down
180 changes: 15 additions & 165 deletions src/main/client/src/Game.jsx → src/main/client/src/feature/game/Game.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,26 @@ import {
base,
StompContext,
BLACK,
TERRITORY,
TERRITORY_B,
REMOVED_B,
ANY_REMOVED,
tfetch,
doTry,
} from "./util.js"
} from "../../util.js"
import {
PointList,
} from "./model/PointList.js"
import {
GamePanel,
} from "./feature/GamePanel.jsx"
} from "../../model/PointList.js"
import {
useAuthStore,
useGameStore,
} from "./store.js"

const kirsch = "#dfbd6d"
const asch = "#8c7130"
const TAU = 2 * Math.PI
const decoX = ["A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T"]
} from "../../store.js"
import {
paintShadow,
paintGrid,
paintBoardDecorations,
paintStones,
paintStonesCounting,
} from "./paint.js"
import {
GamePanel,
} from "./GamePanel.jsx"

export const Game = () => {
let [cursor_x, setCursor_x] = useState(-1)
Expand Down Expand Up @@ -215,7 +213,7 @@ export const Game = () => {
let style = currentColor() === BLACK ?
"rgba(0,0,0,0.25)" :
"rgba(255,255,255,0.25)"
showShadow(context, cursor_x, cursor_y, style)
paintShadow(context, cursor_x, cursor_y, style)
}, [cursor_x, cursor_y, context, canvasRef, auth, currentColor, board, currentPlayer, counting, countingGroup, forbidden_x, forbidden_y, lastMove])

useEffect(() => {
Expand Down Expand Up @@ -262,106 +260,6 @@ export const Game = () => {
)
}

function showTerritory({ canvasRef, grid, territoryRadius }, grid_x, grid_y, style) {
let [x, y] = grid[grid_y][grid_x]
let ctx = canvasRef.current.getContext("2d")
ctx.fillStyle = style
ctx.beginPath()
ctx.arc(x, y, territoryRadius, 0, TAU)
ctx.fill()
}

function showStone({ canvasRef, grid, stoneRadius }, grid_x, grid_y, style) {
let [x, y] = grid[grid_y][grid_x]
let ctx = canvasRef.current.getContext("2d")
ctx.fillStyle = style
ctx.beginPath()
ctx.arc(x, y, stoneRadius, 0, TAU)
ctx.fill()
}

function paintLastMove({isCursorInBounds, canvasRef, grid, stoneRadius}, lastMove) {
if (!lastMove) {
return
}
let {x: grid_x, y: grid_y, color} = lastMove
if (!isCursorInBounds(grid_x, grid_y)) {
return
}
let style = color === BLACK ?
"rgba(255,255,255)" :
"rgba(0,0,0)"
let [x, y] = grid[grid_y][grid_x]
let ctx = canvasRef.current.getContext("2d")
let length = stoneRadius * 0.875
ctx.fillStyle = style
ctx.beginPath()
ctx.moveTo(x, y)
ctx.lineTo(x + length, y)
ctx.lineTo(x , y + length)
ctx.fill()
}

function showShadow({ canvasRef, grid, stoneRadius }, grid_x, grid_y, style) {
let [x, y] = grid[grid_y][grid_x]
let ctx = canvasRef.current.getContext("2d")
ctx.fillStyle = style
ctx.beginPath()
ctx.arc(x, y, stoneRadius, 0, TAU)
ctx.fill()
}

function paintGrid({width, margin, canvasRef, grid, hoshis, hoshiRadius, boardDecorations}) {
let ctx = canvasRef.current.getContext("2d")
ctx.fillStyle = kirsch
if (boardDecorations) {
ctx.fillRect(0.625 * margin, 0.625 * margin, width - 1.25 * margin, width - 1.25 * margin)
} else {
ctx.fillRect(0, 0, width, width)
}
ctx.strokeStyle = asch
for (let y = 0; y < grid.length; y++) {
let [source_x, source_y] = grid[y][0]
let [target_x, target_y] = grid[y][grid.length - 1]
ctx.beginPath()
ctx.moveTo(source_x, source_y)
ctx.lineTo(target_x, target_y)
ctx.stroke()
}
for (let x = 0; x < grid.length; x++) {
let [source_x, source_y] = grid[0][x]
let [target_x, target_y] = grid[grid.length - 1][x]
ctx.beginPath()
ctx.moveTo(source_x, source_y)
ctx.lineTo(target_x, target_y)
ctx.stroke()
}
hoshis.forEach((grid_x, grid_y) => {
let [x, y] = grid[grid_y][grid_x]
ctx.fillStyle = asch
ctx.beginPath()
ctx.arc(x, y, hoshiRadius, 0, TAU)
ctx.fill()
})
}

function paintBoardDecorations({width, margin, canvasRef, grid}) {
let ctx = canvasRef.current.getContext("2d")
ctx.fillStyle = kirsch
ctx.fillRect(0, 0, width, width)
ctx.fillStyle = asch
for (let grid_x = 0; grid_x < grid.length; grid_x++) {
let [x] = grid[0][grid_x]
ctx.fillText(decoX[grid_x], x, 0.25 * margin)
ctx.fillText(decoX[grid_x], x, width - 0.25 * margin)
}
for (let grid_y = 0; grid_y < grid.length; grid_y++) {
let [, y] = grid[grid.length - grid_y - 1][0]
ctx.fillText(grid_y + 1, 0.25 * margin, y)
ctx.fillText(grid_y + 1, width - 0.25 * margin, y)
}
}

function getRadius(radius) {
let diameter = Math.trunc(2 * radius)
if (diameter % 2 === 0) {
Expand All @@ -370,62 +268,14 @@ function getRadius(radius) {
return diameter / 2
}

function paintStones(context, board, lastMove) {
for (let grid_y = 0; grid_y < board.length; grid_y++) {
for (let grid_x = 0; grid_x < board.length; grid_x++) {
let { hasStone, color } = board[grid_y][grid_x]
if (hasStone) {
let style = color === BLACK ?
"rgba(0,0,0)" :
"rgba(255,255,255)"
showStone(context, grid_x, grid_y, style)
}
}
}
paintLastMove(context, lastMove)
}

function paintStonesCounting(context, board, countingGroup) {
for (let grid_y = 0; grid_y < board.length; grid_y++) {
for (let grid_x = 0; grid_x < board.length; grid_x++) {
let { hasStone, color } = board[grid_y][grid_x]
if (hasStone) {
if (countingGroup && countingGroup(grid_x, grid_y)) {
let style = color & BLACK ?
"rgba(0,0,0,0.25)" :
"rgba(255,255,255,0.25)"
showShadow(context, grid_x, grid_y, style)
} else {
let style = color & BLACK ?
"rgba(0,0,0)" :
"rgba(255,255,255)"
showStone(context, grid_x, grid_y, style)
}
}
if (color & ANY_REMOVED) {
let style = (color & ANY_REMOVED) === REMOVED_B ?
"rgba(0,0,0,0.25)" :
"rgba(255,255,255,0.25)"
showShadow(context, grid_x, grid_y, style)
}
if (color & TERRITORY) {
let style = (color & TERRITORY) === TERRITORY_B ?
"rgba(0,0,0)" :
"rgba(255,255,255)"
showTerritory(context, grid_x, grid_y, style)
}
}
}
}

function getCountingGroup(board, cursor_x, cursor_y) {
if (cursor_x < 0 ||
cursor_x >= board.length ||
cursor_y < 0 ||
cursor_y >= board.length ) {
return undefined
}
let { has, hasStone } = board[cursor_y][cursor_x]
let {has, hasStone} = board[cursor_y][cursor_x]
if (!hasStone) {
return undefined
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/client/src/feature/GameChat.jsx → ...main/client/src/feature/game/GameChat.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import {
} from "react-router-dom"
import {
useAuthStore,
} from "./../store.js"
} from "../../store.js"
import {
StompContext,
tfetch,
doTry,
} from "./../util.js"
} from "../../util.js"

export const GameChat = () => {
let [messages, setMessages] = useState([])
Expand Down
6 changes: 3 additions & 3 deletions src/main/client/src/feature/GamePanel.jsx → ...ain/client/src/feature/game/GamePanel.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import {
TERRITORY_B,
TERRITORY_W,
base,
} from "../util.js"
} from "../../util.js"
import {
Button,
} from "../component/Button.jsx"
} from "../../component/Button.jsx"
import {
useAuthStore,
useGameStore,
} from "../store.js"
} from "../../store.js"
import {
GameChat,
} from "./GameChat.jsx"
Expand Down
Loading

0 comments on commit 3d33773

Please sign in to comment.