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 b3ea371..4cd536c 100644 --- a/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java +++ b/app/src/main/java/org/toop/app/canvas/BitGameCanvas.java @@ -41,9 +41,9 @@ public abstract class BitGameCanvas> implements GameCa protected final Cell[] cells; - private Consumer onCellCLicked; + private Consumer onCellCLicked; - public void setOnCellClicked(Consumer onClick) { + public void setOnCellClicked(Consumer onClick) { this.onCellCLicked = onClick; } @@ -91,7 +91,7 @@ public abstract class BitGameCanvas> implements GameCa if (cell.isInside(event.getX(), event.getY())) { event.consume(); - this.onCellCLicked.accept(column + row * rowSize); + this.onCellCLicked.accept(1L << (column + row * rowSize)); } }); diff --git a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java index f502e35..8821cb5 100644 --- a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java +++ b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java @@ -1,5 +1,6 @@ package org.toop.app.gameControllers; +import javafx.application.Platform; import javafx.geometry.Pos; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -7,6 +8,7 @@ import org.toop.app.canvas.GameCanvas; import org.toop.app.widget.WidgetContainer; import org.toop.app.widget.view.GameView; import org.toop.framework.eventbus.EventFlow; +import org.toop.framework.eventbus.GlobalEventBus; import org.toop.framework.gameFramework.controller.GameController; import org.toop.framework.gameFramework.model.game.SupportsOnlinePlay; import org.toop.framework.gameFramework.model.game.TurnBasedGame; @@ -23,8 +25,6 @@ import java.util.function.Consumer; public class GenericGameController> implements GameController { protected final EventFlow eventFlow = new EventFlow(); - protected final List> listeners = new ArrayList<>(); - // Logger for logging protected final Logger logger = LogManager.getLogger(this.getClass()); @@ -44,13 +44,22 @@ public class GenericGameController> implements GameCo this.canvas = canvas; this.game = game; this.gameThreadBehaviour = gameThreadBehaviour; - this.gameThreadBehaviour.setController(this); + // Tell thread how to send moves + this.gameThreadBehaviour.setOnSendMove((id, m) -> GlobalEventBus.postAsync(new NetworkEvents.SendMove(id, (short)translateMove(m)))); + // Tell thread how to update UI + this.gameThreadBehaviour.setOnUpdateUI(() -> Platform.runLater(() -> canvas.redraw(game.deepCopy()))); + + // Change scene to game view gameView = new GameView(null, null, null, gameType); gameView.add(Pos.CENTER, canvas.getCanvas()); WidgetContainer.getCurrentView().transitionNext(gameView, true); - addListeners(); + + // Listen to updates + eventFlow + .listen(GUIEvents.GameEnded.class, this::onGameFinish, false) + .listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setMove(event.move());}}, false); } public void start(){ @@ -73,23 +82,16 @@ public class GenericGameController> implements GameCo return game.getCurrentTurn(); } - private void addListeners(){ - eventFlow - .listen(GUIEvents.RefreshGameCanvas.class, this::onUpdateGameUI, false) - .listen(GUIEvents.GameEnded.class, this::onGameFinish, false) - .listen(GUIEvents.PlayerAttemptedMove.class, event -> {if (getCurrentPlayer() instanceof LocalPlayer lp){lp.setMove(translateMove(event.move()));}}, false); - } - protected long translateMove(int move){ return 1L << move; } - private void removeListeners(){ - eventFlow.unsubscribeAll(); + protected int translateMove(long move){ + return Long.numberOfTrailingZeros(move); } - private void onUpdateGameUI(GUIEvents.RefreshGameCanvas event){ - this.updateUI(); + private void removeListeners(){ + eventFlow.unsubscribeAll(); } private void onGameFinish(GUIEvents.GameEnded event){ diff --git a/app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java b/app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java index 0b8491c..10f10b5 100644 --- a/app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java +++ b/app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java @@ -3,10 +3,8 @@ package org.toop.app.gameControllers; import org.toop.app.canvas.TicTacToeBitCanvas; import org.toop.framework.gameFramework.model.game.threadBehaviour.ThreadBehaviour; import org.toop.framework.gameFramework.model.player.Player; -import org.toop.game.gameThreads.LocalFixedRateThreadBehaviour; import org.toop.game.gameThreads.LocalThreadBehaviour; import org.toop.game.gameThreads.OnlineThreadBehaviour; -import org.toop.game.gameThreads.OnlineWithSleepThreadBehaviour; import org.toop.game.games.tictactoe.BitboardTicTacToe; import org.toop.game.players.OnlinePlayer; diff --git a/framework/src/main/java/org/toop/framework/gameFramework/LongPairConsumer.java b/framework/src/main/java/org/toop/framework/gameFramework/LongPairConsumer.java new file mode 100644 index 0000000..c1671d5 --- /dev/null +++ b/framework/src/main/java/org/toop/framework/gameFramework/LongPairConsumer.java @@ -0,0 +1,6 @@ +package org.toop.framework.gameFramework; + +@FunctionalInterface +public interface LongPairConsumer { + void accept(long a, long b); +} diff --git a/framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java b/framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java index 8469b45..d4cb4df 100644 --- a/framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java +++ b/framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java @@ -2,4 +2,6 @@ package org.toop.framework.gameFramework.model.game; public interface TurnBasedGame> extends Playable, DeepCopyable, PlayerProvider, BoardProvider { int getCurrentTurn(); + int getPlayerCount(); + int getWinner(); } diff --git a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java b/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java index 595ccd7..9742eae 100644 --- a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java +++ b/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java @@ -2,11 +2,13 @@ package org.toop.framework.gameFramework.model.game.threadBehaviour; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.toop.framework.gameFramework.LongPairConsumer; import org.toop.framework.gameFramework.controller.GameController; import org.toop.framework.gameFramework.model.game.TurnBasedGame; import org.toop.framework.gameFramework.model.player.Player; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Consumer; /** * Base class for thread-based game behaviours. @@ -16,7 +18,8 @@ import java.util.concurrent.atomic.AtomicBoolean; * Subclasses implement the actual game-loop logic. */ public abstract class AbstractThreadBehaviour> implements ThreadBehaviour { - protected GameController controller; + private LongPairConsumer onSendMove; + private Runnable onUpdateUI; /** Indicates whether the game loop or event processing is active. */ protected final AtomicBoolean isRunning = new AtomicBoolean(); @@ -35,8 +38,25 @@ public abstract class AbstractThreadBehaviour> implem this.game = game; } + protected void updateUI(){ + if (onUpdateUI != null) { + onUpdateUI.run(); + } + } + + protected void sendMove(long clientId, long move){ + if (onSendMove != null) { + onSendMove.accept(clientId, move); + } + } + @Override - public void setController(GameController controller) { - this.controller = controller; + public void setOnUpdateUI(Runnable onUpdateUI) { + this.onUpdateUI = onUpdateUI; + } + + @Override + public void setOnSendMove(LongPairConsumer onSendMove) { + this.onSendMove = onSendMove; } } diff --git a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java b/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java index d0e832e..894d8de 100644 --- a/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java +++ b/framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java @@ -1,15 +1,20 @@ package org.toop.framework.gameFramework.model.game.threadBehaviour; +import org.toop.framework.gameFramework.LongPairConsumer; import org.toop.framework.gameFramework.controller.GameController; import org.toop.framework.gameFramework.model.game.TurnBasedGame; import org.toop.framework.gameFramework.model.player.AbstractPlayer; import org.toop.framework.gameFramework.model.player.Player; +import java.util.function.Consumer; + /** * Strategy interface for controlling game thread behavior. *

* Defines how a game's execution is started, stopped, and which player is active. */ public interface ThreadBehaviour extends Controllable { - void setController(GameController controller); + void setOnUpdateUI(Runnable onUpdateUI); + void setOnSendMove(LongPairConsumer onSendMove); } + diff --git a/framework/src/main/java/org/toop/framework/gameFramework/view/GUIEvents.java b/framework/src/main/java/org/toop/framework/gameFramework/view/GUIEvents.java index a337869..334108c 100644 --- a/framework/src/main/java/org/toop/framework/gameFramework/view/GUIEvents.java +++ b/framework/src/main/java/org/toop/framework/gameFramework/view/GUIEvents.java @@ -10,10 +10,6 @@ import org.toop.framework.eventbus.events.GenericEvent; * player actions, and game completion. */ public class GUIEvents extends EventsBase { - - /** Event to refresh or redraw the game canvas. */ - public record RefreshGameCanvas() implements GenericEvent {} - /** * Event indicating the game has ended. * @@ -23,8 +19,8 @@ public class GUIEvents extends EventsBase { public record GameEnded(boolean winOrTie, int winner) implements GenericEvent {} /** Event indicating a player has attempted a move. */ - public record PlayerAttemptedMove(int move) implements GenericEvent {} + public record PlayerAttemptedMove(long move) implements GenericEvent {} /** Event indicating a player is hovering over a move (for UI feedback). */ - public record PlayerMoveHovered(int move) implements GenericEvent {} + public record PlayerMoveHovered(long move) implements GenericEvent {} } diff --git a/game/src/main/java/org/toop/game/gameThreads/LocalFixedRateThreadBehaviour.java b/game/src/main/java/org/toop/game/gameThreads/LocalFixedRateThreadBehaviour.java index 9d55565..ea928b6 100644 --- a/game/src/main/java/org/toop/game/gameThreads/LocalFixedRateThreadBehaviour.java +++ b/game/src/main/java/org/toop/game/gameThreads/LocalFixedRateThreadBehaviour.java @@ -8,6 +8,8 @@ import org.toop.framework.gameFramework.view.GUIEvents; import org.toop.framework.gameFramework.model.game.TurnBasedGame; import org.toop.framework.gameFramework.model.player.Player; +import java.util.function.Consumer; + /** * Handles local turn-based game logic at a fixed update rate. *

@@ -22,7 +24,7 @@ public class LocalFixedRateThreadBehaviour> extends A * * @param game the game instance */ - public LocalFixedRateThreadBehaviour(T game) { + public LocalFixedRateThreadBehaviour(T game, Consumer onSendMove) { super(game); } @@ -60,7 +62,8 @@ public class LocalFixedRateThreadBehaviour> extends A Player currentPlayer = game.getPlayer(game.getCurrentTurn()); long move = currentPlayer.getMove(game.deepCopy()); PlayResult result = game.play(move); - new EventFlow().addPostEvent(GUIEvents.RefreshGameCanvas.class).postEvent(); + + updateUI(); GameState state = result.state(); switch (state) { diff --git a/game/src/main/java/org/toop/game/gameThreads/LocalThreadBehaviour.java b/game/src/main/java/org/toop/game/gameThreads/LocalThreadBehaviour.java index c81ce4d..79c57f9 100644 --- a/game/src/main/java/org/toop/game/gameThreads/LocalThreadBehaviour.java +++ b/game/src/main/java/org/toop/game/gameThreads/LocalThreadBehaviour.java @@ -8,6 +8,8 @@ import org.toop.framework.gameFramework.GameState; import org.toop.framework.gameFramework.model.game.TurnBasedGame; import org.toop.framework.gameFramework.model.player.Player; +import java.util.function.Consumer; + /** * Handles local turn-based game logic in its own thread. *

@@ -49,7 +51,8 @@ public class LocalThreadBehaviour> extends AbstractTh Player currentPlayer = game.getPlayer(game.getCurrentTurn()); long move = currentPlayer.getMove(game.deepCopy()); PlayResult result = game.play(move); - controller.updateUI(); + + updateUI(); GameState state = result.state(); switch (state) { diff --git a/game/src/main/java/org/toop/game/gameThreads/OnlineThreadBehaviour.java b/game/src/main/java/org/toop/game/gameThreads/OnlineThreadBehaviour.java index 385fd4f..ae9aa88 100644 --- a/game/src/main/java/org/toop/game/gameThreads/OnlineThreadBehaviour.java +++ b/game/src/main/java/org/toop/game/gameThreads/OnlineThreadBehaviour.java @@ -53,7 +53,7 @@ public class OnlineThreadBehaviour> extends AbstractT public void onYourTurn(long clientId) { if (!isRunning.get()) return; long move = game.getPlayer(game.getCurrentTurn()).getMove(game.deepCopy()); - controller.sendMove(clientId, move); + sendMove(clientId, move); } /** @@ -63,7 +63,8 @@ public class OnlineThreadBehaviour> extends AbstractT public void onMoveReceived(long move) { if (!isRunning.get()) return; game.play(move); - new EventFlow().addPostEvent(GUIEvents.RefreshGameCanvas.class).postEvent(); + + updateUI(); } /** @@ -72,9 +73,8 @@ public class OnlineThreadBehaviour> extends AbstractT */ public void gameFinished(String condition) { switch(condition.toUpperCase()){ - case "WIN" -> new EventFlow().addPostEvent(GUIEvents.GameEnded.class, true, game.getCurrentTurn()).postEvent(); + case "WIN", "LOSS" -> new EventFlow().addPostEvent(GUIEvents.GameEnded.class, true, game.getWinner()).postEvent(); case "DRAW" -> new EventFlow().addPostEvent(GUIEvents.GameEnded.class, false, -1).postEvent(); - case "LOSS" -> new EventFlow().addPostEvent(GUIEvents.GameEnded.class, true, (game.getCurrentTurn() + 1)%2).postEvent(); default -> { logger.error("Invalid condition"); throw new RuntimeException("Unknown condition"); diff --git a/game/src/main/java/org/toop/game/games/reversi/BitboardReversi.java b/game/src/main/java/org/toop/game/games/reversi/BitboardReversi.java index 63a4eaa..f380bef 100644 --- a/game/src/main/java/org/toop/game/games/reversi/BitboardReversi.java +++ b/game/src/main/java/org/toop/game/games/reversi/BitboardReversi.java @@ -97,17 +97,13 @@ public class BitboardReversi extends BitboardGame { final long skippedLegalMoves = getLegalMoves(); if (skippedLegalMoves == 0) { - final long black = getPlayerBitboard(0); - final long white = getPlayerBitboard(1); + int winner = getWinner(); - final int blackCount = Long.bitCount(black); - final int whiteCount = Long.bitCount(white); - - if (blackCount == whiteCount) { + if (winner == -1) { return new PlayResult(GameState.DRAW, -1); } - return new PlayResult(GameState.WIN, blackCount > whiteCount ? 0 : 1); + return new PlayResult(GameState.WIN, winner); } return new PlayResult(GameState.TURN_SKIPPED, getCurrentPlayerIndex()); @@ -123,6 +119,24 @@ public class BitboardReversi extends BitboardGame { ); } + public int getWinner(){ + final long black = getPlayerBitboard(0); + final long white = getPlayerBitboard(1); + + final int blackCount = Long.bitCount(black); + final int whiteCount = Long.bitCount(white); + + if (blackCount == whiteCount){ + return -1; + } + else if (blackCount > whiteCount){ + return 0; + } + else{ + return 1; + } + } + private long computeMoves(long player, long opponent, int shift, long mask) { long moves = shift(player, shift, mask) & opponent; long captured = moves; diff --git a/game/src/main/java/org/toop/game/games/tictactoe/BitboardTicTacToe.java b/game/src/main/java/org/toop/game/games/tictactoe/BitboardTicTacToe.java index f0deb0c..0927431 100644 --- a/game/src/main/java/org/toop/game/games/tictactoe/BitboardTicTacToe.java +++ b/game/src/main/java/org/toop/game/games/tictactoe/BitboardTicTacToe.java @@ -32,6 +32,10 @@ public class BitboardTicTacToe extends BitboardGame { return (~taken) & 0x1ffL; } + public int getWinner(){ + return getCurrentPlayerIndex(); + } + public PlayResult play(long move) { // Player loses if move is invalid if ((move & getLegalMoves()) == 0 || Long.bitCount(move) != 1){