Merge pull request 'doc' (#17) from doc into main
All checks were successful
Linux arm64 / Build (push) Successful in 45s

Reviewed-on: #17
This commit was merged in pull request #17.
This commit is contained in:
2025-05-19 07:52:37 +00:00
88 changed files with 843 additions and 139 deletions

View File

@@ -4,6 +4,15 @@ import java.util.Scanner;
import chess.view.consolerender.Colors; import chess.view.consolerender.Colors;
/**
* Main class of the chess game. Asks the user for the version to use and runs the according main.
* @author Grenier Lilas
* @author Pribylski Simon
* @see ConsoleMain
* @see SwingMain
* @see OpenGLMain
*/
public class App { public class App {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(Colors.RED + "Credits: Grenier Lilas, Pribylski Simon." + Colors.RESET); System.out.println(Colors.RED + "Credits: Grenier Lilas, Pribylski Simon." + Colors.RESET);

View File

@@ -3,6 +3,9 @@
*/ */
package chess; package chess;
/**
* Main class for the console version of the game.
*/
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
import chess.model.Game; import chess.model.Game;

View File

@@ -6,6 +6,9 @@ import chess.model.Game;
import chess.pgn.PgnFileSimulator; import chess.pgn.PgnFileSimulator;
import chess.view.DDDrender.DDDView; import chess.view.DDDrender.DDDView;
/**
* Main class for the 3D Window version of the game.
*/
public class OpenGLMain { public class OpenGLMain {
public static void main(String[] args) { public static void main(String[] args) {
Game game = new Game(); Game game = new Game();

View File

@@ -1,7 +1,7 @@
package chess; package chess;
import chess.ai.minimax.AlphaBetaAI; import chess.ai.ais.AlphaBetaAI;
import chess.ai.minimax.AlphaBetaConsolePrinter; import chess.ai.alphabeta.AlphaBetaConsolePrinter;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
import chess.controller.event.GameAdapter; import chess.controller.event.GameAdapter;
@@ -11,6 +11,9 @@ import chess.pgn.PgnExport;
import chess.view.audio.GameAudio; import chess.view.audio.GameAudio;
import chess.view.simplerender.Window; import chess.view.simplerender.Window;
/**
* Main class for the 2D window version of the game.
*/
public class SwingMain { public class SwingMain {
public static void main(String[] args) { public static void main(String[] args) {
Game game = new Game(); Game game = new Game();

View File

@@ -10,7 +10,10 @@ import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Piece; import chess.model.Piece;
public abstract class AI extends GameAdapter { /**
* Abstract class, used to code bots.
*/
public abstract class AI extends GameAdapter implements AIActions {
protected final CommandExecutor commandExecutor; protected final CommandExecutor commandExecutor;
protected final Color color; protected final Color color;
@@ -30,12 +33,9 @@ public abstract class AI extends GameAdapter {
play(); play();
} }
protected List<AIAction> getAllowedActions() { @Override
return AIActions.getAllowedActions(this.commandExecutor); public CommandExecutor getCommandExecutor() {
} return this.commandExecutor;
protected Piece pieceAt(Coordinate coordinate) {
return AIActions.pieceAt(coordinate, this.commandExecutor);
} }
} }

View File

@@ -1,4 +1,4 @@
package chess.ai.minimax; package chess.ai;
import java.util.List; import java.util.List;
@@ -14,15 +14,19 @@ import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Game; import chess.model.Game;
import chess.model.Move; import chess.model.Move;
import chess.model.PermissiveGame; import chess.model.LightGame;
public class GameSimulation extends GameAdapter implements CommandSender {
/**
* Emulates the moves of a bot on a secondary board.
*/
public class GameSimulation extends GameAdapter implements AIActions {
private final CommandExecutor simulation; private final CommandExecutor simulation;
private final Game gameSimulation; private final Game gameSimulation;
public GameSimulation() { public GameSimulation() {
this.gameSimulation = new PermissiveGame(); this.gameSimulation = new LightGame();
this.simulation = new CommandExecutor(gameSimulation, new EmptyGameDispatcher()); this.simulation = new CommandExecutor(gameSimulation, new EmptyGameDispatcher());
} }
@@ -55,6 +59,7 @@ public class GameSimulation extends GameAdapter implements CommandSender {
sendUndo(); sendUndo();
} }
@Override
public CommandExecutor getCommandExecutor() { public CommandExecutor getCommandExecutor() {
return simulation; return simulation;
} }
@@ -71,10 +76,6 @@ public class GameSimulation extends GameAdapter implements CommandSender {
return this.gameSimulation.getPlayerTurn(); return this.gameSimulation.getPlayerTurn();
} }
public List<AIAction> getAllowedActions() {
return AIActions.getAllowedActions(this.simulation);
}
public void close() { public void close() {
this.simulation.close(); this.simulation.close();
} }

View File

@@ -10,6 +10,10 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/**
* Evaluate the cost of pieces for AI algorithm.
*/
public class PieceCost implements PieceVisitor<Float> { public class PieceCost implements PieceVisitor<Float> {
private final Color player; private final Color player;

View File

@@ -16,6 +16,10 @@ import chess.model.pieces.Rook;
public class PiecePosCost implements PieceVisitor<List<Float>> { public class PiecePosCost implements PieceVisitor<List<Float>> {
/**
* Evaluate the cost of position for AI algorithm.
*/
private final Color color; private final Color color;
private static final List<Float> BISHOP = Arrays.asList( private static final List<Float> BISHOP = Arrays.asList(

View File

@@ -4,6 +4,9 @@ import chess.controller.CommandExecutor;
import chess.controller.CommandSender; import chess.controller.CommandSender;
import chess.controller.commands.UndoCommand; import chess.controller.commands.UndoCommand;
/**
* Abstract class, manage the possible actions of a bot.
*/
public abstract class AIAction implements CommandSender { public abstract class AIAction implements CommandSender {
private final CommandExecutor commandExecutor; private final CommandExecutor commandExecutor;

View File

@@ -3,6 +3,9 @@ package chess.ai.actions;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.CastlingCommand; import chess.controller.commands.CastlingCommand;
/**
* Manage the transition between model and bots when it comes to Castling command.
*/
public class AIActionCastling extends AIAction{ public class AIActionCastling extends AIAction{
private final boolean bigCastling; private final boolean bigCastling;

View File

@@ -4,6 +4,9 @@ import chess.controller.CommandExecutor;
import chess.controller.commands.MoveCommand; import chess.controller.commands.MoveCommand;
import chess.model.Move; import chess.model.Move;
/**
* Manage the transition between model and bots when it comes to Move command.
*/
public class AIActionMove extends AIAction{ public class AIActionMove extends AIAction{
private final Move move; private final Move move;

View File

@@ -6,6 +6,9 @@ import chess.controller.commands.PromoteCommand;
import chess.controller.commands.PromoteCommand.PromoteType; import chess.controller.commands.PromoteCommand.PromoteType;
import chess.model.Move; import chess.model.Move;
/**
* Manage the transition between model and bots when it comes to Move and Promotion command.
*/
public class AIActionMoveAndPromote extends AIAction{ public class AIActionMoveAndPromote extends AIAction{
private final Move move; private final Move move;

View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import chess.controller.Command; import chess.controller.Command;
import chess.controller.CommandSender;
import chess.controller.Command.CommandResult; import chess.controller.Command.CommandResult;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.GetAllowedCastlingsCommand; import chess.controller.commands.GetAllowedCastlingsCommand;
@@ -17,41 +18,45 @@ import chess.model.Move;
import chess.model.Piece; import chess.model.Piece;
import chess.model.pieces.Pawn; import chess.model.pieces.Pawn;
public class AIActions {
public static List<AIAction> getAllowedActions(CommandExecutor commandExecutor) { /**
List<Move> moves = getAllowedMoves(commandExecutor); * Search and compiles the different actions possible to a bot.
CastlingResult castlingResult = getAllowedCastlings(commandExecutor); */
public interface AIActions extends CommandSender {
default List<AIAction> getAllowedActions() {
List<Move> moves = getPlayerMoves();
CastlingResult castlingResult = getAllowedCastlings();
List<AIAction> actions = new ArrayList<>(moves.size() + 10); List<AIAction> actions = new ArrayList<>(moves.size() + 10);
for (Move move : moves) { for (Move move : moves) {
Piece movingPiece = pieceAt(move.getStart(), commandExecutor); Piece movingPiece = getPieceAt(move.getStart());
if (movingPiece instanceof Pawn) { if (movingPiece instanceof Pawn) {
int enemyLineY = movingPiece.getColor() == Color.White ? 0 : 7; int enemyLineY = movingPiece.getColor() == Color.White ? 0 : 7;
if (move.getFinish().getY() == enemyLineY) { if (move.getFinish().getY() == enemyLineY) {
PromoteType[] promotes = PromoteType.values(); PromoteType[] promotes = PromoteType.values();
for (PromoteType promote : promotes) { for (PromoteType promote : promotes) {
actions.add(new AIActionMoveAndPromote(commandExecutor, move, promote)); actions.add(new AIActionMoveAndPromote(getCommandExecutor(), move, promote));
} }
continue; continue;
} }
} }
actions.add(new AIActionMove(commandExecutor, move)); actions.add(new AIActionMove(getCommandExecutor(), move));
} }
switch (castlingResult) { switch (castlingResult) {
case Both: case Both:
actions.add(new AIActionCastling(commandExecutor, true)); actions.add(new AIActionCastling(getCommandExecutor(), true));
actions.add(new AIActionCastling(commandExecutor, false)); actions.add(new AIActionCastling(getCommandExecutor(), false));
break; break;
case Small: case Small:
actions.add(new AIActionCastling(commandExecutor, false)); actions.add(new AIActionCastling(getCommandExecutor(), false));
break; break;
case Big: case Big:
actions.add(new AIActionCastling(commandExecutor, true)); actions.add(new AIActionCastling(getCommandExecutor(), true));
break; break;
case None: case None:
@@ -61,27 +66,4 @@ public class AIActions {
return actions; return actions;
} }
private static CastlingResult getAllowedCastlings(CommandExecutor commandExecutor) {
GetAllowedCastlingsCommand cmd2 = new GetAllowedCastlingsCommand();
sendCommand(cmd2, commandExecutor);
return cmd2.getCastlingResult();
}
private static List<Move> getAllowedMoves(CommandExecutor commandExecutor) {
GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
sendCommand(cmd, commandExecutor);
return cmd.getMoves();
}
private static CommandResult sendCommand(Command command, CommandExecutor commandExecutor) {
CommandResult result = commandExecutor.executeCommand(command);
assert result != CommandResult.NotAllowed : "Command not allowed!";
return result;
}
public static Piece pieceAt(Coordinate coordinate, CommandExecutor commandExecutor) {
GetPieceAtCommand command = new GetPieceAtCommand(coordinate);
commandExecutor.executeCommand(command);
return command.getPiece();
}
} }

View File

@@ -1,4 +1,4 @@
package chess.ai.minimax; package chess.ai.ais;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -7,12 +7,17 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import chess.ai.AI; import chess.ai.*;
import chess.ai.actions.AIAction; import chess.ai.actions.*;
import chess.ai.alphabeta.*;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.model.Color; import chess.model.Color;
import common.Signal1; import common.Signal1;
/**
* Extends AI. Bot based on the alpha-beta method of resolution.
*/
public class AlphaBetaAI extends AI { public class AlphaBetaAI extends AI {
private final int searchDepth; private final int searchDepth;
@@ -80,4 +85,9 @@ public class AlphaBetaAI extends AI {
move.applyAction(); move.applyAction();
} }
@Override
public CommandExecutor getCommandExecutor() {
return super.getCommandExecutor();
}
} }

View File

@@ -1,12 +1,17 @@
package chess.ai; package chess.ai.ais;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import chess.ai.*;
import chess.ai.actions.AIAction; import chess.ai.actions.AIAction;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.model.Color; import chess.model.Color;
/**
* Bot, takes a random decision among his possible moves.
*/
public class DumbAI extends AI { public class DumbAI extends AI {
private final Random random = new Random(); private final Random random = new Random();

View File

@@ -1,4 +1,4 @@
package chess.ai; package chess.ai.ais;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -10,6 +10,16 @@ import chess.controller.CommandExecutor;
import chess.model.Color; import chess.model.Color;
import chess.model.Move; import chess.model.Move;
import chess.model.Piece; import chess.model.Piece;
import chess.ai.*;
import chess.ai.actions.*;
import chess.ai.actions.AIActions;
/**
* Bot, takes the optimal piece when possible, or make a random move if no piece can be taken during the turn.
* @see PieceCost
* @see PiecePosCost
*/
public class HungryAI extends AI { public class HungryAI extends AI {
@@ -23,7 +33,7 @@ public class HungryAI extends AI {
} }
private int getMoveCost(Move move) { private int getMoveCost(Move move) {
Piece piece = pieceAt(move.getDeadPieceCoords()); Piece piece = getPieceAt(move.getDeadPieceCoords());
return -(int) pieceCost.getCost(piece); return -(int) pieceCost.getCost(piece);
} }

View File

@@ -1,5 +1,10 @@
package chess.ai.minimax; package chess.ai.alphabeta;
import chess.ai.ais.AlphaBetaAI;
/**
* Print the action of an alpha-beta bot on the console.
* @see AlphaBetaAI
*/
public class AlphaBetaConsolePrinter { public class AlphaBetaConsolePrinter {
private final AlphaBetaAI ai; private final AlphaBetaAI ai;

View File

@@ -1,4 +1,4 @@
package chess.ai.minimax; package chess.ai.alphabeta;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import chess.ai.GameSimulation;
import chess.ai.PieceCost; import chess.ai.PieceCost;
import chess.ai.PiecePosCost; import chess.ai.PiecePosCost;
import chess.ai.actions.AIAction; import chess.ai.actions.AIAction;
@@ -14,6 +15,11 @@ import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Piece; import chess.model.Piece;
/**
* Manage the threads for an alpha-beta bot.
* @see AlphaBetaAI
*/
public class AlphaBetaThread extends Thread { public class AlphaBetaThread extends Thread {
private final GameSimulation simulation; private final GameSimulation simulation;

View File

@@ -1,11 +1,16 @@
package chess.ai.minimax; package chess.ai.alphabeta;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import chess.ai.GameSimulation;
import chess.ai.actions.AIAction; import chess.ai.actions.AIAction;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.model.Color; import chess.model.Color;
/**
* Create the threads for an alpha-beta bot.
* @see AlphaBetaAI
*/
public class AlphaBetaThreadCreator implements ThreadFactory{ public class AlphaBetaThreadCreator implements ThreadFactory{
private final Color color; private final Color color;

View File

@@ -3,18 +3,22 @@ package chess.controller;
import chess.controller.event.GameListener; import chess.controller.event.GameListener;
import chess.model.Game; import chess.model.Game;
/**
* Abstract class, manage the execution and results of commands.
*/
public abstract class Command { public abstract class Command {
public enum CommandResult { public enum CommandResult {
/** /**
* The command was successfull. Should update display and switch player turn. * The command was successful. Should update display and switch player turn.
*/ */
Moved, Moved,
/** The command was successfull. Should not update anything */ /** The command was successful. Should not update anything */
NotMoved, NotMoved,
/** The command was successfull. Should only update display */ /** The command was successful. Should only update display */
ActionNeeded, ActionNeeded,
/** The command was not successfull */ /** The command was not successful */
NotAllowed; NotAllowed;
} }

View File

@@ -10,6 +10,9 @@ import chess.controller.event.GameListener;
import chess.model.Game; import chess.model.Game;
import chess.model.Game.GameStatus; import chess.model.Game.GameStatus;
/**
* Execute commands.
*/
public class CommandExecutor { public class CommandExecutor {
private Game game; private Game game;

View File

@@ -20,6 +20,10 @@ import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
import chess.model.Piece; import chess.model.Piece;
/**
* Interface for sending commands to the game, make long string of commands easier.
*/
public interface CommandSender { public interface CommandSender {
CommandExecutor getCommandExecutor(); CommandExecutor getCommandExecutor();

View File

@@ -3,6 +3,9 @@ package chess.controller;
import chess.controller.event.GameListener; import chess.controller.event.GameListener;
import chess.model.Game; import chess.model.Game;
/**
* Abstract class, manage commands given by the player, which are the commands that can be undone.
*/
public abstract class PlayerCommand extends Command{ public abstract class PlayerCommand extends Command{
public CommandResult undo(Game game, GameListener outputSystem) { public CommandResult undo(Game game, GameListener outputSystem) {

View File

@@ -8,6 +8,9 @@ import chess.model.Coordinate;
import chess.model.Game; import chess.model.Game;
import chess.model.Move; import chess.model.Move;
/**
* Command to execute a Castling or Big Castling.
*/
public class CastlingCommand extends PlayerCommand { public class CastlingCommand extends PlayerCommand {
private Move kingMove; private Move kingMove;

View File

@@ -4,6 +4,9 @@ import chess.controller.Command;
import chess.controller.event.GameListener; import chess.controller.event.GameListener;
import chess.model.Game; import chess.model.Game;
/**
* Command to check the possible Castling.
*/
public class GetAllowedCastlingsCommand extends Command{ public class GetAllowedCastlingsCommand extends Command{
public enum CastlingResult { public enum CastlingResult {

View File

@@ -10,6 +10,9 @@ import chess.model.Coordinate;
import chess.model.Game; import chess.model.Game;
import chess.model.Piece; import chess.model.Piece;
/**
* Command to check the Castlings that are possible.
*/
public class GetAllowedMovesPieceCommand extends Command { public class GetAllowedMovesPieceCommand extends Command {
private final Coordinate start; private final Coordinate start;
@@ -31,7 +34,7 @@ public class GetAllowedMovesPieceCommand extends Command {
if (piece.getColor() != game.getPlayerTurn()) if (piece.getColor() != game.getPlayerTurn())
return CommandResult.NotAllowed; return CommandResult.NotAllowed;
this.destinations = board.getAllowedMoves(start); this.destinations = board.getPieceAllowedMoves(start);
return CommandResult.NotMoved; return CommandResult.NotMoved;
} }

View File

@@ -6,6 +6,9 @@ import chess.model.Coordinate;
import chess.model.Game; import chess.model.Game;
import chess.model.Piece; import chess.model.Piece;
/**
* Command to check the possible moves for a given piece.
*/
public class GetPieceAtCommand extends Command{ public class GetPieceAtCommand extends Command{
private final Coordinate pieceCoords; private final Coordinate pieceCoords;

View File

@@ -7,6 +7,11 @@ import chess.controller.event.GameListener;
import chess.model.Game; import chess.model.Game;
import chess.model.Move; import chess.model.Move;
/**
* Command to get the possible moves of a player. Castling and Promotion not included.
* @see CastlingCommand
* @see PromoteCommand
*/
public class GetPlayerMovesCommand extends Command { public class GetPlayerMovesCommand extends Command {
private List<Move> moves; private List<Move> moves;

View File

@@ -9,6 +9,11 @@ import chess.model.Move;
import chess.model.Piece; import chess.model.Piece;
import chess.model.rules.PiecePathChecker; import chess.model.rules.PiecePathChecker;
/*
* Command to move a piece. Castling not included.
*
* @see CastlingCommand
*/
public class MoveCommand extends PlayerCommand { public class MoveCommand extends PlayerCommand {
private final Move move; private final Move move;

View File

@@ -13,6 +13,9 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/**
* Command to create a new game.
*/
public class NewGameCommand extends Command { public class NewGameCommand extends Command {
public CommandResult execute(Game game, GameListener outputSystem) { public CommandResult execute(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard(); final ChessBoard board = game.getBoard();

View File

@@ -13,6 +13,9 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/*
* Command to promote a pawn.
*/
public class PromoteCommand extends PlayerCommand { public class PromoteCommand extends PlayerCommand {
public enum PromoteType { public enum PromoteType {

View File

@@ -5,6 +5,9 @@ import chess.controller.event.GameListener;
import chess.model.Color; import chess.model.Color;
import chess.model.Game; import chess.model.Game;
/**
* Command to surrender a game.
*/
public class SurrenderCommand extends Command { public class SurrenderCommand extends Command {
private final Color player; private final Color player;

View File

@@ -5,6 +5,9 @@ import chess.controller.PlayerCommand;
import chess.controller.event.GameListener; import chess.controller.event.GameListener;
import chess.model.Game; import chess.model.Game;
/**
* Command to undo the last action.
*/
public class UndoCommand extends Command{ public class UndoCommand extends Command{
@Override @Override

View File

@@ -11,6 +11,9 @@ import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
/**
* Create a thread in which the notifications such as Move Not Allowed, Check, Checkmate, Promotion, Surrender, etc. will be sent to update the players.
*/
public class AsyncGameDispatcher extends GameDispatcher { public class AsyncGameDispatcher extends GameDispatcher {
private final List<GameListener> listeners; private final List<GameListener> listeners;

View File

@@ -5,6 +5,9 @@ import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
/**
* Dispatcher for bots, does nothing.
*/
public class EmptyGameDispatcher extends GameDispatcher { public class EmptyGameDispatcher extends GameDispatcher {
@Override @Override

View File

@@ -5,6 +5,10 @@ import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
/**
* Abstract class, provides default implementation of GameListener methods.
* @see GameListener
*/
public abstract class GameAdapter implements GameListener { public abstract class GameAdapter implements GameListener {
@Override @Override

View File

@@ -1,5 +1,8 @@
package chess.controller.event; package chess.controller.event;
/**
* Abstract class, provides a dispatcher for game events.
*/
public abstract class GameDispatcher extends GameAdapter { public abstract class GameDispatcher extends GameAdapter {
public abstract void addListener(GameListener listener); public abstract void addListener(GameListener listener);

View File

@@ -5,6 +5,9 @@ import chess.model.Color;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
/**
* Interface for events to listen.
*/
public interface GameListener { public interface GameListener {
/** /**

View File

@@ -8,7 +8,13 @@ import chess.model.pieces.King;
import chess.model.pieces.Pawn; import chess.model.pieces.Pawn;
import chess.model.rules.PiecePathChecker; import chess.model.rules.PiecePathChecker;
/**
* Chess board entity, composed of cells.
*/
public class ChessBoard { public class ChessBoard {
/**
* Cell of the chess board.
*/
public static class Cell { public static class Cell {
private Piece piece; private Piece piece;
@@ -48,6 +54,10 @@ public class ChessBoard {
this.kingPos = new Coordinate[Color.values().length]; this.kingPos = new Coordinate[Color.values().length];
} }
/**
* Apply a move on the board.
* @param move move to apply
*/
public void applyMove(Move move) { public void applyMove(Move move) {
assert move.isValid() : "Invalid move !"; assert move.isValid() : "Invalid move !";
Piece deadPiece = pieceAt(move.getDeadPieceCoords()); Piece deadPiece = pieceAt(move.getDeadPieceCoords());
@@ -64,12 +74,20 @@ public class ChessBoard {
this.lastVirtualMove = move; this.lastVirtualMove = move;
} }
/**
* Undo the last move
*/
public void undoLastMove() { public void undoLastMove() {
assert this.lastVirtualMove != null : "Can't undo at the beginning!"; assert this.lastVirtualMove != null : "Can't undo at the beginning!";
undoMove(this.lastVirtualMove, this.lastEjectedPiece); undoMove(this.lastVirtualMove, this.lastEjectedPiece);
} }
/**
* Undo the specified move
* @param move
* @param deadPiece
*/
public void undoMove(Move move, Piece deadPiece) { public void undoMove(Move move, Piece deadPiece) {
Piece movingPiece = pieceAt(move.getFinish()); Piece movingPiece = pieceAt(move.getFinish());
pieceComes(movingPiece, move.getStart()); pieceComes(movingPiece, move.getStart());
@@ -79,16 +97,29 @@ public class ChessBoard {
movingPiece.unMove(); movingPiece.unMove();
} }
/**
* Check if the cell is empty
* @param coordinate
* @return true if the cell is empty
*/
public boolean isCellEmpty(Coordinate coordinate) { public boolean isCellEmpty(Coordinate coordinate) {
return pieceAt(coordinate) == null; return pieceAt(coordinate) == null;
} }
/**
* Return the piece at the given coordinates
* @param coordinate
* @return piece at the given coordinates, or null if the coordinates are invalid or the cell is empty
*/
public Piece pieceAt(Coordinate coordinate) { public Piece pieceAt(Coordinate coordinate) {
if (!coordinate.isValid()) if (!coordinate.isValid())
return null; return null;
return cellAt(coordinate).getPiece(); return cellAt(coordinate).getPiece();
} }
/**
* Nuke all pieces of the board
*/
public void clearBoard() { public void clearBoard() {
for (int i = 0; i < Coordinate.VALUE_MAX; i++) { for (int i = 0; i < Coordinate.VALUE_MAX; i++) {
for (int j = 0; j < Coordinate.VALUE_MAX; j++) { for (int j = 0; j < Coordinate.VALUE_MAX; j++) {
@@ -97,24 +128,48 @@ public class ChessBoard {
} }
} }
/**
* Get the cell at the given coordinates
* @param coordinate
* @return
*/
private Cell cellAt(Coordinate coordinate) { private Cell cellAt(Coordinate coordinate) {
return this.cells[coordinate.getX()][coordinate.getY()]; return this.cells[coordinate.getX()][coordinate.getY()];
} }
/*
* Set the piece at the given coordinate
*/
public void pieceComes(Piece piece, Coordinate coordinate) { public void pieceComes(Piece piece, Coordinate coordinate) {
cellAt(coordinate).setPiece(piece); cellAt(coordinate).setPiece(piece);
if (piece instanceof King) if (piece instanceof King)
this.kingPos[piece.getColor().ordinal()] = coordinate; this.kingPos[piece.getColor().ordinal()] = coordinate;
} }
/**
* Remove the piece at the given coordiinates
* @param coordinate
*/
public void pieceLeaves(Coordinate coordinate) { public void pieceLeaves(Coordinate coordinate) {
cellAt(coordinate).setPiece(null); cellAt(coordinate).setPiece(null);
} }
/**
* Find the king of the given color on the board
* @param color
* @return the coordinates of the king
*/
public Coordinate findKing(Color color) { public Coordinate findKing(Color color) {
return kingPos[color.ordinal()]; return kingPos[color.ordinal()];
} }
/**
* Get the allowed starting positions for a piece to attack the given Coordinate. Useful for PGN trasnlation.
* @param finish
* @param color
* @return coordinates of the pieces that could attack
*/
public List<Coordinate> getAllowedStarts(Coordinate finish, Color color) { public List<Coordinate> getAllowedStarts(Coordinate finish, Color color) {
List<Coordinate> starts = new ArrayList<>(); List<Coordinate> starts = new ArrayList<>();
for (int i = 0; i < Coordinate.VALUE_MAX; i++) { for (int i = 0; i < Coordinate.VALUE_MAX; i++) {
@@ -139,6 +194,11 @@ public class ChessBoard {
return starts; return starts;
} }
/**
* Check if the king of the given color is in check
* @param color
* @return true if the king is in check
*/
public boolean isKingInCheck(Color color) { public boolean isKingInCheck(Color color) {
Coordinate kingPos = findKing(color); Coordinate kingPos = findKing(color);
assert kingPos.isValid() : "King position is invalid!"; assert kingPos.isValid() : "King position is invalid!";
@@ -158,10 +218,20 @@ public class ChessBoard {
return false; return false;
} }
/**
* Check if the given player has allowed moves
* @param player
* @return true if the player can move
*/
public boolean hasAllowedMoves(Color player) { public boolean hasAllowedMoves(Color player) {
return !getAllowedMoves(player).isEmpty(); return !getAllowedMoves(player).isEmpty();
} }
/**
* Get the allowed moves for the given player
* @param player
* @return
*/
public List<Move> getAllowedMoves(Color player) { public List<Move> getAllowedMoves(Color player) {
if (this.cachedAllowedMoves != null) { if (this.cachedAllowedMoves != null) {
return this.cachedAllowedMoves; return this.cachedAllowedMoves;
@@ -205,7 +275,10 @@ public class ChessBoard {
return result; return result;
} }
public List<Coordinate> getAllowedMoves(Coordinate pieceCoords) { /**
* Get all the end positions possible of a piece
*/
public List<Coordinate> getPieceAllowedMoves(Coordinate pieceCoords) {
Piece piece = pieceAt(pieceCoords); Piece piece = pieceAt(pieceCoords);
if (piece == null) if (piece == null)
return null; return null;
@@ -233,6 +306,13 @@ public class ChessBoard {
return result; return result;
} }
/**
* Check if the given player can castle with the given rook
* @param color
* @param rookX
* @param kingDirection
* @return true if the player can Castle
*/
private boolean canCastle(Color color, int rookX, Direction kingDirection) { private boolean canCastle(Color color, int rookX, Direction kingDirection) {
if (isKingInCheck(color)) if (isKingInCheck(color))
return false; return false;
@@ -267,20 +347,32 @@ public class ChessBoard {
return obstacle == null; return obstacle == null;
} }
/**
* @return wether the player can perform a kingside castling.
*/
public boolean canSmallCastle(Color color) { public boolean canSmallCastle(Color color) {
return canCastle(color, 7, Direction.Right); return canCastle(color, 7, Direction.Right);
} }
/**
* Check if the given player is allowed to execute a queenside castling.
* @param color
* @return
*/
public boolean canBigCastle(Color color) { public boolean canBigCastle(Color color) {
return canCastle(color, 0, Direction.Left); return canCastle(color, 0, Direction.Left);
} }
/**
* Check if there is a pawn to be promoted by the given player.
* @return
*/
public boolean pawnShouldBePromoted() { public boolean pawnShouldBePromoted() {
return pawnPromotePosition() != null; return pawnPromotePosition() != null;
} }
/** /**
* * Check if there's a pawn in the adversary line on the board
* @return Null if there is no pawn to promote * @return Null if there is no pawn to promote
*/ */
public Coordinate pawnPromotePosition() { public Coordinate pawnPromotePosition() {
@@ -291,7 +383,7 @@ public class ChessBoard {
} }
/** /**
* * Check if there's a pawn of the given player in the adversary line on the board
* @return Null if there is no pawn to promote * @return Null if there is no pawn to promote
*/ */
private Coordinate pawnPromotePosition(Color color) { private Coordinate pawnPromotePosition(Color color) {
@@ -309,6 +401,10 @@ public class ChessBoard {
return null; return null;
} }
/**
* Hash according to the pieces position on the board
* @return hash code
*/
@Override @Override
public int hashCode() { public int hashCode() {
int result = 0; int result = 0;
@@ -323,10 +419,16 @@ public class ChessBoard {
return result; return result;
} }
/**
* @return the last played move
*/
public Move getLastMove() { public Move getLastMove() {
return this.lastMove; return this.lastMove;
} }
/**
* Updates the last move of the board and invalidate the allowedMoves cache.
*/
public void setLastMove(Move lastMove) { public void setLastMove(Move lastMove) {
this.lastMove = lastMove; this.lastMove = lastMove;
this.cachedAllowedMoves = null; this.cachedAllowedMoves = null;

View File

@@ -1,5 +1,8 @@
package chess.model; package chess.model;
/**
* Enumeration of colors for player - either black or white
*/
public enum Color { public enum Color {
White, White,
Black; Black;

View File

@@ -2,6 +2,9 @@ package chess.model;
import java.util.Objects; import java.util.Objects;
/**
* Coordinate of a cell on the chess board.
*/
public class Coordinate { public class Coordinate {
private final int x; private final int x;
private final int y; private final int y;

View File

@@ -1,5 +1,9 @@
package chess.model; package chess.model;
/**
* Enumation of the different directions from a cell in a chessboard, and how to navigate the cells.
*/
public enum Direction { public enum Direction {
Unset(65), Unset(65),

View File

@@ -8,6 +8,10 @@ import java.util.Stack;
import chess.controller.PlayerCommand; import chess.controller.PlayerCommand;
import chess.controller.commands.MoveCommand; import chess.controller.commands.MoveCommand;
/**
* Game class that represents a chess game.
*/
public class Game { public class Game {
private final ChessBoard board; private final ChessBoard board;
private Color playerTurn; private Color playerTurn;
@@ -34,19 +38,24 @@ public class Game {
return playerTurn; return playerTurn;
} }
/**
* Reset the game
*/
public void reset() { public void reset() {
resetPlayerTurn(); resetPlayerTurn();
this.traitsPos.clear(); this.traitsPos.clear();
} }
/**
* Reset the player turn.
* Aka: white for the win
*/
public void resetPlayerTurn() { public void resetPlayerTurn() {
this.playerTurn = Color.White; this.playerTurn = Color.White;
} }
/** /**
* * Save the current board configuration
* @param color the current player turn
* @return true if a draw should be declared
*/ */
public void saveTraitPiecesPos() { public void saveTraitPiecesPos() {
int piecesHash = this.board.hashCode(); int piecesHash = this.board.hashCode();
@@ -63,14 +72,16 @@ public class Game {
} }
/** /**
* * Switch player turn
* @return true if a draw should occur
*/ */
public void switchPlayerTurn() { public void switchPlayerTurn() {
playerTurn = Color.getEnemy(playerTurn); playerTurn = Color.getEnemy(playerTurn);
} }
// this is the bottleneck of algorithms using this chess engine /**
* Check the status of the game ofr the specified player
* @return a GameStatus enum
*/
public GameStatus checkGameStatus(Color color) { public GameStatus checkGameStatus(Color color) {
if (checkDraw()) if (checkDraw())
return GameStatus.Draw; return GameStatus.Draw;
@@ -87,20 +98,32 @@ public class Game {
return GameStatus.OnGoing; return GameStatus.OnGoing;
} }
/**
* Check the status of the gamere
*/
public GameStatus checkGameStatus() { public GameStatus checkGameStatus() {
return checkGameStatus(Color.getEnemy(getPlayerTurn())); return checkGameStatus(Color.getEnemy(getPlayerTurn()));
} }
/**
* Add a player move (basic move, castling, ...) to the game history.
*/
public void addAction(PlayerCommand command) { public void addAction(PlayerCommand command) {
this.movesHistory.add(command); this.movesHistory.add(command);
} }
/**
* @return the last player action
*/
public PlayerCommand getLastAction() { public PlayerCommand getLastAction() {
if (this.movesHistory.isEmpty()) if (this.movesHistory.isEmpty())
return null; return null;
return this.movesHistory.pop(); return this.movesHistory.pop();
} }
/**
* Update the last board move ater an undo.
*/
public void updateLastMove() { public void updateLastMove() {
if (this.movesHistory.isEmpty()) if (this.movesHistory.isEmpty())
return; return;
@@ -111,6 +134,9 @@ public class Game {
} }
} }
/**
* Remove the board configuration occurence from the game history
*/
public void undoTraitPiecesPos() { public void undoTraitPiecesPos() {
int piecesHash = this.board.hashCode(); int piecesHash = this.board.hashCode();
Integer count = this.traitsPos.get(piecesHash); Integer count = this.traitsPos.get(piecesHash);
@@ -122,6 +148,9 @@ public class Game {
return this.movesHistory; return this.movesHistory;
} }
/**
* @return wether a pawn should be promoted
*/
public boolean pawnShouldBePromoted() { public boolean pawnShouldBePromoted() {
return this.board.pawnShouldBePromoted(); return this.board.pawnShouldBePromoted();
} }

View File

@@ -1,6 +1,12 @@
package chess.model; package chess.model;
public class PermissiveGame extends Game { /**
* Game where the most ressource-consuming functions are empty.
* Mostly used by bots.
* @see GameSimulation
*/
public class LightGame extends Game {
@Override @Override
public GameStatus checkGameStatus(Color color) { public GameStatus checkGameStatus(Color color) {

View File

@@ -1,5 +1,9 @@
package chess.model; package chess.model;
/**
* Chess move, composed of a starting position, a finishing position and the eventual enemy pieces taken during the move.
*/
public class Move { public class Move {
private final Coordinate start; private final Coordinate start;
private final Coordinate finish; private final Coordinate finish;
@@ -11,6 +15,10 @@ public class Move {
this.deadPieceCoords = finish; this.deadPieceCoords = finish;
} }
/**
*
* @return true if the move is valid, false otherwise
*/
public boolean isValid() { public boolean isValid() {
return this.start.isValid() && this.finish.isValid() && !this.start.equals(this.finish); return this.start.isValid() && this.finish.isValid() && !this.start.equals(this.finish);
} }
@@ -23,6 +31,10 @@ public class Move {
return finish; return finish;
} }
/**
* Returns the number of cells traversed by the move.
* @return int
*/
public int traversedCells() { public int traversedCells() {
assert isValid() : "Move is invalid!"; assert isValid() : "Move is invalid!";
@@ -41,6 +53,9 @@ public class Move {
return 0; return 0;
} }
/**
* @return the coordinates of the cell in the middle of the move
*/
public Coordinate getMiddle() { public Coordinate getMiddle() {
return Coordinate.fromIndex((getStart().toIndex() + getFinish().toIndex()) / 2); return Coordinate.fromIndex((getStart().toIndex() + getFinish().toIndex()) / 2);
} }

View File

@@ -1,5 +1,9 @@
package chess.model; package chess.model;
/**
* Piece of a game. Posesses a color and the number of time it has been moved.
*/
public abstract class Piece { public abstract class Piece {
private final Color color; private final Color color;

View File

@@ -7,6 +7,10 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/**
* Visitor interface for pieces.
*/
public interface PieceVisitor<T> { public interface PieceVisitor<T> {
default T visit(Piece piece) { default T visit(Piece piece) {

View File

@@ -4,6 +4,9 @@ import chess.model.Color;
import chess.model.Piece; import chess.model.Piece;
import chess.model.PieceVisitor; import chess.model.PieceVisitor;
/**
* Bishop piece.
*/
public class Bishop extends Piece { public class Bishop extends Piece {
public Bishop(Color color) { public Bishop(Color color) {

View File

@@ -4,6 +4,9 @@ import chess.model.Color;
import chess.model.Piece; import chess.model.Piece;
import chess.model.PieceVisitor; import chess.model.PieceVisitor;
/**
* King piece.
*/
public class King extends Piece { public class King extends Piece {
public King(Color color) { public King(Color color) {

View File

@@ -4,6 +4,9 @@ import chess.model.Color;
import chess.model.Piece; import chess.model.Piece;
import chess.model.PieceVisitor; import chess.model.PieceVisitor;
/**
* Knight piece.
*/
public class Knight extends Piece { public class Knight extends Piece {
public Knight(Color color) { public Knight(Color color) {

View File

@@ -4,6 +4,9 @@ import chess.model.Color;
import chess.model.Piece; import chess.model.Piece;
import chess.model.PieceVisitor; import chess.model.PieceVisitor;
/**
* Pawn piece.
*/
public class Pawn extends Piece { public class Pawn extends Piece {
public Pawn(Color color) { public Pawn(Color color) {

View File

@@ -4,6 +4,9 @@ import chess.model.Color;
import chess.model.Piece; import chess.model.Piece;
import chess.model.PieceVisitor; import chess.model.PieceVisitor;
/**
* Queen piece.
*/
public class Queen extends Piece { public class Queen extends Piece {
public Queen(Color color) { public Queen(Color color) {

View File

@@ -4,6 +4,9 @@ import chess.model.Color;
import chess.model.Piece; import chess.model.Piece;
import chess.model.PieceVisitor; import chess.model.PieceVisitor;
/**
* Rook piece.
*/
public class Rook extends Piece { public class Rook extends Piece {
public Rook(Color color) { public Rook(Color color) {

View File

@@ -12,6 +12,10 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/**
* Check if a move can be done.
*/
public class PermissiveRuleChecker implements PieceVisitor<Boolean> { public class PermissiveRuleChecker implements PieceVisitor<Boolean> {
private final Move move; private final Move move;

View File

@@ -14,6 +14,9 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/**
* Check if there are pieces in the path of a move.
*/
public class PiecePathChecker implements PieceVisitor<Boolean> { public class PiecePathChecker implements PieceVisitor<Boolean> {
private final ChessBoard board; private final ChessBoard board;

View File

@@ -19,29 +19,12 @@ import chess.model.Move;
import chess.model.Piece; import chess.model.Piece;
import chess.model.pieces.Pawn; import chess.model.pieces.Pawn;
/**
* Export a game to PGN format.
*/
public class PgnExport { public class PgnExport {
// public static void main(String[] args) {
// final Game game = new Game();
// final CommandExecutor commandExecutor = new CommandExecutor(game);
// DumbAI ai1 = new DumbAI(commandExecutor, Color.White);
// commandExecutor.addListener(ai1);
// DumbAI ai2 = new DumbAI(commandExecutor, Color.Black);
// commandExecutor.addListener(ai2);
// commandExecutor.addListener(new GameAdapter() {
// @Override
// public void onGameEnd() {
// System.out.println(exportGame(game));
// commandExecutor.close();
// }
// });
// commandExecutor.executeCommand(new NewGameCommand());
// }
private static final PiecePgnName piecePgnName = new PiecePgnName(); private static final PiecePgnName piecePgnName = new PiecePgnName();
private static Piece pieceAt(CommandExecutor commandExecutor, Coordinate coordinate) { private static Piece pieceAt(CommandExecutor commandExecutor, Coordinate coordinate) {
@@ -72,6 +55,12 @@ public class PgnExport {
} }
} }
/**
* Resolve PGN ambiguity in the case of two pieces of the same type able to move on the same square.
* @param cmdExec the command executor attached to the game
* @param pieceMove move of the piece
* @return the character that solves the eventual ambiguity, empty if no ambiguity to start with
*/
private static String resolveAmbiguity(CommandExecutor cmdExec, Move pieceMove) { private static String resolveAmbiguity(CommandExecutor cmdExec, Move pieceMove) {
Piece movingPiece = pieceAt(cmdExec, pieceMove.getStart()); Piece movingPiece = pieceAt(cmdExec, pieceMove.getStart());
@@ -105,6 +94,12 @@ public class PgnExport {
return ""; return "";
} }
/**
* From a move, get the capture-part of the associated PGN string.
* @param move the move
* @param movingPiece the piece that is moving
* @return the capture string of the PGN move
*/
private static String capture(MoveCommand move, Piece movingPiece) { private static String capture(MoveCommand move, Piece movingPiece) {
String result = ""; String result = "";
if (move.getDeadPiece() != null) { if (move.getDeadPiece() != null) {

View File

@@ -3,6 +3,10 @@ package chess.pgn;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import common.AssetManager; import common.AssetManager;
/**
* Apply moves from a pgn file at the start of a game.
*/
public class PgnFileSimulator extends PgnSimulator{ public class PgnFileSimulator extends PgnSimulator{
public PgnFileSimulator(CommandExecutor commandExecutor, String fileName) { public PgnFileSimulator(CommandExecutor commandExecutor, String fileName) {

View File

@@ -25,6 +25,10 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/**
* Import a game from PGN format.
*/
public class PgnImport { public class PgnImport {
private static final Map<String, Class<? extends Piece>> pieceMap = Map.of( private static final Map<String, Class<? extends Piece>> pieceMap = Map.of(
@@ -46,6 +50,13 @@ public class PgnImport {
return getMoves(parts[parts.length - 1]); return getMoves(parts[parts.length - 1]);
} }
private static final int COORDINATE_ANY = -1;
/**
* Parse the moves from a PGN string.
* @param unparsedMoves
* @return
*/
private static List<PlayerCommand> getMoves(String unparsedMoves) { private static List<PlayerCommand> getMoves(String unparsedMoves) {
String[] moves = unparsedMoves.replaceAll("\\{.*?\\}", "") // Remove comments String[] moves = unparsedMoves.replaceAll("\\{.*?\\}", "") // Remove comments
.replaceAll("\\n", " ") // Remove new lines .replaceAll("\\n", " ") // Remove new lines
@@ -75,6 +86,12 @@ public class PgnImport {
return instructions; return instructions;
} }
/**
* Parse a move from the PGN format and plays it in the given game.
* @param move
* @param game
* @return
*/
private static List<PlayerCommand> parseMove(String move, Game game) { private static List<PlayerCommand> parseMove(String move, Game game) {
if (move.equals("O-O-O")) if (move.equals("O-O-O"))
return Arrays.asList(new CastlingCommand(true)); return Arrays.asList(new CastlingCommand(true));
@@ -100,7 +117,7 @@ public class PgnImport {
assert move.length() == 3 || move.length() == 2; assert move.length() == 3 || move.length() == 2;
Coordinate ambiguity = new Coordinate(-1, -1); Coordinate ambiguity = new Coordinate(COORDINATE_ANY, COORDINATE_ANY);
// ambiguity // ambiguity
if (move.length() == 3) { if (move.length() == 3) {
@@ -120,8 +137,17 @@ public class PgnImport {
return cmds; return cmds;
} }
private static Coordinate getStartCoord(Coordinate dest, Class<? extends Piece> pieceType, Coordinate ambiguity, /**
Game game) { * Get the start coordinate of a piece.
* @param dest the end position of the moving piece
* @param pieceType the type of the piece
* @param ambiguity coordinates of the moving piece, indicated with the constant COORDINATE_ANY.
* @param game the game
* @see COORDINATE_ANY
* @see getAmbiguityPattern
* @return the start coordinate of the piece
*/
private static Coordinate getStartCoord(Coordinate dest, Class<? extends Piece> pieceType, Coordinate ambiguity, Game game) {
final ChessBoard board = game.getBoard(); final ChessBoard board = game.getBoard();
List<Coordinate> starts = board.getAllowedStarts(dest, game.getPlayerTurn()); List<Coordinate> starts = board.getAllowedStarts(dest, game.getPlayerTurn());
@@ -148,10 +174,10 @@ public class PgnImport {
} }
private static boolean coordPatternMatch(Coordinate coord, Coordinate pattern) { private static boolean coordPatternMatch(Coordinate coord, Coordinate pattern) {
if (pattern.getX() != -1 && coord.getX() != pattern.getX()) if (pattern.getX() != COORDINATE_ANY && coord.getX() != pattern.getX())
return false; return false;
if (pattern.getY() != -1 && coord.getY() != pattern.getY()) if (pattern.getY() != COORDINATE_ANY && coord.getY() != pattern.getY())
return false; return false;
return true; return true;
@@ -159,8 +185,8 @@ public class PgnImport {
private static Coordinate getAmbiguityPattern(char amb) { private static Coordinate getAmbiguityPattern(char amb) {
if (Character.isDigit(amb)) if (Character.isDigit(amb))
return new Coordinate(-1, getYCoord(amb)); return new Coordinate(COORDINATE_ANY, getYCoord(amb));
return new Coordinate(getXCoord(amb), -1); return new Coordinate(getXCoord(amb), COORDINATE_ANY);
} }
private static Coordinate stringToCoordinate(String coordinates) { private static Coordinate stringToCoordinate(String coordinates) {

View File

@@ -8,6 +8,10 @@ import chess.controller.PlayerCommand;
import chess.controller.event.GameAdapter; import chess.controller.event.GameAdapter;
import common.Signal0; import common.Signal0;
/**
* Apply moves from a pgn string at the start of a game.
*/
public class PgnSimulator extends GameAdapter { public class PgnSimulator extends GameAdapter {
private final CommandExecutor commandExecutor; private final CommandExecutor commandExecutor;

View File

@@ -8,6 +8,10 @@ import chess.model.pieces.Pawn;
import chess.model.pieces.Queen; import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
/**
* Visitor that returns the PGN name of a piece.
*/
public class PiecePgnName implements PieceVisitor<String> { public class PiecePgnName implements PieceVisitor<String> {
@Override @Override

View File

@@ -5,6 +5,9 @@ import org.joml.Vector2f;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.joml.Vector4f; import org.joml.Vector4f;
/**
* 3D camera
*/
public class Camera { public class Camera {
public static final float fov = 70.0f; public static final float fov = 70.0f;
public static final float zNear = 0.01f; public static final float zNear = 0.01f;
@@ -66,6 +69,10 @@ public class Camera {
return new Matrix4f().lookAt(pos, center, up); return new Matrix4f().lookAt(pos, center, up);
} }
/**
* Performs a ray casting to find the selected cell by the cursor
* @return the position of the cell in world coordinates
*/
public Vector2f getCursorWorldFloorPos(Vector2f screenPos, int windowWidth, int windowHeight) { public Vector2f getCursorWorldFloorPos(Vector2f screenPos, int windowWidth, int windowHeight) {
float relativeX = (screenPos.x / (float) windowWidth * 2.0f) - 1.0f; float relativeX = (screenPos.x / (float) windowWidth * 2.0f) - 1.0f;
float relativeY = 1.0f - (screenPos.y / (float) windowHeight * 2.0f); float relativeY = 1.0f - (screenPos.y / (float) windowHeight * 2.0f);

View File

@@ -6,6 +6,9 @@ import java.util.List;
import chess.view.DDDrender.opengl.VertexArray; import chess.view.DDDrender.opengl.VertexArray;
/**
* OpenGL model.
*/
public class DDDModel implements Closeable { public class DDDModel implements Closeable {
private final List<VertexArray> vaos; private final List<VertexArray> vaos;

View File

@@ -4,7 +4,10 @@ import org.joml.Vector2f;
import chess.model.Coordinate; import chess.model.Coordinate;
class DDDPlacement { /**
* Helper functions to convert from 2D to 3D coordinates systems.
*/
public class DDDPlacement {
public static Vector2f coordinatesToVector(Coordinate coo) { public static Vector2f coordinatesToVector(Coordinate coo) {
return coordinatesToVector(coo.getX(), coo.getY()); return coordinatesToVector(coo.getX(), coo.getY());
} }

View File

@@ -68,53 +68,52 @@ public class DDDView extends GameAdapter implements CommandSender {
this.click = coordinate; this.click = coordinate;
} }
// Invoked when a cell is clicked /**
* Invoked when a cell is clicked. The first click selects the piece to move, the second click selects the destination.
* @param coordinate
*/
private void onCellClick(Coordinate coordinate) { private void onCellClick(Coordinate coordinate) {
if (this.click == null) { // case: first click if (this.click == null) { // case: first click
List<Coordinate> allowedMoves = getPieceAllowedMoves(coordinate); List<Coordinate> allowedMoves = getPieceAllowedMoves(coordinate);
if (allowedMoves.isEmpty()) { // case: no movement possible for piece if (allowedMoves.isEmpty()) { // case: no movement possible for piece
System.out.println("This piece cannot be moved at the moment.");
return; return;
} }
setClick(coordinate); setClick(coordinate);
previewMoves(coordinate); previewMoves(coordinate);
// this.boardEntity.setCellColor(coordinate, BLUE);
System.out.println("First click on " + coordinate);
return; return;
} }
// case: second click // case: second click
GetAllowedMovesPieceCommand movesCommand = new GetAllowedMovesPieceCommand(this.click); GetAllowedMovesPieceCommand movesCommand = new GetAllowedMovesPieceCommand(this.click);
if (sendCommand(movesCommand) == CommandResult.NotAllowed) { // case: invalid piece to move if (sendCommand(movesCommand) == CommandResult.NotAllowed) { // case: invalid piece to move
cancelPreview(this.click); cancelPreview(this.click);
System.out.println("Nothing to do here.");
cancelClick(); cancelClick();
return; return;
} }
List<Coordinate> allowedMoves = movesCommand.getDestinations(); List<Coordinate> allowedMoves = movesCommand.getDestinations();
if (allowedMoves.isEmpty()) { // case: no movement possible for piece if (allowedMoves.isEmpty()) { // case: no movement possible for piece
cancelPreview(this.click); cancelPreview(this.click);
System.out.println("This piece cannot be moved at the moment.");
cancelClick(); cancelClick();
return; return;
} }
if (allowedMoves.contains(coordinate)) { // case: valid attempt to move if (allowedMoves.contains(coordinate)) { // case: valid attempt to move
System.out.println("Move on " + coordinate);
cancelPreview(this.click); cancelPreview(this.click);
sendMove(new Move(click, coordinate)); sendMove(new Move(click, coordinate));
cancelClick(); cancelClick();
return; return;
} }
if (!(coordinate == this.click)) { if (coordinate != this.click) { // cases: invalid move, selecting another piece
System.out.println("New click on " + coordinate); // cases: invalid move, selecting another piece
cancelPreview(this.click); cancelPreview(this.click);
previewMoves(coordinate); previewMoves(coordinate);
setClick(coordinate); setClick(coordinate);
return; return;
} }
System.out.println("Cancelling click."); // case: cancelling previous click cancelClick(); // case: cancelling previous click
cancelClick();
} }
/**
* Show the possible moves of the piece at the given coordinates: the piece is highlighted in yellow, the allowed moves in red.
* @param coordinate
*/
private void previewMoves(Coordinate coordinate) { private void previewMoves(Coordinate coordinate) {
List<Coordinate> allowedMoves = getPieceAllowedMoves(coordinate); List<Coordinate> allowedMoves = getPieceAllowedMoves(coordinate);
if (allowedMoves.isEmpty()) if (allowedMoves.isEmpty())
@@ -126,7 +125,10 @@ public class DDDView extends GameAdapter implements CommandSender {
} }
} }
// Invoked when a cell is hovered /**
* Invoked when a cell is hovered. The hovered cell is highlighted in red. If the cell contains a piece, its allowed moves are highlighted in red as well.
* @param coordinate
*/
private void onCellEnter(Coordinate coordinate) { private void onCellEnter(Coordinate coordinate) {
if (this.click == null) { if (this.click == null) {
// small test turning a cell red when hovered // small test turning a cell red when hovered
@@ -146,7 +148,10 @@ public class DDDView extends GameAdapter implements CommandSender {
} }
} }
// Invoked when a cell is not hovered anymore /**
* Invoked when a cell is not hovered anymore, cancel that cell's preview.
* @param coordinate
*/
private void onCellExit(Coordinate coordinate) { private void onCellExit(Coordinate coordinate) {
if (this.click == null) { if (this.click == null) {
this.boardEntity.resetCellColor(coordinate); this.boardEntity.resetCellColor(coordinate);
@@ -168,6 +173,10 @@ public class DDDView extends GameAdapter implements CommandSender {
} }
} }
/**
* Cancel the preview of the moves for the given coordinates.
* @param coordinate
*/
private void cancelPreview(Coordinate coordinate) { private void cancelPreview(Coordinate coordinate) {
this.boardEntity.resetCellColor(coordinate); this.boardEntity.resetCellColor(coordinate);
Piece p = getPieceAt(coordinate); Piece p = getPieceAt(coordinate);
@@ -182,6 +191,9 @@ public class DDDView extends GameAdapter implements CommandSender {
} }
} }
/**
* Start the game by initializing the board, creating the events, and starting the game loop.
*/
@Override @Override
public void onGameStart() { public void onGameStart() {
this.window.scheduleTask(() -> { this.window.scheduleTask(() -> {
@@ -216,6 +228,9 @@ public class DDDView extends GameAdapter implements CommandSender {
ImGui.text("FPS : " + (int) ImGui.getIO().getFramerate()); ImGui.text("FPS : " + (int) ImGui.getIO().getFramerate());
} }
/**
* Render the footer of the window.
*/
private void onFooterRender() { private void onFooterRender() {
ImGui.beginDisabled(!canDoCastling()); ImGui.beginDisabled(!canDoCastling());
if (ImGui.button("Roque")) { if (ImGui.button("Roque")) {
@@ -243,6 +258,13 @@ public class DDDView extends GameAdapter implements CommandSender {
} }
} }
/**
* Create the 3D piece at the given coordinates
* @param piece the piece to create
* @param coordinate the coordinates of the piece
* @return the piece entity
* @throws IOException
*/
private PieceEntity createDefault(Piece piece, Coordinate coordinate) throws IOException { private PieceEntity createDefault(Piece piece, Coordinate coordinate) throws IOException {
Vector2f pieceBoardPos = DDDPlacement.coordinatesToVector(coordinate); Vector2f pieceBoardPos = DDDPlacement.coordinatesToVector(coordinate);
Vector3f pieceWorldPos = new Vector3f(pieceBoardPos.x(), 0, pieceBoardPos.y()); Vector3f pieceWorldPos = new Vector3f(pieceBoardPos.x(), 0, pieceBoardPos.y());
@@ -252,6 +274,10 @@ public class DDDView extends GameAdapter implements CommandSender {
piece.getColor() == Color.White ? 0.0f : (float) Math.PI); piece.getColor() == Color.White ? 0.0f : (float) Math.PI);
} }
/**
* Create the 3D board and add the pieces.
* @throws IOException
*/
private void initBoard() throws IOException { private void initBoard() throws IOException {
for (int i = 0; i < Coordinate.VALUE_MAX; i++) { for (int i = 0; i < Coordinate.VALUE_MAX; i++) {
for (int j = 0; j < Coordinate.VALUE_MAX; j++) { for (int j = 0; j < Coordinate.VALUE_MAX; j++) {
@@ -268,6 +294,7 @@ public class DDDView extends GameAdapter implements CommandSender {
} }
/** /**
* Calculate the position of the point at the t position on a Bezier curve spanning from the begin point to the end point and goign through the control point.
* @param begin begin * @param begin begin
* @param middle control point * @param middle control point
* @param end end * @param end end
@@ -278,8 +305,14 @@ public class DDDView extends GameAdapter implements CommandSender {
return begin.mul((1.0f - t) * (1.0f - t)).add(middle.mul(2.0f * t * (1.0f - t))).add(end.mul(t * t)); return begin.mul((1.0f - t) * (1.0f - t)).add(middle.mul(2.0f * t * (1.0f - t))).add(end.mul(t * t));
} }
/**
* Move the piece on the board according to the given move. Called in a loop to animate the movement.
* @param progress the proportion of the animation already done
* @param piece
* @param move
*/
private void pieceTick(float progress, PieceEntity piece, Move move) { private void pieceTick(float progress, PieceEntity piece, Move move) {
float height = 1; // how much the piece is raised float height = 1; // how high the piece is raised
Vector2f pieceStartBoard = DDDPlacement.coordinatesToVector(move.getStart()); Vector2f pieceStartBoard = DDDPlacement.coordinatesToVector(move.getStart());
Vector2f pieceDestinationBoard = DDDPlacement.coordinatesToVector(move.getFinish()); Vector2f pieceDestinationBoard = DDDPlacement.coordinatesToVector(move.getFinish());
Vector3f start = new Vector3f(pieceStartBoard.x(), 0, pieceStartBoard.y()); Vector3f start = new Vector3f(pieceStartBoard.x(), 0, pieceStartBoard.y());
@@ -290,6 +323,10 @@ public class DDDView extends GameAdapter implements CommandSender {
piece.setPosition(bezierCurve(start, top, end, progress)); piece.setPosition(bezierCurve(start, top, end, progress));
} }
/**
* Move the pieces on the board according to the given moves.
* @param moves
*/
private void move3DPieces(List<Move> moves) { private void move3DPieces(List<Move> moves) {
final List<PieceEntity> pEntities = new ArrayList<>(moves.size()); final List<PieceEntity> pEntities = new ArrayList<>(moves.size());
final List<Consumer<Float>> consumers = new ArrayList<>(moves.size()); final List<Consumer<Float>> consumers = new ArrayList<>(moves.size());
@@ -341,12 +378,19 @@ public class DDDView extends GameAdapter implements CommandSender {
move3DPieces(List.of(move)); move3DPieces(List.of(move));
} }
/**
* Rotate the camera. Calles in a loop to animate the rotation.
* @param delta the proportion of the animation already done
*/
private void cameraTick(float delta) { private void cameraTick(float delta) {
int oddAnimationTurn = (2 * (animationTurns - 1)) + 1; int oddAnimationTurn = (2 * (animationTurns - 1)) + 1;
final float angle = (float) Math.PI; final float angle = (float) Math.PI;
this.camera.setRotateAngle(this.camera.getRotateAngle() + angle * delta * oddAnimationTurn / animationTime); this.camera.setRotateAngle(this.camera.getRotateAngle() + angle * delta * oddAnimationTurn / animationTime);
} }
/**
* Rotate the camera so the current player faces his enemy's pieces.
*/
private void cameraRotate() { private void cameraRotate() {
float end = this.camera.getRotateAngle() + (float) Math.PI; float end = this.camera.getRotateAngle() + (float) Math.PI;
Consumer<Float> rotationConsumer = this::cameraTick; Consumer<Float> rotationConsumer = this::cameraTick;
@@ -365,6 +409,9 @@ public class DDDView extends GameAdapter implements CommandSender {
cameraRotate(); cameraRotate();
} }
/**
* Run the game.
*/
public void run() { public void run() {
this.window.run(); this.window.run();
@@ -377,6 +424,11 @@ public class DDDView extends GameAdapter implements CommandSender {
} }
} }
/**
* Render a popup with the given title and content.
* @param title
* @param content
*/
private void renderPopup(String title, Runnable content) { private void renderPopup(String title, Runnable content) {
ImVec2 center = ImGui.getMainViewport().getCenter(); ImVec2 center = ImGui.getMainViewport().getCenter();
ImGui.setNextWindowPos(center, ImGuiCond.Appearing, new ImVec2(0.5f, 0.5f)); ImGui.setNextWindowPos(center, ImGuiCond.Appearing, new ImVec2(0.5f, 0.5f));
@@ -400,6 +452,9 @@ public class DDDView extends GameAdapter implements CommandSender {
renderPopup(title, () -> ImGui.text(text)); renderPopup(title, () -> ImGui.text(text));
} }
/**
* Open the promotion dialog.
*/
private void renderPromoteDialog() { private void renderPromoteDialog() {
renderPopup("Promotion", () -> { renderPopup("Promotion", () -> {
ImGui.text("Select the promotion type :"); ImGui.text("Select the promotion type :");
@@ -414,6 +469,9 @@ public class DDDView extends GameAdapter implements CommandSender {
}); });
} }
/**
* List of possible popups.
*/
private void renderPopups() { private void renderPopups() {
renderPopup("Check", "Your king is in check"); renderPopup("Check", "Your king is in check");
renderPopup("Checkmate", "Checkmate, it's a win!"); renderPopup("Checkmate", "Checkmate, it's a win!");
@@ -427,6 +485,10 @@ public class DDDView extends GameAdapter implements CommandSender {
renderPopup("End", "End of the game, thank you for playing!"); renderPopup("End", "End of the game, thank you for playing!");
} }
/**
* Open the popup identified by the given title and block the current thread until the popup is closed.
* @param title the title of the popup to open
*/
private void openPopup(String title) { private void openPopup(String title) {
this.waitingPopup = title; this.waitingPopup = title;
// block the current thread until the popup is closed // block the current thread until the popup is closed
@@ -485,6 +547,9 @@ public class DDDView extends GameAdapter implements CommandSender {
openPopup("Promotion"); openPopup("Promotion");
} }
/**
* Update the view with the promoted piece
*/
@Override @Override
public void onPawnPromoted(PromoteType promotion, Coordinate coordinate) { public void onPawnPromoted(PromoteType promotion, Coordinate coordinate) {
this.window.scheduleTask(() -> { this.window.scheduleTask(() -> {

View File

@@ -15,6 +15,9 @@ import chess.view.DDDrender.shader.BoardShader;
import chess.view.DDDrender.shader.PieceShader; import chess.view.DDDrender.shader.PieceShader;
import chess.view.DDDrender.shader.ShaderProgram; import chess.view.DDDrender.shader.ShaderProgram;
/**
* Basic 3D renderer
*/
public class Renderer implements Closeable { public class Renderer implements Closeable {
private BoardShader boardShader; private BoardShader boardShader;
private PieceShader pieceShader; private PieceShader pieceShader;

View File

@@ -37,6 +37,9 @@ import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.system.MemoryStack.*; import static org.lwjgl.system.MemoryStack.*;
import static org.lwjgl.system.MemoryUtil.*; import static org.lwjgl.system.MemoryUtil.*;
/**
* GLFW window.
*/
public class Window implements Closeable { public class Window implements Closeable {
// The window handle // The window handle
@@ -74,20 +77,39 @@ public class Window implements Closeable {
this.regularTasks = new ArrayList<>(); this.regularTasks = new ArrayList<>();
} }
/**
* Add a task to be executed in the next frames.
* @param task
*/
public synchronized void addRegularTask(Consumer<Float> task) { public synchronized void addRegularTask(Consumer<Float> task) {
this.regularTasks.add(task); this.regularTasks.add(task);
} }
/**
* Remove a task that had been set to be executed in the next frames.
* @param task
*/
public synchronized void removeRegularTask(Consumer<Float> task) {this.regularTasks.remove(task);} public synchronized void removeRegularTask(Consumer<Float> task) {this.regularTasks.remove(task);}
/**
* Schedule a task to be executed in the next frame (3d thread).
* @param runnable
*/
public synchronized void scheduleTask(Runnable runnable) { public synchronized void scheduleTask(Runnable runnable) {
this.tasks.add(runnable); this.tasks.add(runnable);
} }
public synchronized Runnable getNextTask() { /**
* Get the next task to be executed.
* @return
*/
private synchronized Runnable getNextTask() {
return this.tasks.poll(); return this.tasks.poll();
} }
/**
* Run the window.
*/
public void run() { public void run() {
System.out.println("LWJGL " + Version.getVersion() + "!"); System.out.println("LWJGL " + Version.getVersion() + "!");
@@ -108,6 +130,9 @@ public class Window implements Closeable {
ImGui.destroyContext(); ImGui.destroyContext();
} }
/**
* Set the configuration of ImGui
*/
private void initImGui() { private void initImGui() {
ImGui.setCurrentContext(ImGui.createContext()); ImGui.setCurrentContext(ImGui.createContext());
@@ -120,11 +145,13 @@ public class Window implements Closeable {
ImGui.getIO().getFonts().addFontFromMemoryTTF(AssetManager.getResource("fonts/comic.ttf").readAllBytes(), ImGui.getIO().getFonts().addFontFromMemoryTTF(AssetManager.getResource("fonts/comic.ttf").readAllBytes(),
50.0f, config); 50.0f, config);
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
} }
/**
* Initialize the window.
*/
private void init() { private void init() {
// Setup an error callback. The default implementation // Setup an error callback. The default implementation
// will print the error message in System.err. // will print the error message in System.err.
@@ -197,6 +224,10 @@ public class Window implements Closeable {
} }
} }
/**
* Execute the tasks in the queue.
* @param delta time since the last frame
*/
private synchronized void executeTasks(float delta) { private synchronized void executeTasks(float delta) {
Runnable task = getNextTask(); Runnable task = getNextTask();
while (task != null) { while (task != null) {
@@ -208,6 +239,13 @@ public class Window implements Closeable {
} }
} }
/**
* Check the cursor position to identify the cell under it.
* @param cursorPosX position of cursor on the x axis
* @param cursorPosY position of cursor on the y axis
* @param windowWidth width of the window
* @param windowHeight height of the window
*/
private void checkCursor(float cursorPosX, float cursorPosY, int windowWidth, int windowHeight) { private void checkCursor(float cursorPosX, float cursorPosY, int windowWidth, int windowHeight) {
Vector2f cursorPos = this.cam.getCursorWorldFloorPos(new Vector2f(cursorPosX, cursorPosY), windowWidth, Vector2f cursorPos = this.cam.getCursorWorldFloorPos(new Vector2f(cursorPosX, cursorPosY), windowWidth,
windowHeight); windowHeight);
@@ -263,6 +301,9 @@ public class Window implements Closeable {
ImGui.end(); ImGui.end();
} }
/**
* Keep on rendering until the user close the window.
*/
private void loop() { private void loop() {
// Set the clear color // Set the clear color
@@ -306,6 +347,9 @@ public class Window implements Closeable {
} }
} }
/**
* Closes the window
*/
public void stop() { public void stop() {
shouldBeClosed = true; shouldBeClosed = true;
} }

View File

@@ -16,6 +16,11 @@ public class BoardModelLoader {
private static final Vector3f WHITE = new Vector3f(1, 1, 1); private static final Vector3f WHITE = new Vector3f(1, 1, 1);
private static final Vector3f BLACK = new Vector3f(0, 0, 0); private static final Vector3f BLACK = new Vector3f(0, 0, 0);
/**
* Create the points to make a 3D board.
* Note of developers: "Trust me on this one, bro".
* @return array of 3D points, corressponding to the cells composing the board
*/
private static float[] GetBoardPositions() { private static float[] GetBoardPositions() {
float[] positions = new float[BOARD_SIZE * SQUARE_VERTEX_COUNT * 3]; float[] positions = new float[BOARD_SIZE * SQUARE_VERTEX_COUNT * 3];
for (int i = 0; i < BOARD_WIDTH; i++) { for (int i = 0; i < BOARD_WIDTH; i++) {
@@ -50,6 +55,11 @@ public class BoardModelLoader {
return positions; return positions;
} }
/**
* Assign each cell of the bopard to a color.
* Note of developers: "Why are you even reading this ?"
* @return array of colors, corresponding to the cells composing the board
*/
private static float[] GetBoardColors() { private static float[] GetBoardColors() {
float[] colors = new float[BOARD_SIZE * SQUARE_VERTEX_COUNT * 3]; float[] colors = new float[BOARD_SIZE * SQUARE_VERTEX_COUNT * 3];
for (int i = 0; i < BOARD_WIDTH; i++) { for (int i = 0; i < BOARD_WIDTH; i++) {
@@ -66,6 +76,11 @@ public class BoardModelLoader {
return colors; return colors;
} }
/**
* Return which points compose each cell.
* Note of developers: "You should stop before you have an heart attack"
* @return array of indicies, corresponding to the cells composing the board
*/
private static int[] GetBoardIndicies() { private static int[] GetBoardIndicies() {
int[] indices = new int[BOARD_SIZE * 6]; int[] indices = new int[BOARD_SIZE * 6];
for (int i = 0; i < BOARD_SIZE; i++) { for (int i = 0; i < BOARD_SIZE; i++) {
@@ -79,6 +94,11 @@ public class BoardModelLoader {
return indices; return indices;
} }
/**
* Create an OpenGL VertexArrayObject (VAO) using all of the functions above for data.
* Note of developers : "Stop annoying me and go read the doc of OpenGL yourself. Please?"
* @return the VAO
*/
public static VertexArray GetBoardModel() { public static VertexArray GetBoardModel() {
ElementBuffer eBuffer = new ElementBuffer(GetBoardIndicies()); ElementBuffer eBuffer = new ElementBuffer(GetBoardIndicies());
VertexArray vao = new VertexArray(eBuffer); VertexArray vao = new VertexArray(eBuffer);

View File

@@ -27,6 +27,9 @@ public class ModelLoader {
private static final int VERTEX_POSITION_INDEX = 0; private static final int VERTEX_POSITION_INDEX = 0;
private static final int VERTEX_NORMAL_INDEX = 1; private static final int VERTEX_NORMAL_INDEX = 1;
/**
* Note of developers: "Kill me please"
*/
private static float[] toFloatArray(List<Float> list) { private static float[] toFloatArray(List<Float> list) {
float[] result = new float[list.size()]; float[] result = new float[list.size()];
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
@@ -35,6 +38,9 @@ public class ModelLoader {
return result; return result;
} }
/**
* Note of developers : "I'd rather write assembly code than watch this again"
*/
private static int[] toIntArray(List<Integer> list) { private static int[] toIntArray(List<Integer> list) {
int[] result = new int[list.size()]; int[] result = new int[list.size()];
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
@@ -43,6 +49,12 @@ public class ModelLoader {
return result; return result;
} }
/**
* Process a mesh and create a vertex array object from it.
* @param mesh the mesh to process
* @param scene the model scene
* @return
*/
private static VertexArray processMesh(AIMesh mesh, AIScene scene) { private static VertexArray processMesh(AIMesh mesh, AIScene scene) {
List<Float> positions = new ArrayList<>(); List<Float> positions = new ArrayList<>();
List<Float> normals = new ArrayList<>(); List<Float> normals = new ArrayList<>();
@@ -90,6 +102,12 @@ public class ModelLoader {
} }
/**
* Recursively process a node and its children.
* @param node
* @param scene
* @param meshes
*/
private static void processNode(AINode node, AIScene scene, List<VertexArray> meshes) { private static void processNode(AINode node, AIScene scene, List<VertexArray> meshes) {
for (int i = 0; i < node.mNumChildren(); i++) { for (int i = 0; i < node.mNumChildren(); i++) {
AINode child = AINode.create(node.mChildren().get(i)); AINode child = AINode.create(node.mChildren().get(i));
@@ -101,6 +119,9 @@ public class ModelLoader {
} }
} }
/**
* Load a 3D model from a file (usually .fbx)
*/
public static DDDModel loadModel(String filename) throws IOException { public static DDDModel loadModel(String filename) throws IOException {
InputStream input = AssetManager.getResource(filename); InputStream input = AssetManager.getResource(filename);
byte[] buffer = input.readAllBytes(); byte[] buffer = input.readAllBytes();

View File

@@ -15,6 +15,9 @@ import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
import chess.view.DDDrender.DDDModel; import chess.view.DDDrender.DDDModel;
/**
* Visitor that returns the 3d model of a piece.
*/
public class Piece3DModel implements PieceVisitor<String> { public class Piece3DModel implements PieceVisitor<String> {
private static final String basePath = "3d/"; private static final String basePath = "3d/";

View File

@@ -30,6 +30,11 @@ public abstract class ShaderProgram implements Closeable {
GL30.glUseProgram(0); GL30.glUseProgram(0);
} }
/**
* Load the shader program.
* @param vertexSource the source code of the vertex shader.
* @param fragmentSource the source code of the fragment shader.
*/
public void LoadProgram(String vertexSource, String fragmentSource) { public void LoadProgram(String vertexSource, String fragmentSource) {
this.vertexShaderId = LoadShader(vertexSource, GL30.GL_VERTEX_SHADER); this.vertexShaderId = LoadShader(vertexSource, GL30.GL_VERTEX_SHADER);
this.fragmentShaderId = LoadShader(fragmentSource, GL30.GL_FRAGMENT_SHADER); this.fragmentShaderId = LoadShader(fragmentSource, GL30.GL_FRAGMENT_SHADER);
@@ -47,6 +52,12 @@ public abstract class ShaderProgram implements Closeable {
GetAllUniformLocation(); GetAllUniformLocation();
} }
/**
* Load a shader from source code.
* @param source
* @param type
* @return
*/
private int LoadShader(String source, int type) { private int LoadShader(String source, int type) {
int shaderId = GL30.glCreateShader(type); int shaderId = GL30.glCreateShader(type);

View File

@@ -11,6 +11,9 @@ import chess.view.DDDrender.loader.BoardModelLoader;
import chess.view.DDDrender.opengl.VertexArray; import chess.view.DDDrender.opengl.VertexArray;
import chess.view.DDDrender.opengl.VertexBuffer; import chess.view.DDDrender.opengl.VertexBuffer;
/**
* Abstraction of the 3D model of the board.
*/
public class BoardEntity extends Entity { public class BoardEntity extends Entity {
private final VertexArray vao; private final VertexArray vao;
@@ -24,6 +27,11 @@ public class BoardEntity extends Entity {
this.colorVbo = this.vao.getVertexBuffers().get(1); this.colorVbo = this.vao.getVertexBuffers().get(1);
} }
/**
* Set the color of a cell.
* @param coord the coordinate of the cell.
* @param color the color of the cell in RGB format.
*/
public void setCellColor(Coordinate coord, Vector3f color) { public void setCellColor(Coordinate coord, Vector3f color) {
float[] data = { color.x, color.y, color.z, color.x, color.y, color.z, color.x, color.y, color.z, color.x, float[] data = { color.x, color.y, color.z, color.x, color.y, color.z, color.x, color.y, color.z, color.x,
color.y, color.z}; color.y, color.z};

View File

@@ -6,6 +6,9 @@ import org.joml.Matrix4f;
import chess.view.DDDrender.Renderer; import chess.view.DDDrender.Renderer;
/**
* Abstract class for all entities in the 3D view.
*/
public abstract class Entity implements Closeable{ public abstract class Entity implements Closeable{
public abstract void render(Renderer renderer); public abstract void render(Renderer renderer);

View File

@@ -8,6 +8,9 @@ import org.joml.Vector3f;
import chess.view.DDDrender.DDDModel; import chess.view.DDDrender.DDDModel;
import chess.view.DDDrender.Renderer; import chess.view.DDDrender.Renderer;
/**
* Generic type for 3D model that can be rendered.
*/
public class ModelEntity extends Entity { public class ModelEntity extends Entity {
protected Vector3f position; protected Vector3f position;

View File

@@ -7,6 +7,9 @@ import org.joml.Vector3f;
import chess.model.Piece; import chess.model.Piece;
import chess.view.DDDrender.loader.Piece3DModel; import chess.view.DDDrender.loader.Piece3DModel;
/**
* Model entity of a piece. Loads the correct model of the resources files for the kind of piece.
*/
public class PieceEntity extends ModelEntity { public class PieceEntity extends ModelEntity {
private static final Piece3DModel modelLoader = new Piece3DModel(); private static final Piece3DModel modelLoader = new Piece3DModel();

View File

@@ -9,6 +9,9 @@ import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
import chess.model.Piece; import chess.model.Piece;
/**
* Contains all 3D entities.
*/
public class World implements Closeable{ public class World implements Closeable{
/** Renderable entity list */ /** Renderable entity list */
private final List<Entity> entites; private final List<Entity> entites;

View File

@@ -10,6 +10,10 @@ import java.net.URISyntaxException;
import common.AssetManager; import common.AssetManager;
/**
* Manage audio files: download, save, and load them.
*/
public class AudioFiles { public class AudioFiles {
private static final String baseURL = "https://images.chesscomfiles.com/chess-themes/sounds/_WAV_/default/"; private static final String baseURL = "https://images.chesscomfiles.com/chess-themes/sounds/_WAV_/default/";

View File

@@ -8,7 +8,15 @@ import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Clip; import javax.sound.sampled.Clip;
/**
* Audio player class to play sound files.
*/
public class AudioPlayer { public class AudioPlayer {
/**
* Play a sound file.
* @param audio the audio input stream to play
*/
public static void playSound(InputStream audio) { public static void playSound(InputStream audio) {
new Thread(new Runnable() { new Thread(new Runnable() {
// The wrapper thread is unnecessary, unless it blocks on the // The wrapper thread is unnecessary, unless it blocks on the
@@ -27,6 +35,11 @@ public class AudioPlayer {
}).start(); }).start();
} }
/**
* Convert the given audio input stream to PCM format.
* @param audioInputStream the audio input stream to convert
* @return
*/
private static AudioInputStream convertToPCM(AudioInputStream audioInputStream) { private static AudioInputStream convertToPCM(AudioInputStream audioInputStream) {
AudioFormat m_format = audioInputStream.getFormat(); AudioFormat m_format = audioInputStream.getFormat();

View File

@@ -5,6 +5,9 @@ import chess.controller.event.GameAdapter;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
/**
* Class to handle audio events in the game.
*/
public class GameAudio extends GameAdapter { public class GameAudio extends GameAdapter {
private final boolean functional; private final boolean functional;

View File

@@ -1,5 +1,8 @@
package chess.view.consolerender; package chess.view.consolerender;
/**
* Colors class for console output, contains ANSI escape codes.
*/
public class Colors { public class Colors {
// Reset // Reset
public static final String RESET = "\u001B[0m"; // Text Reset public static final String RESET = "\u001B[0m"; // Text Reset
@@ -15,24 +18,24 @@ public class Colors {
public static final String CYAN = "\033[38;2;0;255;255m"; public static final String CYAN = "\033[38;2;0;255;255m";
// Background // Background
public static final String BLACK_BACKGROUND = "\033[40m"; // BLACK public static final String BLACK_BACKGROUND = "\033[40m";
public static final String LIGHT_GRAY_BACKGROUND = "\033[48;2;180;180;180m"; public static final String LIGHT_GRAY_BACKGROUND = "\033[48;2;180;180;180m";
public static final String DARK_GRAY_BACKGROUND = "\033[48;2;120;120;120m"; public static final String DARK_GRAY_BACKGROUND = "\033[48;2;120;120;120m";
public static final String RED_BACKGROUND = "\033[41m"; // RED public static final String RED_BACKGROUND = "\033[41m";
public static final String GREEN_BACKGROUND = "\033[42m"; // GREEN public static final String GREEN_BACKGROUND = "\033[42m";
public static final String YELLOW_BACKGROUND = "\033[43m"; // YELLOW public static final String YELLOW_BACKGROUND = "\033[43m";
public static final String BLUE_BACKGROUND = "\033[44m"; // BLUE public static final String BLUE_BACKGROUND = "\033[44m";
public static final String PURPLE_BACKGROUND = "\033[45m"; // PURPLE public static final String PURPLE_BACKGROUND = "\033[45m";
public static final String CYAN_BACKGROUND = "\033[46m"; // CYAN public static final String CYAN_BACKGROUND = "\033[46m";
public static final String WHITE_BACKGROUND = "\033[47m"; // WHITE public static final String WHITE_BACKGROUND = "\033[47m";
// High Intensity backgrounds // High Intensity backgrounds
public static final String BLACK_BACKGROUND_BRIGHT = "\033[0;100m";// BLACK public static final String BLACK_BACKGROUND_BRIGHT = "\033[0;100m";
public static final String RED_BACKGROUND_BRIGHT = "\033[0;101m";// RED public static final String RED_BACKGROUND_BRIGHT = "\033[0;101m";
public static final String GREEN_BACKGROUND_BRIGHT = "\033[0;102m";// GREEN public static final String GREEN_BACKGROUND_BRIGHT = "\033[0;102m";
public static final String YELLOW_BACKGROUND_BRIGHT = "\033[0;103m";// YELLOW public static final String YELLOW_BACKGROUND_BRIGHT = "\033[0;103m";
public static final String BLUE_BACKGROUND_BRIGHT = "\033[0;104m";// BLUE public static final String BLUE_BACKGROUND_BRIGHT = "\033[0;104m";
public static final String PURPLE_BACKGROUND_BRIGHT = "\033[0;105m"; // PURPLE public static final String PURPLE_BACKGROUND_BRIGHT = "\033[0;105m";
public static final String CYAN_BACKGROUND_BRIGHT = "\033[0;106m"; // CYAN public static final String CYAN_BACKGROUND_BRIGHT = "\033[0;106m";
public static final String WHITE_BACKGROUND_BRIGHT = "\033[0;107m"; // WHITE public static final String WHITE_BACKGROUND_BRIGHT = "\033[0;107m";
} }

View File

@@ -17,6 +17,10 @@ import java.util.Scanner;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
/**
* Console renderer.
*/
public class Console extends GameAdapter implements CommandSender { public class Console extends GameAdapter implements CommandSender {
private final Scanner scanner = new Scanner(System.in); private final Scanner scanner = new Scanner(System.in);
private final CommandExecutor commandExecutor; private final CommandExecutor commandExecutor;
@@ -34,6 +38,12 @@ public class Console extends GameAdapter implements CommandSender {
this(commandExecutor, true); this(commandExecutor, true);
} }
/**
* Translate a string containing chess coordinates (such as "a1" or "d6") to coordinates.
* @param coordinates the string to translate
* @return the coordinates of the cell
* @throws Exception if the string is not valid
*/
public Coordinate stringToCoordinate(String coordinates) throws Exception { public Coordinate stringToCoordinate(String coordinates) throws Exception {
char xPos = coordinates.charAt(0); char xPos = coordinates.charAt(0);
char yPos = coordinates.charAt(1); char yPos = coordinates.charAt(1);
@@ -52,6 +62,9 @@ public class Console extends GameAdapter implements CommandSender {
return new Coordinate(x, y); return new Coordinate(x, y);
} }
/**
* Open a dialog so the user can, during their turn, move a piece, show move previews, or surrender.
*/
@Override @Override
public void onPlayerTurn(Color color, boolean undone) { public void onPlayerTurn(Color color, boolean undone) {
if (!captureInput) if (!captureInput)
@@ -86,6 +99,11 @@ public class Console extends GameAdapter implements CommandSender {
return true; return true;
} }
/**
* Ask the user to pick a move
* @param color the color of the player
* @return true if there has been a move, false otherwise
*/
public boolean playerPickedMove(Color color) { public boolean playerPickedMove(Color color) {
try { try {
System.out.println("Piece to move, or \"castling\" for a castling"); System.out.println("Piece to move, or \"castling\" for a castling");
@@ -109,6 +127,11 @@ public class Console extends GameAdapter implements CommandSender {
} }
} }
/**
* Ask the user to pick a piece, and show its potential moves
* @param color
* @return
*/
private boolean playerPickedShowMoves(Color color) { private boolean playerPickedShowMoves(Color color) {
try { try {
System.out.println("Piece to examine: "); System.out.println("Piece to examine: ");
@@ -164,6 +187,10 @@ public class Console extends GameAdapter implements CommandSender {
this.executor.shutdown(); this.executor.shutdown();
} }
/**
* Open the dialog to promote a pawn.
* @param pieceCoords the coordinates of the pawn to promote
*/
@Override @Override
public void onPromotePawn(Coordinate pieceCoords) { public void onPromotePawn(Coordinate pieceCoords) {
System.out.println("The pawn on the " + pieceCoords + " coordinates needs to be promoted."); System.out.println("The pawn on the " + pieceCoords + " coordinates needs to be promoted.");
@@ -191,6 +218,9 @@ public class Console extends GameAdapter implements CommandSender {
}); });
} }
/**
* Update and print the board in the console.
*/
@Override @Override
public void onBoardUpdate() { public void onBoardUpdate() {
if (!this.captureInput) if (!this.captureInput)
@@ -218,6 +248,11 @@ public class Console extends GameAdapter implements CommandSender {
System.out.flush(); System.out.flush();
} }
/**
* Display the possible moves of a piece.
* @param piece
* @param moves
*/
public void displayMoves(Coordinate piece, List<Coordinate> moves) { public void displayMoves(Coordinate piece, List<Coordinate> moves) {
StringBuilder string = new StringBuilder(); StringBuilder string = new StringBuilder();
string.append(" a b c d e f g h \n"); string.append(" a b c d e f g h \n");
@@ -261,6 +296,10 @@ public class Console extends GameAdapter implements CommandSender {
System.out.println("Repeated positions!"); System.out.println("Repeated positions!");
} }
/**
* Open different dialogs according to which castling is allowed.
* @return true if a castling was played, false otherwise
*/
private boolean onAskedCastling() { private boolean onAskedCastling() {
return switch (getAllowedCastlings()) { return switch (getAllowedCastlings()) {
case Small -> onSmallCastling(); case Small -> onSmallCastling();
@@ -273,6 +312,10 @@ public class Console extends GameAdapter implements CommandSender {
}; };
} }
/**
* Ask the user to confirm a small castling.
* @return true if the castling was played, false otherwise
*/
private boolean onSmallCastling() { private boolean onSmallCastling() {
System.out.println("Small castling allowed. Confirm with \"y\":"); System.out.println("Small castling allowed. Confirm with \"y\":");
String answer = scanner.nextLine(); String answer = scanner.nextLine();
@@ -283,6 +326,10 @@ public class Console extends GameAdapter implements CommandSender {
} }
} }
/**
* Ask the user to confirm a big castling.
* @return true if the castling was played, false otherwise
*/
private boolean onBigCastling() { private boolean onBigCastling() {
System.out.println("Big castling allowed. Confirm with \"y\":"); System.out.println("Big castling allowed. Confirm with \"y\":");
String answer = scanner.nextLine(); String answer = scanner.nextLine();
@@ -293,6 +340,10 @@ public class Console extends GameAdapter implements CommandSender {
} }
} }
/**
* Ask the user to pick a castling when both are allowed.
* @return true if a castling was played, false otherwise
*/
private boolean onBothCastling() { private boolean onBothCastling() {
System.out.println("Both castlings allowed. Pick \"s\" to play a castling, \"b\" to play a big castling."); System.out.println("Both castlings allowed. Pick \"s\" to play a castling, \"b\" to play a big castling.");
String answer = scanner.nextLine(); String answer = scanner.nextLine();

View File

@@ -5,6 +5,10 @@ import chess.model.Piece;
import chess.model.PieceVisitor; import chess.model.PieceVisitor;
import chess.model.pieces.*; import chess.model.pieces.*;
/**
* Manage appearance of pieces in the console.
*/
public class ConsolePieceName implements PieceVisitor<String> { public class ConsolePieceName implements PieceVisitor<String> {
public String getString(Piece piece){ public String getString(Piece piece){

View File

@@ -19,11 +19,21 @@ import chess.model.pieces.Queen;
import chess.model.pieces.Rook; import chess.model.pieces.Rook;
import common.AssetManager; import common.AssetManager;
/**
* Visitor that returns the png icon of a piece.
*/
public class PieceIcon implements PieceVisitor<String> { public class PieceIcon implements PieceVisitor<String> {
private static final String basePath = "pieces2D/"; private static final String basePath = "pieces2D/";
private static final Map<String, Icon> cache = new HashMap<>(); private static final Map<String, Icon> cache = new HashMap<>();
/**
* Get icon of the given piece.
* @param piece
* @return icon of the piece
* @throws IOException
*/
public Icon getIcon(Piece piece) throws IOException { public Icon getIcon(Piece piece) throws IOException {
if (piece == null) if (piece == null)
return null; return null;
@@ -31,6 +41,12 @@ public class PieceIcon implements PieceVisitor<String> {
return getIcon(path); return getIcon(path);
} }
/**
* Get icon at the given path.
* @param path
* @return icon at the given path
* @throws IOException
*/
private Icon getIcon(String path) throws IOException { private Icon getIcon(String path) throws IOException {
Icon image = cache.get(path); Icon image = cache.get(path);
if (image != null) if (image != null)

View File

@@ -24,6 +24,9 @@ import chess.controller.event.GameListener;
import chess.model.Coordinate; import chess.model.Coordinate;
import chess.model.Move; import chess.model.Move;
/**
* Window for the 2D chess game.
*/
public class Window extends JFrame implements GameListener, CommandSender { public class Window extends JFrame implements GameListener, CommandSender {
private final CommandExecutor commandExecutor; private final CommandExecutor commandExecutor;
@@ -59,6 +62,10 @@ public class Window extends JFrame implements GameListener, CommandSender {
return ((x + y) % 2 == 1) ? Color.DARK_GRAY : Color.LIGHT_GRAY; return ((x + y) % 2 == 1) ? Color.DARK_GRAY : Color.LIGHT_GRAY;
} }
/**
* Build and set the buttons of the window.
* @param bottom the Jpanel in which to add the buttons
*/
@SuppressWarnings("unused") @SuppressWarnings("unused")
private void buildButtons(JPanel bottom) { private void buildButtons(JPanel bottom) {
castlingButton.addActionListener((event) -> { castlingButton.addActionListener((event) -> {
@@ -78,6 +85,9 @@ public class Window extends JFrame implements GameListener, CommandSender {
bottom.add(undoButton); bottom.add(undoButton);
} }
/**
* Build the playable board in the window.
*/
private void buildBoard() { private void buildBoard() {
JPanel content = new JPanel(); JPanel content = new JPanel();
JPanel grid = new JPanel(new GridLayout(8, 8)); JPanel grid = new JPanel(new GridLayout(8, 8));
@@ -114,6 +124,9 @@ public class Window extends JFrame implements GameListener, CommandSender {
updateBoard(); updateBoard();
} }
/**
* Update the board with the newest pieces' positions.
*/
private void updateBoard() { private void updateBoard() {
PieceIcon pieceIcon = new PieceIcon(); PieceIcon pieceIcon = new PieceIcon();
for (int y = 0; y < 8; y++) { for (int y = 0; y < 8; y++) {
@@ -128,6 +141,12 @@ public class Window extends JFrame implements GameListener, CommandSender {
} }
} }
/**
* Show the possible moves of the piece at the given coordinates
* @param x position of the piece on the x axis
* @param y position of the piece on the y axis
* @return true if the piece has possible moves, false otherwise
*/
private boolean previewMoves(int x, int y) { private boolean previewMoves(int x, int y) {
List<Coordinate> allowedMoves = getPieceAllowedMoves(new Coordinate(x, y)); List<Coordinate> allowedMoves = getPieceAllowedMoves(new Coordinate(x, y));
if (allowedMoves.isEmpty()) if (allowedMoves.isEmpty())
@@ -159,6 +178,11 @@ public class Window extends JFrame implements GameListener, CommandSender {
} }
} }
/**
* Handle the click on a cell. Cancel previous rendering, move the previously selected piece if needed.
* @param x position of the cell on the x axis
* @param y position of the cell on the y axis
*/
private void onCellClicked(int x, int y) { private void onCellClicked(int x, int y) {
clearMoves(); clearMoves();
if (this.lastClick == null) { if (this.lastClick == null) {
@@ -230,6 +254,9 @@ public class Window extends JFrame implements GameListener, CommandSender {
buildBoard(); buildBoard();
} }
/**
* Open a dialog box when a pawn needs to be promoted
*/
@Override @Override
public void onPromotePawn(Coordinate pieceCoords) { public void onPromotePawn(Coordinate pieceCoords) {
if (!showPopups) if (!showPopups)

View File

@@ -7,10 +7,18 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
/**
* Manage loading of resources.
*/
public class AssetManager { public class AssetManager {
private static final String gradleBase = "app/src/main/resources/"; private static final String gradleBase = "app/src/main/resources/";
/**
* Get a resource from the classpath or from the file system.
* @param name the name of the resource
* @return the InputStream of the resource
*/
public static InputStream getResource(String name) { public static InputStream getResource(String name) {
// we first search it in files // we first search it in files
InputStream inputStream = getFileInputStream(name); InputStream inputStream = getFileInputStream(name);
@@ -31,6 +39,11 @@ public class AssetManager {
return builder.toString(); return builder.toString();
} }
/**
* Get a resource from the file system.
* @param path the path of the resource
* @return the InputStream of the resource
*/
private static InputStream getFileInputStream(String path) { private static InputStream getFileInputStream(String path) {
File f = new File(path); File f = new File(path);
if (f.exists()) { if (f.exists()) {

View File

@@ -3,6 +3,10 @@ package common;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/**
* Signal with no arguments.
*/
public class Signal0 { public class Signal0 {
private final List<Runnable> handlers; private final List<Runnable> handlers;

View File

@@ -4,6 +4,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
/**
* Signal with one argument.
*/
public class Signal1<T> { public class Signal1<T> {
private final List<Consumer<T>> handlers; private final List<Consumer<T>> handlers;

View File

@@ -5,7 +5,7 @@ package chess;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import chess.ai.DumbAI; import chess.ai.ais.*;
import chess.controller.Command; import chess.controller.Command;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
@@ -14,6 +14,10 @@ import chess.controller.event.GameAdapter;
import chess.model.Color; import chess.model.Color;
import chess.model.Game; import chess.model.Game;
/**
* Test class for the chess application.
* @see PgnTest for tests related to PGN import/export.
*/
class AppTest { class AppTest {
private void functionalRollback(){ private void functionalRollback(){
Game game = new Game(); Game game = new Game();

View File

@@ -6,7 +6,7 @@ import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import chess.ai.DumbAI; import chess.ai.ais.*;
import chess.controller.CommandExecutor; import chess.controller.CommandExecutor;
import chess.controller.PlayerCommand; import chess.controller.PlayerCommand;
import chess.controller.commands.NewGameCommand; import chess.controller.commands.NewGameCommand;
@@ -18,6 +18,10 @@ import chess.pgn.PgnFileSimulator;
import chess.pgn.PgnImport; import chess.pgn.PgnImport;
import common.AssetManager; import common.AssetManager;
/**
* Speicif test file for PGN import/export.
*/
public class PgnTest { public class PgnTest {
private Game getRandomGame() { private Game getRandomGame() {