Skip to content

Commit

Permalink
Biome image
Browse files Browse the repository at this point in the history
  • Loading branch information
@mr-short
mr-short committed Nov 13, 2015
1 parent 94cb8bb commit 7d79b0e
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 43 deletions.
3 changes: 1 addition & 2 deletions src/net/buddat/wgenerator/HeightMap.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ private void importHeightImage() {
}
}

MainWindow.log("HeightMap Generation (" + mapSize + ") completed in " + (System.currentTimeMillis() - startTime) + "ms.");
MainWindow.log("HeightMap Import (" + mapSize + ") completed in " + (System.currentTimeMillis() - startTime) + "ms.");
} catch (Exception e) {
JOptionPane.showMessageDialog(null, "The map must be 16-bit grayscale.", "Error", JOptionPane.ERROR_MESSAGE);
return;
}
}

Expand Down
142 changes: 109 additions & 33 deletions src/net/buddat/wgenerator/MainWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Random;
import java.awt.event.*;
import java.awt.image.BufferedImage;
import java.awt.image.WritableRaster;

public class MainWindow extends JFrame {

Expand Down Expand Up @@ -107,7 +108,6 @@ public class MainWindow extends JFrame {
private JButton btnViewTopo;
private JButton btnViewMap;
private JTextField textField_cliffRatio;
private JButton btnSaveHeightmap;
private JButton btnLoadHeightmap;
private JTextField textField_erodeMaxSlope;
private JCheckBox checkBox_landSlide;
Expand Down Expand Up @@ -171,6 +171,7 @@ public class MainWindow extends JFrame {
{"500","1","50","70","70","70","70","0","4000","true","50","80","true","1"}}; //TILE_BUSH_THORN
private JButton btnLoadBiomes;
private JButton btnExportBiomes;
private JButton btnImportBiomes;


public static void main(String[] args) {
Expand Down Expand Up @@ -939,6 +940,9 @@ public void actionPerformed(ActionEvent arg0)

JPanel panel_27 = new JPanel();
panel_8.add(panel_27, BorderLayout.NORTH);

btnImportBiomes = new JButton("Import");
panel_27.add(btnImportBiomes);

comboBox_biomeType = new JComboBox(new Tile[] { Tile.TILE_CLAY, Tile.TILE_DIRT, Tile.TILE_DIRT_PACKED, Tile.TILE_GRASS, Tile.TILE_GRAVEL, Tile.TILE_KELP,
Tile.TILE_LAVA, Tile.TILE_MARSH, Tile.TILE_MOSS, Tile.TILE_MYCELIUM, Tile.TILE_PEAT, Tile.TILE_REED, Tile.TILE_SAND, Tile.TILE_STEPPE,
Expand Down Expand Up @@ -971,13 +975,20 @@ public void actionPerformed(ActionEvent e) {
}
});
JPanel panel_18 = new JPanel();
panel_18.setLayout(new GridLayout(0, 1, 0, 0));

JPanel panel_31 = new JPanel();
panel_18.add(panel_31);

btnAddBiome = new JButton("Add Biome");
panel_18.add(btnAddBiome);
panel_31.add(btnAddBiome);

btnUndoLastBiome = new JButton("Undo Last");
panel_31.add(btnUndoLastBiome);
btnUndoLastBiome.setToolTipText("Can only go back 1 action");
panel_18.add(btnUndoLastBiome);

btnResetBiomes = new JButton("Reset All");
panel_31.add(btnResetBiomes);
GroupLayout gl_biomePanel = new GroupLayout(biomePanel);
gl_biomePanel.setHorizontalGroup(
gl_biomePanel.createParallelGroup(Alignment.LEADING)
Expand All @@ -997,9 +1008,6 @@ public void actionPerformed(ActionEvent e) {
.addComponent(panel_14, GroupLayout.DEFAULT_SIZE, 388, Short.MAX_VALUE)
.addContainerGap())
);

btnResetBiomes = new JButton("Reset All");
panel_18.add(btnResetBiomes);
biomePanel.setLayout(gl_biomePanel);

JPanel orePanel = new JPanel();
Expand Down Expand Up @@ -1219,9 +1227,6 @@ public void actionPerformed(ActionEvent e) {

btnSaveActions = new JButton("Save Actions");

btnSaveHeightmap = new JButton("Save Heightmap");
panel_26.add(btnSaveHeightmap);

JLabel label_2 = new JLabel("");
panel_26.add(label_2);
panel_26.add(btnSaveActions);
Expand All @@ -1239,22 +1244,26 @@ public void actionPerformed(ActionEvent arg0) {
});
panel_26.add(btnClearActions);

JLabel label_9 = new JLabel("");
panel_26.add(label_9);
btnExportBiomes = new JButton("Export Biome Values");

btnExportBiomes = new JButton("Export Biomes");

JButton btnSaveGlobalBiomes = new JButton("Save Global Biomes");
JButton btnSaveGlobalBiomes = new JButton("Save Global Values");
btnSaveGlobalBiomes.setToolTipText("Values auto loaded at startup");
btnSaveGlobalBiomes.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
actionSaveGlobalBiomeValues();
}
});

JLabel label_9 = new JLabel("");
panel_26.add(label_9);

JSeparator separator_2 = new JSeparator();
panel_26.add(separator_2);
panel_26.add(btnSaveGlobalBiomes);
btnExportBiomes.setToolTipText("Save biome input values to config file");
panel_26.add(btnExportBiomes);

btnLoadBiomes = new JButton("Load Biomes");
btnLoadBiomes = new JButton("Load Biome Values");
panel_26.add(btnLoadBiomes);
GroupLayout gl_actionPanel = new GroupLayout(actionPanel);
gl_actionPanel.setHorizontalGroup(
Expand Down Expand Up @@ -1557,26 +1566,26 @@ public void run() {
}.start();
}
});
btnSaveHeightmap.addActionListener(new ActionListener() {
btnLoadHeightmap.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (!actionReady())
return;
new Thread() {
@Override
public void run() {
actionSaveHeightmap("heightmap.png");
actionLoadHeightmap();
}
}.start();
}
});
btnLoadHeightmap.addActionListener(new ActionListener() {
btnImportBiomes.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (!actionReady())
return;
new Thread() {
@Override
public void run() {
actionLoadHeightmap();
actionLoadBiomes();
}
}.start();
}
Expand Down Expand Up @@ -1744,7 +1753,7 @@ void actionGenerateRivers () {

startLoading("Generating Rivers");
try {
actionSaveHeightmap("river_heightmap.png");
heightMap.exportHeightImage(mapName, "river_heightmap.png");
double water = (Integer.parseInt(textField_waterHeight.getText())-Integer.parseInt(textField_dirtPerTile.getText())-
Integer.parseInt(textField_riverDepth.getText()))/(double)Integer.parseInt(textField_mapMaxHeight.getText());
for (Point p:mapPanel.getRiverSeeds()) {
Expand Down Expand Up @@ -2033,17 +2042,57 @@ void actionSaveImages () {
try {
updateAPIMap();
MapData map = getAPI().getMapData();

ImageIO.write(map.createMapDump(), "png", new File("./maps/" + mapName + "/map.png"));
ImageIO.write(map.createTopographicDump(true, (short) 250), "png", new File("./maps/" + mapName + "/topography.png"));
ImageIO.write(map.createCaveDump(true), "png", new File("./maps/" + mapName + "/cave.png"));

heightMap.exportHeightImage(mapName, "heightmap.png");
saveBiomesImage();

} catch (IOException ex) {
System.err.println("Saving images failed: "+ex.toString());
ex.printStackTrace();
} finally {
stopLoading();
}
}

private void saveBiomesImage () {
try {
int mapSize = heightMap.getMapSize();
File imageFile = new File("./maps/" + mapName + "/" + "biomes.png");
BufferedImage bufferedImage = new BufferedImage(mapSize, mapSize, BufferedImage.TYPE_INT_RGB);
WritableRaster wr = (WritableRaster) bufferedImage.getRaster();

int[] array = new int[mapSize * mapSize * 3];
for (int x = 0; x < mapSize; x++) {
for (int y = 0; y < mapSize; y++) {
final Tile tile = api.getMapData().getSurfaceTile(x, y);
final Color color;
if (tile != null) {
color = tile.getColor();
}
else {
color = Tile.TILE_DIRT.getColor();
}
array[(x + y * mapSize)*3+0] = color.getRed();
array[(x + y * mapSize)*3+1] = color.getGreen();
array[(x + y * mapSize)*3+2] = color.getBlue();
}
}

wr.setPixels(0, 0, mapSize, mapSize, array);

bufferedImage.setData(wr);

if (!imageFile.exists()) {
imageFile.mkdirs();
}
ImageIO.write(bufferedImage, "png", imageFile);
} catch (IOException ex) {
ex.printStackTrace();
}
}

void actionSaveMap () {
if (tileMap == null) {
JOptionPane.showMessageDialog(null, "TileMap does not exist - Add Dirt first", "Error Saving Map", JOptionPane.ERROR_MESSAGE);
Expand Down Expand Up @@ -2076,6 +2125,7 @@ void actionSaveGlobalBiomeValues () {
ex.printStackTrace();
}
}

void actionSaveBiomeValues () {
startLoading("Saving Biome Values");
try {
Expand Down Expand Up @@ -2190,7 +2240,7 @@ void actionSaveActions () {

bw.close();

actionSaveHeightmap("heightmap.png");
heightMap.exportHeightImage(mapName, "heightmap.png");
} catch (IOException ex) {
System.err.println("Saving actions failed: "+ex.toString());
} finally {
Expand Down Expand Up @@ -2257,7 +2307,7 @@ void actionLoadHeightmap (File heightImageFile) {
}

void actionLoadHeightmap () {
File heightImageFile;
File imageFile;

JFileChooser fc = new JFileChooser();
fc.addChoosableFileFilter(new ImageFileView());
Expand All @@ -2268,21 +2318,47 @@ void actionLoadHeightmap () {
if (returnVal != JFileChooser.APPROVE_OPTION) {
return;
}
heightImageFile = fc.getSelectedFile();
imageFile = fc.getSelectedFile();

actionLoadHeightmap(heightImageFile);
actionLoadHeightmap(imageFile);
}

void actionSaveHeightmap (String fileName) {
if (heightMap == null) {
JOptionPane.showMessageDialog(this, "Heightmap does not exist - Generate one first", "Error Saving Heightmap", JOptionPane.ERROR_MESSAGE);
void actionLoadBiomes () {
if (tileMap == null) {
JOptionPane.showMessageDialog(null, "TileMap does not exist - Add Dirt first", "Error Loading Biomes", JOptionPane.ERROR_MESSAGE);
return;
}
startLoading("Loading Biomes");
try {
int mapSize = (int)comboBox_mapSize.getSelectedItem();

startLoading("Saving Heightmap");
heightMap.exportHeightImage(mapName, fileName);
stopLoading();
File imageFile;

JFileChooser fc = new JFileChooser();
fc.addChoosableFileFilter(new ImageFileView());
fc.setAcceptAllFileFilterUsed(false);
fc.setCurrentDirectory(new File("./maps/"));

int returnVal = fc.showDialog(this, "Load Biomes");
if (returnVal != JFileChooser.APPROVE_OPTION) {
return;
}
imageFile = fc.getSelectedFile();
BufferedImage biomesImage = new BufferedImage(mapSize, mapSize, BufferedImage.TYPE_INT_RGB);
biomesImage = ImageIO.read(imageFile);

tileMap.importBiomeImage(biomesImage);

updateMapView();

} catch (NumberFormatException | IOException nfe) {
JOptionPane.showMessageDialog(this, "Error loading file " + nfe.getMessage().toLowerCase(), "Error Loading Biomes", JOptionPane.ERROR_MESSAGE);
} finally {
stopLoading();
}

}


private WurmAPI getAPI() {
if (apiClosed)
Expand Down Expand Up @@ -2660,7 +2736,7 @@ private String getExtension(File f) {

@Override
public String getDescription() {
return "Heightmap Image (.png)";
return "Image File (.png)";
}
}

Expand Down
Loading

0 comments on commit 7d79b0e

Please sign in to comment.