love/Schack
1
0
Fork 0
mirror of https://github.com/lov3b/Schack.git synced 2024-09-20 05:40:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed a SCALE renamed a method removed unused var and optimized imports

Browse Source
This commit is contained in:
lov3b 2022-03-02 19:33:08 +01:00
parent 7311bea07b
commit 45c58ec57d
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/schack/Board.java
View File

@ -14,7 +14,7 @@ import javax.swing.JPanel;
public class Board extends JPanel { public class Board extends JPanel {
public static final int SCALE = 100; public static final int SIZE_OF_TILE = 100;
ArrayList<Piece> pieces = new ArrayList<>(); ArrayList<Piece> pieces = new ArrayList<>();
public Board() throws IOException { public Board() throws IOException {
@ -50,9 +50,9 @@ public class Board extends JPanel {
pieces.forEach(p -> p.draw(g2)); pieces.forEach(p -> p.draw(g2));
Piece p = pieces.get(1); Piece p = pieces.get(1);
LinkedHashSet<Point> legal = p.legalMoves(pieces); LinkedHashSet<Point> legal = p.validMoves(pieces);
g2.setColor(Color.yellow); g2.setColor(Color.yellow);
legal.forEach(point -> g2.fillOval(point.x * SCALE, point.y * SCALE, SCALE, SCALE)); legal.forEach(point -> g2.fillOval(point.x * SIZE_OF_TILE, point.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE));
System.out.println(legal.size()); System.out.println(legal.size());
} }
@ -64,13 +64,13 @@ public class Board extends JPanel {
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 * SCALE, j * SCALE, 1 * SCALE, 1 * SCALE); g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, 1 * SIZE_OF_TILE, 1 * SIZE_OF_TILE);
} }
} }
for (int i = 1; i < 8; i += 2) { for (int i = 1; i < 8; i += 2) {
for (int j = 1; j < 8; j += 2) { for (int j = 1; j < 8; j += 2) {
g2.fillRect(i * SCALE, j * SCALE, 1 * SCALE, 1 * SCALE); g2.fillRect(i * SIZE_OF_TILE, j * SIZE_OF_TILE, 1 * SIZE_OF_TILE, 1 * SIZE_OF_TILE);
} }
} }

3
src/schack/King.java
View File

@ -7,7 +7,6 @@ import java.io.IOException;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.LinkedList;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
public final class King extends Piece { public final class King extends Piece {
@ -31,7 +30,7 @@ public final class King extends Piece {
} }
@Override @Override
public LinkedHashSet<Point> legalMoves(ArrayList<Piece> pieces) { public LinkedHashSet<Point> validMoves(ArrayList<Piece> pieces) {
LinkedHashSet<Point> unmovable = new LinkedHashSet<>(); LinkedHashSet<Point> unmovable = new LinkedHashSet<>();
LinkedHashSet<Point> perhapsMovable = new LinkedHashSet<>(); LinkedHashSet<Point> perhapsMovable = new LinkedHashSet<>();
for (Piece piece : pieces) { for (Piece piece : pieces) {

4
src/schack/Piece.java
View File

@ -20,11 +20,11 @@ public abstract class Piece extends Component {
this.position = startingPosition; this.position = startingPosition;
} }
public abstract LinkedHashSet<Point> legalMoves(ArrayList<Piece> pieces); public abstract LinkedHashSet<Point> validMoves(ArrayList<Piece> pieces);
public void draw(Graphics2D g2) { public void draw(Graphics2D g2) {
g2.drawImage(icon, position.x * Board.SCALE, position.y * Board.SCALE, (ImageObserver) this); g2.drawImage(icon, position.x * Board.SIZE_OF_TILE, position.y * Board.SIZE_OF_TILE, (ImageObserver) this);
// g2.drawImage(icon, 4 * Board.SCALE, 6* Board.SCALE, (ImageObserver) this); // g2.drawImage(icon, 4 * Board.SCALE, 6* Board.SCALE, (ImageObserver) this);
} }

2
src/schack/Schack.java
View File

@ -17,8 +17,6 @@ import javax.swing.JOptionPane;
*/ */
public class Schack extends JFrame { public class Schack extends JFrame {
public Dimension size = new Dimension(800, 800);
public Schack() throws IOException { public Schack() throws IOException {
setTitle("Schack"); setTitle("Schack");
setAlwaysOnTop(true); setAlwaysOnTop(true);