From e5ad14478394005278e40f163ec97fc832047513 Mon Sep 17 00:00:00 2001 From: michiel301b Date: Thu, 11 Dec 2025 10:50:05 +0100 Subject: [PATCH] temp commit, adding legalmoves to reversi part1 --- .../java/org/toop/app/canvas/BitGameCanvas.java | 1 + .../org/toop/app/canvas/ReversiBitCanvas.java | 17 +++++++++++++++++ .../org/toop/app/canvas/TicTacToeBitCanvas.java | 1 - .../gameControllers/ReversiBitController.java | 4 +++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java b/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java index 85c6f7d..41b7cf4 100644 --- a/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java +++ b/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java @@ -108,6 +108,7 @@ public abstract class BitGameCanvas> implements GameC } } + private void render() { graphics.setFill(backgroundColor); graphics.fillRect(0, 0, width, height); diff --git a/app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java b/app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java index 7c2bde0..9a82a21 100644 --- a/app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java +++ b/app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java @@ -39,4 +39,21 @@ public class ReversiBitCanvas extends BitGameCanvas { loopOverBoard(board[0], (i) -> drawDot(Color.WHITE, i)); loopOverBoard(board[1], (i) -> drawDot(Color.BLACK, i)); } + + private void showLegalMoves(long[] legalMoves, int currentPlayerIndex) { + for (long legalMove : legalMoves) { + drawLegalMove(legalMove, currentPlayerIndex); + } + } + + public void drawLegalMove(long cell, int player) { + Color innerColor; + if (player == 1) { + innerColor = new Color(0.0f, 0.0f, 0.0f, 0.6f); + } + else { + innerColor = new Color(1.0f, 1.0f, 1.0f, 0.75f); + } + this.drawInnerDot(innerColor, (int) cell, false); + } } diff --git a/app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java b/app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java index 443adbd..88f5933 100644 --- a/app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java +++ b/app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java @@ -30,7 +30,6 @@ public class TicTacToeBitCanvas extends BitGameCanvas{ private void drawMoves(long[] gameBoard){ loopOverBoard(gameBoard[0], (i) -> drawX(Color.RED, i)); loopOverBoard(gameBoard[1], (i) -> drawO(Color.BLUE, i)); - } diff --git a/app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java b/app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java index 40784b0..d66be09 100644 --- a/app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java +++ b/app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java @@ -1,11 +1,13 @@ package org.toop.app.gameControllers; +import javafx.scene.paint.Color; import org.toop.app.canvas.ReversiBitCanvas; import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehaviour; import org.toop.framework.gameFramework.model.player.Player; import org.toop.game.gameThreads.LocalThreadBehaviour; import org.toop.game.gameThreads.OnlineThreadBehaviour; import org.toop.game.games.reversi.BitboardReversi; +import org.toop.game.players.LocalPlayer; import org.toop.game.players.OnlinePlayer; public class ReversiBitController extends GenericGameController { @@ -13,7 +15,7 @@ public class ReversiBitController extends GenericGameController BitboardReversi game = new BitboardReversi(players); ThreadBehaviour thread = new LocalThreadBehaviour<>(game); for (Player player : players) { - if (player instanceof OnlinePlayer){ + if (player instanceof OnlinePlayer) { thread = new OnlineThreadBehaviour<>(game); } }