✨ (sudoku-game): add clear button

Author: yuanyu90221

internal/layout/click-handler.go

@@ -11,7 +11,7 @@ func (gameLayout *GameLayout) detectClickCell() {
 		xPos, yPos := ebiten.CursorPosition()
 		yPos -= PanelHeight
 		// range check
-		if (xPos >= 0 && xPos <= ScreenWidth) &&
+		if (xPos >= 0 && xPos <= BoardWidth) &&
 			(yPos >= 0 && yPos <= ScreenHeight) {
 			row := yPos / cellSize
 			col := xPos / cellSize

internal/layout/input-control.go

@@ -99,7 +99,7 @@ func handleNonConflict(board *game.Board, cellType game.CellType,
 func (gameLayout *GameLayout) handleRestartButton() {
 	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) {
 		xPos, yPos := ebiten.CursorPosition()
-		if (xPos >= 8*cellSize && xPos <= 9*cellSize) &&
+		if (xPos >= ScreenWidth-cellSize && xPos <= ScreenWidth) &&
 			(yPos >= cellSize && yPos <= 2*cellSize) {
 			gameLayout.gameInstance.Board.ResetBoardToDefault()
 			gameLayout.gameInstance.StartTime = time.Now().UTC()
@@ -112,7 +112,7 @@ func (gameLayout *GameLayout) handleRestartButton() {
 func (gameLayout *GameLayout) handleToggleLevelDifficultButton() {
 	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) {
 		xPos, yPos := ebiten.CursorPosition()
-		if (xPos >= 4*cellSize && xPos <= 5*cellSize) &&
+		if (xPos >= ScreenWidth/2-cellSize/2 && xPos <= ScreenWidth/2+cellSize/2) &&
 			(yPos >= cellSize && yPos <= 2*cellSize) {
 			gameLayout.difficultyLevel = (gameLayout.difficultyLevel + 1) % len(difficultyOptions)
 			gameLayout.ResetGameWithLevel()

internal/layout/layout.go

@@ -12,12 +12,14 @@ import (
 )
 
 const (
-	PanelHeight    = 100 // 上方面板高度
-	ScreenWidth    = 450
-	ScreenHeight   = PanelHeight + 450
-	cellSize       = 50
-	thinkLineWidth = 3
-	leanLineWidth  = 1
+	PanelHeight     = 100 // 上方面板高度
+	BoardWidth      = 450
+	InputPanelWidth = 200
+	ScreenWidth     = BoardWidth + InputPanelWidth
+	ScreenHeight    = PanelHeight + 450
+	cellSize        = 50
+	thinkLineWidth  = 3
+	leanLineWidth   = 1
 )
 
 type GameLayout struct {
@@ -33,6 +35,7 @@ func (gameLayout *GameLayout) Update() error {
 	if gameLayout.isPlayerWin {
 		return nil
 	}
+	gameLayout.detectClearHandler()
 	gameLayout.detectClickCell()
 	gameLayout.elapsedSeconds = gameLayout.gameInstance.GetElaspedTime()
 	gameLayout.DetectCursor()
@@ -52,6 +55,7 @@ func (gameLayout *GameLayout) Draw(screen *ebiten.Image) {
 	gameLayout.drawRestartButton(screen)
 	gameLayout.drawTimeLayout(screen)
 	gameLayout.drawLevelButtonWithIcon(screen)
+	gameLayout.drawClearButton(screen)
 	// 畫出 cursor
 	gameLayout.drawCursor(screen)
 	// 根據遊戲狀態來畫出盤面
@@ -129,7 +133,7 @@ func (gameLayout *GameLayout) drawLinesOnBoard(screen *ebiten.Image) {
 		// 畫直線
 		ebitenUtilDrawLine(screen, x, PanelHeight+0, x, ScreenHeight, lineColor, lineWidth)
 		// 畫橫線
-		ebitenUtilDrawLine(screen, 0, PanelHeight+y, ScreenWidth, PanelHeight+y, lineColor, lineWidth)
+		ebitenUtilDrawLine(screen, 0, PanelHeight+y, BoardWidth, PanelHeight+y, lineColor, lineWidth)
 	}
 }
 
@@ -316,12 +320,12 @@ func (gameLayout *GameLayout) drawBoardStatus(screen *ebiten.Image) {
 
 // drawRestartButton - 繪製重新開始的 Button
 func (gameLayout *GameLayout) drawRestartButton(screen *ebiten.Image) {
-	vector.DrawFilledCircle(screen, float32(8*cellSize+cellSize/2), cellSize+cellSize/2, 25,
+	vector.DrawFilledCircle(screen, float32(ScreenWidth-cellSize/2), cellSize+cellSize/2, 25,
 		getIconColor(Button),
 		true,
 	)
 	emojiValue := "🔃"
-	emojiXPos := 8*cellSize + len(emojiValue)
+	emojiXPos := ScreenWidth - cellSize + len(emojiValue)
 	emojiYPos := cellSize + cellSize/2
 	emojiOpts := &text.DrawOptions{}
 	emojiOpts.ColorScale.ScaleWithColor(getIconColor(Restart))

internal/layout/number-buttons.go

@@ -0,0 +1,73 @@
+package layout
+
+import (
+	"image"
+	"image/color"
+
+	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/text/v2"
+	"github.com/hajimehoshi/ebiten/v2/vector"
+	"github.com/leetcode-golang-classroom/sudoku-game/internal/game"
+)
+
+var numberButtonValues = [3][3]int{
+	{
+		1, 2, 3,
+	},
+	{
+		4, 5, 6,
+	},
+	{
+		5, 7, 8,
+	},
+}
+
+var buttonRectRelativePos = image.Rect(50, 0, 150, 50)
+
+func (gameLayout *GameLayout) drawClearButton(screen *ebiten.Image) {
+	vector.DrawFilledRect(screen,
+		float32(BoardWidth+buttonRectRelativePos.Min.X),
+		float32((ScreenHeight-5*cellSize)+buttonRectRelativePos.Min.Y),
+		float32(buttonRectRelativePos.Dx()),
+		float32(buttonRectRelativePos.Dy()),
+		getIconColor(Button),
+		true,
+	)
+	textValue := "Clear"
+	textXPos := BoardWidth + 2*cellSize
+	textYPos := ScreenHeight - 5*cellSize + cellSize/2
+	textOpts := &text.DrawOptions{}
+	textOpts.ColorScale.ScaleWithColor(color.Black)
+	textOpts.PrimaryAlign = text.AlignCenter
+	textOpts.SecondaryAlign = text.AlignCenter
+	textOpts.GeoM.Translate(float64(textXPos), float64(textYPos))
+	text.Draw(screen, textValue, &text.GoTextFace{
+		Source: mplusFaceSource,
+		Size:   30,
+	}, textOpts)
+}
+
+func (gameLayout *GameLayout) clearCursorValue() {
+	board := gameLayout.gameInstance.Board
+	cursorRow := board.CursorRow
+	cursorCol := board.CursorCol
+	targetCell := board.Cells[cursorRow][cursorCol]
+	// 當為無法清除的值時
+	if targetCell.Type == game.Preset {
+		return
+	}
+	handleClearInput(board, targetCell, cursorRow, cursorCol)
+}
+
+func (gameLayout *GameLayout) detectClearHandler() {
+	if ebiten.IsMouseButtonPressed(ebiten.MouseButtonLeft) {
+		xPos, yPos := ebiten.CursorPosition()
+		xPos -= BoardWidth
+		yPos -= (ScreenHeight - 5*cellSize)
+		// detect range
+		if xPos >= buttonRectRelativePos.Min.X && xPos <= buttonRectRelativePos.Dx() &&
+			yPos >= 0 && yPos <= buttonRectRelativePos.Dy() {
+			gameLayout.clearCursorValue()
+		}
+	}
+}