Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add scripting API call for using multiple heightmaps #169

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add scripting API call for using multiple heightmaps #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 51 additions & 9 deletions WorldPainter/WPCore/src/main/java/org/pepsoft/worldpainter/tools/scripts/MappingOp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,42 @@

package org.pepsoft.worldpainter.tools.scripts;

import org.pepsoft.util.ProgressReceiver;
import org.pepsoft.worldpainter.*;
import org.pepsoft.worldpainter.Dimension;
import org.pepsoft.worldpainter.HeightMap;
import org.pepsoft.worldpainter.Terrain;
import org.pepsoft.worldpainter.World2;
import org.pepsoft.worldpainter.heightMaps.BitmapHeightMap;
import org.pepsoft.worldpainter.heightMaps.TransformingHeightMap;
import org.pepsoft.worldpainter.importing.HeightMapImporter;
import org.pepsoft.worldpainter.layers.Annotations;
import org.pepsoft.worldpainter.layers.Biome;
import org.pepsoft.worldpainter.layers.Layer;
import org.pepsoft.worldpainter.operations.Filter;
import org.pepsoft.worldpainter.panels.DefaultFilter;
import org.pepsoft.worldpainter.themes.Theme;

import java.awt.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;

import static org.pepsoft.minecraft.Constants.DEFAULT_MAX_HEIGHT_ANVIL;
import static org.pepsoft.worldpainter.Constants.*;
import static org.pepsoft.worldpainter.DefaultPlugin.JAVA_ANVIL;

/**
*
* @author SchmitzP
*/
@SuppressWarnings("unused") // Used from scripts
public class MappingOp extends AbstractOperation<Void> {
public MappingOp(ScriptingContext context, HeightMap heightMap) throws ScriptException {
public MappingOp(ScriptingContext context, HeightMap heightMap, boolean affectsHeight) throws ScriptException {
super(context);
if (heightMap == null) {
throw new ScriptException("heightMap may not be null");
}
this.heightMap = heightMap;
this.affectsHeight = affectsHeight;
Arrays.fill(mapping, -1);
}

Expand Down Expand Up @@ -250,12 +256,51 @@ public Void go() throws ScriptException {
if ((heightMap == null) && (layer == null) && (terrainIndex == -1)) {
throw new ScriptException("No data source (heightMap, layer or terrain) specified");
}
if ((mode != Mode.SET_TERRAIN) && (layer == null)) {
if ((mode != Mode.SET_TERRAIN) && (layer == null) && (!affectsHeight)) {
throw new ScriptException("layer not specified");
}
if (world == null) {
throw new ScriptException("world not specified");
}

final Dimension dimension = world.getDimension(dimIndex);
if (dimension == null) {
throw new ScriptException("Non existent dimension specified");
}

if (affectsHeight) {
BitmapHeightMap bitMap = (BitmapHeightMap) heightMap;
HeightMapImporter importer = new HeightMapImporter();

HeightMap adjustedHeightMap = bitMap;
if ((scale != 100) || (offsetX != 0) || (offsetY != 0)) {
if (scale != 100) {
bitMap.setSmoothScaling(true);
}
adjustedHeightMap = new TransformingHeightMap(heightMap.getName() + " transformed", bitMap, scale, scale, offsetX, offsetY, 0);
}

importer.setHeightMap(adjustedHeightMap);
importer.setImageFile(bitMap.getImageFile());

importer.setTileFactory(dimension.getTileFactory());
String name = heightMap.getName();
int p = name.lastIndexOf('.');
if (p != -1) {
name = name.substring(0, p);
}
importer.setName(name);
// TODO autoselect this and make it configurable:
importer.setPlatform(JAVA_ANVIL);
try {
importer.importToDimension(dimension, true, null);
return null;
} catch (ProgressReceiver.OperationCancelled e) {
// Can never happen since we don't pass a progress receiver in
throw new InternalError();
}
}

boolean greyScaleMapPresent = false;
for (int mappedValue: mapping) {
if (mappedValue != -1) {
Expand Down Expand Up @@ -324,10 +369,6 @@ public Void go() throws ScriptException {
}
}
}
final Dimension dimension = world.getDimension(dimIndex);
if (dimension == null) {
throw new ScriptException("Non existent dimension specified");
}

final HeightMap scaledHeightMap;
Rectangle extent = new Rectangle(dimension.getLowestX() << TILE_SIZE_BITS, dimension.getLowestY() << TILE_SIZE_BITS, dimension.getWidth() << TILE_SIZE_BITS, dimension.getHeight() << TILE_SIZE_BITS);
Expand Down Expand Up @@ -450,6 +491,7 @@ private void mapStoredValuesTo(int value) {
}
}

private boolean affectsHeight;
private final int[] mapping = new int[65536];
private final Map<Integer, Integer> colourMapping = new HashMap<>();
private HeightMap heightMap;
Expand Down
13 changes: 12 additions & 1 deletion ...Painter/WPCore/src/main/java/org/pepsoft/worldpainter/tools/scripts/ScriptingContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,18 @@ public GetHeightMapOp getHeightMap() {
*/
public MappingOp applyHeightMap(HeightMap heightMap) throws ScriptException {
checkGoCalled("applyHeightMap");
return new MappingOp(this, heightMap);
return new MappingOp(this, heightMap, false);
}


/**
* Map a height map to a portion of the world. Affects the terrain of the world.
* @param heightMap the height map to apply.
* @return
*/
public MappingOp addHeightMap(HeightMap heightMap) throws ScriptException {
checkGoCalled("addHeightMap");
return new MappingOp(this, heightMap, true);
}

/**
Expand Down