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

Cache angle mask + tweak updater

Browse Source
This commit is contained in:
Jesse Boyd 2017-06-18 09:50:25 +10:00
parent 27b035c737
commit 3171fbd953
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
core/src/main/java/com/boydti/fawe/object/mask/AngleMask.java
View File

@ -6,6 +6,7 @@ import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.mask.Mask2D;
import com.sk89q.worldedit.function.mask.SolidBlockMask;
import java.util.Arrays;
import javax.annotation.Nullable;
public class AngleMask extends SolidBlockMask implements ResettableMask {
@ -30,6 +31,47 @@ public class AngleMask extends SolidBlockMask implements ResettableMask {
@Override
public void reset() {
mutable = new MutableBlockVector();
cacheBotX = Integer.MIN_VALUE;
cacheBotZ = Integer.MIN_VALUE;
if (cacheHeights != null) {
Arrays.fill(cacheHeights, (byte) 0);
}
}
private transient int cacheCenX;
private transient int cacheCenZ;
private transient int cacheBotX = Integer.MIN_VALUE;
private transient int cacheBotZ = Integer.MIN_VALUE;
private transient int cacheCenterZ;
private transient byte[] cacheHeights = null;
private transient int lastY = 0;
public int getHeight(int x, int y, int z) {
try {
int rx = x - cacheBotX;
int rz = z - cacheBotZ;
int index = rx + (rz << 8);
if (index < 0 || index >= 65536) {
cacheBotX = x - 16;
cacheBotZ = z - 16;
rx = x - cacheBotX;
rz = z - cacheBotZ;
index = rx + (rz << 8);
if (cacheHeights == null) {
cacheHeights = new byte[65536];
} else {
Arrays.fill(cacheHeights, (byte) 0);
}
}
lastY = cacheHeights[index] & 0xFF;
if (lastY == 0) {
cacheHeights[index] = (byte) (lastY = getExtent().getNearestSurfaceTerrainBlock(x, z, lastY, 0, maxY));
}
return lastY;
} catch (Throwable e) {
e.printStackTrace();
throw e;
}
}
@Override
@ -47,13 +89,13 @@ public class AngleMask extends SolidBlockMask implements ResettableMask {
}
double slope;
boolean aboveMin;
slope = Math.abs(getExtent().getNearestSurfaceTerrainBlock(x + 1, z, y, 0, maxY) - getExtent().getNearestSurfaceTerrainBlock(x - 1, z, y, 0, maxY)) * ADJACENT_MOD;
slope = Math.abs(getHeight(x + 1, y, z) - getHeight(x - 1, y, z)) * ADJACENT_MOD;
if (slope >= min && max >= Math.max(maxY - y, y)) {
return true;
}
slope = Math.max(slope, Math.abs(getExtent().getNearestSurfaceTerrainBlock(x, z + 1, y, 0, maxY) - getExtent().getNearestSurfaceTerrainBlock(x, z - 1, y, 0, maxY)) * ADJACENT_MOD);
slope = Math.max(slope, Math.abs(getExtent().getNearestSurfaceTerrainBlock(x + 1, z + 1, y, 0, maxY) - getExtent().getNearestSurfaceTerrainBlock(x - 1, z - 1, y, 0, maxY)) * DIAGONAL_MOD);
slope = Math.max(slope, Math.abs(getExtent().getNearestSurfaceTerrainBlock(x - 1, z + 1, y, 0, maxY) - getExtent().getNearestSurfaceTerrainBlock(x + 1, z - 1, y, 0, maxY)) * DIAGONAL_MOD);
slope = Math.max(slope, Math.abs(getHeight(x, y, z + 1) - getHeight(x, y, z - 1)) * ADJACENT_MOD);
slope = Math.max(slope, Math.abs(getHeight(x + 1, y, z + 1) - getHeight(x - 1, y, z - 1)) * DIAGONAL_MOD);
slope = Math.max(slope, Math.abs(getHeight(x - 1, y, z + 1) - getHeight(x + 1, y, z - 1)) * DIAGONAL_MOD);
return (slope >= min && slope <= max);
}

5
core/src/main/java/com/boydti/fawe/util/Updater.java
View File

@ -46,7 +46,9 @@ public class Updater {
URL download = new URL(downloadUrl.replaceAll("%platform%", platform).replaceAll("%version%", versionString));
try (ReadableByteChannel rbc = Channels.newChannel(download.openStream())) {
File jarFile = MainUtil.getJarFile();
File outFile = new File(jarFile.getParent(), "update" + File.separator + jarFile.getName());
File finalFile = new File(jarFile.getParent(), "update" + File.separator + jarFile.getName());
File outFile = new File(jarFile.getParent(), "update" + File.separator + jarFile.getName().replace(".jar", ".part"));
boolean exists = outFile.exists();
if (exists) {
outFile.delete();
@ -59,6 +61,7 @@ public class Updater {
try (FileOutputStream fos = new FileOutputStream(outFile)) {
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
}
outFile.renameTo(finalFile);
Fawe.debug("Updated FAWE to " + versionString);
MainUtil.sendAdmin("&7Restart to update FAWE with these changes: &c/fawe changelog &7or&c " + "http://empcraft.com/fawe/cl?" + Integer.toHexString(currentVersion.hash));
}

2
core/src/main/java/com/sk89q/worldedit/extent/Extent.java
View File

@ -138,7 +138,7 @@ public interface Extent extends InputExtent, OutputExtent {
}
}
}
return maxY >= 255 ? maxY : -1;
return maxY == 255 && minY == 0 ? maxY : -1;
}
default public void addCaves(Region region) throws WorldEditException {