Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 19:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Big performance boost - exploit empty section data, max block y in ray trace

Browse Source
This commit is contained in:
Mike Primm 2012-03-03 09:33:07 -06:00
parent 0e97fedd6b
commit a41e052f51
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
View File

@ -37,6 +37,7 @@ public class NewMapChunkCache implements MapChunkCache {
private World w; private World w;
private DynmapWorld dw; private DynmapWorld dw;
private Object craftworld; private Object craftworld;
private int nsect;
private List<DynmapChunk> chunks; private List<DynmapChunk> chunks;
private ListIterator<DynmapChunk> iterator; private ListIterator<DynmapChunk> iterator;
private int x_min, x_max, z_min, z_max; private int x_min, x_max, z_min, z_max;
@ -548,6 +549,7 @@ public class NewMapChunkCache implements MapChunkCache {
public void setChunks(BukkitWorld dw, List<DynmapChunk> chunks) { public void setChunks(BukkitWorld dw, List<DynmapChunk> chunks) {
this.dw = dw; this.dw = dw;
this.w = dw.getWorld(); this.w = dw.getWorld();
nsect = dw.worldheight >> 4;
if((getworldhandle != null) && (craftworld == null)) { if((getworldhandle != null) && (craftworld == null)) {
try { try {
craftworld = getworldhandle.invoke(w); /* World.getHandle() */ craftworld = getworldhandle.invoke(w); /* World.getHandle() */
@ -794,7 +796,7 @@ public class NewMapChunkCache implements MapChunkCache {
return ss.getRawBiomeRainfall(x & 0xF, z & 0xF); return ss.getRawBiomeRainfall(x & 0xF, z & 0xF);
} }
private void initSectionData(int idx) { private void initSectionData(int idx) {
isSectionNotEmpty[idx] = new boolean[w.getMaxHeight() >> 4]; isSectionNotEmpty[idx] = new boolean[nsect + 1];
int maxy = 0; int maxy = 0;
if(snaparray[idx] != EMPTY) { if(snaparray[idx] != EMPTY) {
/* Get max height */ /* Get max height */
@ -803,19 +805,20 @@ public class NewMapChunkCache implements MapChunkCache {
maxy = Math.max(maxy, snaparray[idx].getHighestBlockYAt(i, j)); maxy = Math.max(maxy, snaparray[idx].getHighestBlockYAt(i, j));
} }
} }
for(int i = 0; i < isSectionNotEmpty[idx].length; i++) { maxy = (maxy-1) >> 4;
if((i << 4) < maxy) { /* Below top? */ for(int i = 0; i <= nsect; i++) {
if(i <= maxy) { /* Below top? */
isSectionNotEmpty[idx][i] = true; isSectionNotEmpty[idx][i] = true;
} }
} }
} }
} }
public boolean isEmptySection(int x, int y, int z) { public boolean isEmptySection(int sx, int sy, int sz) {
int idx = ((x>>4) - x_min) + ((z>>4) - z_min) * x_dim; int idx = (sx - x_min) + (sz - z_min) * x_dim;
if(isSectionNotEmpty[idx] == null) { if(isSectionNotEmpty[idx] == null) {
initSectionData(idx); initSectionData(idx);
} }
return isSectionNotEmpty[idx][y >> 4]; return !isSectionNotEmpty[idx][sy];
} }
/** /**
@ -893,7 +896,8 @@ public class NewMapChunkCache implements MapChunkCache {
public boolean setChunkDataTypes(boolean blockdata, boolean biome, boolean highestblocky, boolean rawbiome) { public boolean setChunkDataTypes(boolean blockdata, boolean biome, boolean highestblocky, boolean rawbiome) {
this.biome = biome; this.biome = biome;
this.biomeraw = rawbiome; this.biomeraw = rawbiome;
this.highesty = highestblocky; //this.highesty = highestblocky;
this.highesty = true;
this.blockdata = blockdata; this.blockdata = blockdata;
return true; return true;
} }