mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

createTileImage specialized for Player.

This commit is contained in:
Mike Pope 2018-03-21 14:12:03 +10:30
parent 88f83e63b4
commit 017b0620ba
4 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/sf/freecol/client/gui/GUI.java
View File

@ -1628,7 +1628,7 @@ public class GUI extends FreeColClientHolder {
return null;
}
public BufferedImage createTileImage(Tile tile) {
public BufferedImage createTileImage(Tile tile, Player player) {
return null;
}

4
src/net/sf/freecol/client/gui/SwingGUI.java
View File

@ -906,8 +906,8 @@ public class SwingGUI extends GUI {
* {@inheritDoc}
*/
@Override
public BufferedImage createTileImage(Tile tile) {
return tileViewer.createTileImage(tile);
public BufferedImage createTileImage(Tile tile, Player player) {
return tileViewer.createTileImage(tile, player);
}
/**

45
src/net/sf/freecol/client/gui/TileViewer.java
View File

@ -128,6 +128,12 @@ public final class TileViewer extends FreeColClientHolder {
private final GeneralPath fog = new GeneralPath();
/** Standard rescaling used in displayTile. */
private final RescaleOp standardRescale
= new RescaleOp(new float[] { 0.8f, 0.8f, 0.8f, 1f },
new float[] { 0, 0, 0, 0 },
null);
/**
* The constructor to use.
@ -229,23 +235,25 @@ public final class TileViewer extends FreeColClientHolder {
/**
* Create a {@code BufferedImage} and draw a {@code Tile} on it.
*
* Public for {@see GUI.createTileImage}.
*
* @param tile The {@code Tile} to draw.
* @param player The {@code Player} to draw for.
* @return The image.
*/
BufferedImage createTileImage(Tile tile) {
public BufferedImage createTileImage(Tile tile, Player player) {
final TileType tileType = tile.getType();
Dimension terrainTileSize = lib.tileSize;
BufferedImage overlayImage = lib.getOverlayImage(tile);
final int compoundHeight = (overlayImage != null)
? overlayImage.getHeight()
: tileType.isForested()
? lib.tileForestSize.height
: terrainTileSize.height;
BufferedImage image = new BufferedImage(
terrainTileSize.width, compoundHeight, BufferedImage.TYPE_INT_ARGB);
: (tileType.isForested()) ? lib.tileForestSize.height
: terrainTileSize.height;
BufferedImage image = new BufferedImage(terrainTileSize.width,
compoundHeight, BufferedImage.TYPE_INT_ARGB);
Graphics2D g = image.createGraphics();
g.translate(0, compoundHeight - terrainTileSize.height);
displayTile(g, tile, overlayImage);
displayTile(g, tile, player, overlayImage);
g.dispose();
return image;
}
@ -322,10 +330,11 @@ public final class TileViewer extends FreeColClientHolder {
*/
private void displayColonyTile(Graphics2D g, Tile tile, Colony colony,
BufferedImage overlayImage) {
displayTile(g, tile, overlayImage);
displayTile(g, tile, colony.getOwner(), overlayImage);
ColonyTile colonyTile = colony.getColonyTile(tile);
if (colonyTile == null) return;
switch (colonyTile.getNoWorkReason()) {
case NONE: case COLONY_CENTER: case CLAIM_REQUIRED:
break;
@ -359,21 +368,19 @@ public final class TileViewer extends FreeColClientHolder {
*
* @param g The Graphics2D on which to draw the {@code Tile}.
* @param tile The {@code Tile} to draw.
* @param player The {@code Player} to draw for.
* @param overlayImage The BufferedImage for the tile overlay.
*/
private void displayTile(Graphics2D g, Tile tile, BufferedImage overlayImage) {
private void displayTile(Graphics2D g, Tile tile, Player player,
BufferedImage overlayImage) {
displayTileWithBeachAndBorder(g, tile);
if (tile.isExplored()) {
RescaleOp rop = hasFogOfWar(tile)
? new RescaleOp(new float[] { 0.8f, 0.8f, 0.8f, 1f },
new float[] { 0, 0, 0, 0 },
null)
: null;
displayTileItems(g, tile, rop, overlayImage);
displaySettlementWithChipsOrPopulationNumber(g, tile, false, rop);
if (!tile.isExplored()) return;
RescaleOp rop = (player.canSee(tile)) ? null : standardRescale;
displayTileItems(g, tile, rop, overlayImage);
displaySettlementWithChipsOrPopulationNumber(g, tile, false, rop);
displayOptionalTileText(g, tile);
}
displayOptionalTileText(g, tile);
}
/**

2
src/net/sf/freecol/client/gui/panel/TilePanel.java
View File

@ -97,7 +97,7 @@ public final class TilePanel extends FreeColPanel {
add(Utility.localizedLabel(template), "span, center");
final ImageLibrary lib = getImageLibrary();
BufferedImage image = getGUI().createTileImage(tile);
BufferedImage image = getGUI().createTileImage(tile, player);
add(new JLabel(new ImageIcon(image)), "span, center");
if (tile.getRegion() != null) {