kske/chess
Archived
1
Fork 0
Code Issues 6 Pull Requests Releases 5 Activity

Optimized BoardPanel and texture loading

Browse Source 
- Renamed TextureLoader to TextureUtil
- Moved entire texture handling to TextureUtil
This commit is contained in:
Kai S. K. Engelbart 2019-07-04 14:58:15 +02:00
parent 30074f385e
commit 8b6b9766e2
Signed by: kske
GPG Key ID: 8BEB13EC5DF7EF13
3 changed files with 83 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/dev/kske/chess/BoardPanel.java
View File

@ -3,22 +3,17 @@ package dev.kske.chess;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Image;
import java.awt.Point;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import dev.kske.chess.event.GameEvent;
import dev.kske.chess.event.GameEventListener;
import dev.kske.chess.piece.Piece;
/**
* Project: <strong>Chess</strong><br>
@ -34,17 +29,12 @@ public class BoardPanel extends JPanel implements GameEventListener {
private static final long serialVersionUID = 6771148331334310216L;
private static int tileSize;
private static Map<String, Image> textures;
private int tileSize;
private Board board;
public BoardPanel(Board board) {
this();
setSize(getPreferredSize());
setBoard(board);
if (textures == null) loadPieceTextures();
}
public BoardPanel() {
@ -58,10 +48,12 @@ public class BoardPanel extends JPanel implements GameEventListener {
@Override
public void componentResized(ComponentEvent e) {
tileSize = getWidth() / 8;
scalePieceTextures();
TextureUtil.scalePieceTextures(tileSize);
}
});
setSize(getPreferredSize());
// Add a mouse adapter for testing piece movement
addMouseListener(new MouseAdapter() {
@ -95,8 +87,8 @@ public class BoardPanel extends JPanel implements GameEventListener {
// Draw the pieces if a board is present
if (board != null) for (int i = 0; i < 8; i++)
for (int j = 0; j < 8; j++)
if (board.getBoardArr()[i][j] != null)
g.drawImage(getPieceTexture(board.getBoardArr()[i][j]), i * tileSize, j * tileSize, this);
if (board.getBoardArr()[i][j] != null) g.drawImage(TextureUtil
.getPieceTexture(board.getBoardArr()[i][j]), i * tileSize, j * tileSize, this);
}
@Override
@ -116,36 +108,6 @@ public class BoardPanel extends JPanel implements GameEventListener {
repaint();
}
/**
* Load every PNG file inside the res/pieces directory.
* The filenames without extensions are used as keys in the map textures.
*/
private static void loadPieceTextures() {
textures = new HashMap<>();
File dir = new File("res/pieces");
File[] files = dir.listFiles((File parentDir, String name) -> name.toLowerCase().endsWith(".png"));
for (File file : files)
textures.put(file.getName().replaceFirst("[.][^.]+$", ""), TextureLoader.loadScaledImage(file, tileSize));
}
/**
* Scales all piece textures to fit the current tile size
*/
private static void scalePieceTextures() {
textures.replaceAll((key, img) -> img.getScaledInstance(tileSize, tileSize, Image.SCALE_SMOOTH));
}
/**
* Loads a piece texture fitting to a piece object
*
* @param piece The piece from which the texture properties are taken
* @return The fitting texture
*/
private static Image getPieceTexture(Piece piece) {
String key = piece.getType().toString().toLowerCase() + "_" + piece.getColor().toString().toLowerCase();
return textures.get(key);
}
@Override
public Dimension getMinimumSize() { return getPreferredSize(); }

35
src/dev/kske/chess/TextureLoader.java
View File

@ -1,35 +0,0 @@
package dev.kske.chess;
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;
/**
* Project: <strong>Chess</strong><br>
* File: <strong>TextureLoader.java</strong><br>
* Created: <strong>01.07.2019</strong><br>
* Author: <strong>Kai S. K. Engelbart</strong>
*/
public class TextureLoader {
private TextureLoader() {}
/**
* Loads an image from a file.
*
* @param file The image file
* @return The loaded image
*/
public static Image loadScaledImage(File file, int scale) {
BufferedImage in = null;
try {
in = ImageIO.read(file);
} catch (IOException e) {
e.printStackTrace();
}
return in;
}
}

76
src/dev/kske/chess/TextureUtil.java Normal file
View File

@ -0,0 +1,76 @@
package dev.kske.chess;
import java.awt.Image;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import javax.imageio.ImageIO;
import dev.kske.chess.piece.Piece;
/**
* Project: <strong>Chess</strong><br>
* File: <strong>TextureUtil.java</strong><br>
* Created: <strong>01.07.2019</strong><br>
* Author: <strong>Kai S. K. Engelbart</strong>
*/
public class TextureUtil {
private static Map<String, Image> textures;
static {
textures = new HashMap<>();
loadPieceTextures();
}
private TextureUtil() {}
/**
* Loads a piece texture fitting to a piece object
*
* @param piece The piece from which the texture properties are taken
* @return The fitting texture
*/
public static Image getPieceTexture(Piece piece) {
String key = piece.getType().toString().toLowerCase() + "_" + piece.getColor().toString().toLowerCase();
return textures.get(key);
}
/**
* Scales all piece textures to fit the current tile size
*/
public static void scalePieceTextures(int scale) {
textures.replaceAll((key, img) -> img.getScaledInstance(scale, scale, Image.SCALE_SMOOTH));
}
/**
* Loads an image from a file.
*
* @param file The image file
* @return The loaded image
*/
private static Image loadImage(File file) {
BufferedImage in = null;
try {
in = ImageIO.read(file);
} catch (IOException e) {
e.printStackTrace();
}
return in;
}
/**
* Load every PNG file inside the res/pieces directory.
* The filenames without extensions are used as keys in the map textures.
*/
private static void loadPieceTextures() {
File dir = new File("res/pieces");
File[] files = dir.listFiles((File parentDir, String name) -> name.toLowerCase().endsWith(".png"));
for (File file : files)
textures.put(file.getName().replaceFirst("[.][^.]+$", ""), TextureUtil.loadImage(file));
}
}