Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix heightmap scaling

Browse Source
This commit is contained in:
Jesse Boyd 2017-02-13 15:08:32 +11:00
parent 2c119c468c
commit 8168c08ab6
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/com/boydti/fawe/object/brush/heightmap/ScalableHeightMap.java
View File

@ -124,11 +124,13 @@ public class ScalableHeightMap {
int diameter = 2 * size + 1;
int centerX = pos.getBlockX();
int centerZ = pos.getBlockZ();
int centerY = pos.getBlockY();
int endY = pos.getBlockY() + size;
int startY = pos.getBlockY() - size;
int[] newData = new int[diameter * diameter];
Vector mutablePos = new Vector(0, 0, 0);
if (towards) {
double sizePow = Math.pow(size, yscale);
int targetY = pos.getBlockY();
for (int x = -size; x <= size; x++) {
int xx = centerX + x;
@ -151,10 +153,14 @@ public class ScalableHeightMap {
raise = getHeight(-z, -x);
break;
}
int height = session.getHighestTerrainBlock(xx, zz, 0, 255, false);
if (height == 0) {
newData[index] = centerY;
continue;
}
raise = (yscale * raise);
int height = session.getHighestTerrainBlock(xx, zz, 0, 255, true);
int diff = targetY - height;
double raiseScaled = diff * (raise / (double) size);
double raiseScaled = diff * (Math.pow(raise, yscale) / sizePow);
double raiseScaledAbs = Math.abs(raiseScaled);
int random = PseudoRandom.random.random(256) < (int) ((Math.ceil(raiseScaledAbs) - Math.floor(raiseScaledAbs)) * 256) ? (diff > 0 ? 1 : -1) : 0;
int raiseScaledInt = (int) raiseScaled + random;
@ -183,10 +189,15 @@ public class ScalableHeightMap {
raise = getHeight(-z, -x);
break;
}
int height = session.getHighestTerrainBlock(xx, zz, 0, maxY, false);
if (height == 0) {
newData[index] = centerY;
continue;
}
raise = (yscale * raise);
int random = PseudoRandom.random.random(maxY + 1) < (int) ((raise - (int) raise) * (maxY + 1)) ? 1 : 0;
int height = session.getHighestTerrainBlock(xx, zz, 0, maxY, true) + (int) raise + random;
newData[index] = height;
int newHeight = height + (int) raise + random;
newData[index] = newHeight;
}
}
}

2
core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -367,7 +367,7 @@ public class BrushCommands {
)
@CommandPermissions("worldedit.brush.height")
public void heightBrush(Player player, LocalSession session, @Optional("5") double radius, @Optional("") final String filename, @Optional("0") final int rotation, @Optional("1") final double yscale) throws WorldEditException {
terrainBrush(player, session, radius, filename, rotation, yscale, true, ScalableHeightMap.Shape.CONE);
terrainBrush(player, session, radius, filename, rotation, yscale, false, ScalableHeightMap.Shape.CONE);
}
@Command(