start changes
This commit is contained in:
parent
51cb78c256
commit
6a1f26f099
|
|
@ -41,7 +41,7 @@ public class JPanelChessBoard extends JPanel {
|
||||||
selectedPieceIsWhite = true;
|
selectedPieceIsWhite = true;
|
||||||
selectedPieceType = PieceType.Pawn;
|
selectedPieceType = PieceType.Pawn;
|
||||||
pieceSelectorMode = false;
|
pieceSelectorMode = false;
|
||||||
backgroundImage = new ImageIcon(getClass().getResource("image_OOP.png")).getImage();
|
backgroundImage = new ImageIcon(getClass().getResource("image_OOP.png")).getImage();
|
||||||
try {
|
try {
|
||||||
|
|
||||||
spriteSheet = ImageIO.read(new File("pieces/newPieces.png"));
|
spriteSheet = ImageIO.read(new File("pieces/newPieces.png"));
|
||||||
|
|
@ -60,16 +60,17 @@ public class JPanelChessBoard extends JPanel {
|
||||||
pieceSelectorMode = false;
|
pieceSelectorMode = false;
|
||||||
} else {
|
} else {
|
||||||
if(myGame == null) {
|
if(myGame == null) {
|
||||||
interfaceGlobal.instantiateSimu();
|
// interfaceGlobal.instantiateSimu();
|
||||||
}
|
}
|
||||||
int x = (me.getX()*myGame.getWidth())/getWidth();
|
else {
|
||||||
int y = (me.getY()*myGame.getHeight())/getHeight();
|
int x = (me.getX()*myGame.getWidth())/getWidth();
|
||||||
if(pieceAdderMode) {
|
int y = (me.getY()*myGame.getHeight())/getHeight();
|
||||||
//TODO
|
if(pieceAdderMode) {
|
||||||
myGame.setPiece(x, y, selectedPieceType, selectedPieceIsWhite);
|
myGame.setPiece(x, y, selectedPieceType, selectedPieceIsWhite);
|
||||||
pieceAdderMode = false;
|
pieceAdderMode = false;
|
||||||
} else {
|
} else {
|
||||||
myGame.clickCoords(x,y);
|
myGame.clickCoords(x,y);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
repaint();
|
repaint();
|
||||||
|
|
@ -86,7 +87,7 @@ public class JPanelChessBoard extends JPanel {
|
||||||
protected void paintComponent(Graphics g) {
|
protected void paintComponent(Graphics g) {
|
||||||
super.paintComponent(g);
|
super.paintComponent(g);
|
||||||
g.drawImage(backgroundImage, 0, 0, getWidth(), getHeight(), this);
|
g.drawImage(backgroundImage, 0, 0, getWidth(), getHeight(), this);
|
||||||
// this.setBackground(new Color(238,236,208));
|
// this.setBackground(new Color(238,236,208));
|
||||||
if(pieceSelectorMode) {
|
if(pieceSelectorMode) {
|
||||||
g.drawImage(
|
g.drawImage(
|
||||||
spriteSheet,
|
spriteSheet,
|
||||||
|
|
@ -101,7 +102,7 @@ public class JPanelChessBoard extends JPanel {
|
||||||
if (myGame != null) {
|
if (myGame != null) {
|
||||||
// Draw Interface from state of simulator
|
// Draw Interface from state of simulator
|
||||||
g.setColor(new Color(238, 236, 208)); // Your default color
|
g.setColor(new Color(238, 236, 208)); // Your default color
|
||||||
g.fillRect(0, 0, getWidth()+1, getHeight()+1);
|
g.fillRect(0, 0, getWidth()+1, getHeight()+1);
|
||||||
repaint();
|
repaint();
|
||||||
float cellWidth = cellWidth();
|
float cellWidth = cellWidth();
|
||||||
float cellHeight = cellHeight();
|
float cellHeight = cellHeight();
|
||||||
|
|
@ -152,19 +153,19 @@ public class JPanelChessBoard extends JPanel {
|
||||||
g.setColor(Color.BLACK);
|
g.setColor(Color.BLACK);
|
||||||
|
|
||||||
|
|
||||||
for (int x = 0; x < myGame.getWidth(); x++) {
|
for (int x = 0; x < myGame.getWidth(); x++) {
|
||||||
char letter = (char) ('a' + x);
|
char letter = (char) ('a' + x);
|
||||||
int xLetter = Math.round(x * cellWidth() + cellWidth() / 2) - 4;
|
int xLetter = Math.round(x * cellWidth() + cellWidth() / 2) - 4;
|
||||||
int yLetter = getHeight() - 5;
|
int yLetter = getHeight() - 5;
|
||||||
g.drawString(String.valueOf(letter), xLetter, yLetter);
|
g.drawString(String.valueOf(letter), xLetter, yLetter);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int y = 0; y < myGame.getHeight(); y++) {
|
for (int y = 0; y < myGame.getHeight(); y++) {
|
||||||
int number = myGame.getHeight() - y;
|
int number = myGame.getHeight() - y;
|
||||||
int xNumber = 5;
|
int xNumber = 5;
|
||||||
int yNumber = Math.round(y * cellHeight() + cellHeight() / 2) + 5;
|
int yNumber = Math.round(y * cellHeight() + cellHeight() / 2) + 5;
|
||||||
g.drawString(String.valueOf(number), xNumber, yNumber);
|
g.drawString(String.valueOf(number), xNumber, yNumber);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue