love/Schack
1
0
Fork 0
mirror of https://github.com/lov3b/Schack.git synced 2025-11-03 22:50:24 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Niklasifierat kod + optimerat drawSquares + soppat bort skräp

Browse Source
This commit is contained in:
lov3b
2022-05-15 19:42:33 +02:00
parent 81b709ded8
commit 24aa37a749
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/schack/Board.java
View File

@@ -53,10 +53,6 @@ public class Board extends JPanel implements MouseListener {
{new Rook(false, new Point(7, 0)), null, null, null, null, null, null, new Rook(true, new Point(7, 7))} {new Rook(false, new Point(7, 0)), null, null, null, null, null, null, new Rook(true, new Point(7, 7))}
}; };
// Test
piecesRet[2][2] = null;
piecesRet[2][3] = null;
// Sätt ut bönder // Sätt ut bönder
for (int i = 0; i < pieces.length; i++) { for (int i = 0; i < pieces.length; i++) {
piecesRet[i][1] = new Pawn(false, new Point(i, 1)); piecesRet[i][1] = new Pawn(false, new Point(i, 1));
@@ -71,17 +67,24 @@ public class Board extends JPanel implements MouseListener {
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
drawSquares(g2); drawSquares(g2);
// måla alla ställen man kan gå¨till // Måla alla ställen man kan gå till
validMovesToDraw.stream().filter(point -> point != null)
.forEach(point -> {
g2.setColor(moveableColor); g2.setColor(moveableColor);
g2.fillOval(point.x * SIZE_OF_TILE, point.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE); for (Point validMove : validMovesToDraw) {
}); if (validMove == null) {
continue;
}
g2.fillOval(validMove.x * SIZE_OF_TILE, validMove.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
}
// Draw piece // Måla alla pjäser
Arrays.stream(pieces).forEach(pieceArr -> Arrays.stream(pieceArr) for (Piece[] pieceArr : pieces) {
.filter(piece -> piece != null) for (Piece piece : pieceArr) {
.forEach(piece -> piece.draw(g2))); if (piece == null) {
continue;
}
piece.draw(g2);
}
}
} }
private void drawSquares(Graphics2D g2) { private void drawSquares(Graphics2D g2) {
@@ -90,13 +93,8 @@ public class Board extends JPanel implements MouseListener {
for (int i = 0; i < 8; i += 2) { for (int i = 0; i < 8; i += 2) {
for (int j = 0; j < 8; j += 2) { for (int j = 0; j < 8; j += 2) {
g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, 1 * SIZE_OF_TILE, 1 * SIZE_OF_TILE); g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
} g2.fillRect((i + 1) * SIZE_OF_TILE, (j + 1) * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
}
for (int i = 1; i < 8; i += 2) {
for (int j = 1; j < 8; j += 2) {
g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, 1 * SIZE_OF_TILE, 1 * SIZE_OF_TILE);
} }
} }
} }

1
src/schack/Pawn.java
View File

@@ -79,7 +79,6 @@ public class Pawn extends PieceKnownIfMoved {
if (pos.x >= pieces.length || pos.x < 0 || pos.y >= pieces[0].length || pos.y < 0) { if (pos.x >= pieces.length || pos.x < 0 || pos.y >= pieces[0].length || pos.y < 0) {
return movable; return movable;
} }
final Piece potentialEnemy = pieces[pos.x][pos.y]; final Piece potentialEnemy = pieces[pos.x][pos.y];
// Ifall det är tomt här, gör ingenting // Ifall det är tomt här, gör ingenting
if (potentialEnemy != null && potentialEnemy.isWhite() != this.isWhite()) { if (potentialEnemy != null && potentialEnemy.isWhite() != this.isWhite()) {