Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-10 08:51:44 +01:00
Code Issues Projects Releases Wiki Activity

Fetch height map from Chunk - more performance

Browse Source
This commit is contained in:
Mike Primm 2011-05-28 01:59:02 -05:00
parent b0b1ab5926
commit 15fb1ec743
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/dynmap/CraftChunkSnapshot.java
View File

@ -7,7 +7,7 @@ package org.dynmap;
public class CraftChunkSnapshot implements ChunkSnapshot { public class CraftChunkSnapshot implements ChunkSnapshot {
private final int x, z; private final int x, z;
private final byte[] buf; /* Flat buffer in uncompressed chunk file format */ private final byte[] buf; /* Flat buffer in uncompressed chunk file format */
private final byte[] hmap; /* Highest Y map */
private static final int BLOCKDATA_OFF = 32768; private static final int BLOCKDATA_OFF = 32768;
private static final int BLOCKLIGHT_OFF = BLOCKDATA_OFF + 16384; private static final int BLOCKLIGHT_OFF = BLOCKDATA_OFF + 16384;
private static final int SKYLIGHT_OFF = BLOCKLIGHT_OFF + 16384; private static final int SKYLIGHT_OFF = BLOCKLIGHT_OFF + 16384;
@ -15,10 +15,11 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
/** /**
* Constructor * Constructor
*/ */
CraftChunkSnapshot(int x, int z, byte[] buf) { CraftChunkSnapshot(int x, int z, byte[] buf, byte[] hmap) {
this.x = x; this.x = x;
this.z = z; this.z = z;
this.buf = buf; this.buf = buf;
this.hmap = hmap;
} }
/** /**
@ -94,13 +95,6 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
} }
public int getHighestBlockYAt(int x, int z) { public int getHighestBlockYAt(int x, int z) {
int off = x << 11 | z << 7 | 126; return hmap[z << 4 | x] & 255;
int i;
for(i = 127; (i >= 2); i--, off--) {
if(buf[off] != 0) {
break;
}
}
return i;
} }
} }

38
src/main/java/org/dynmap/MapChunkCache.java
View File

@ -1,6 +1,7 @@
package org.dynmap; package org.dynmap;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Field;
import java.util.LinkedList; import java.util.LinkedList;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.Chunk; import org.bukkit.Chunk;
@ -13,6 +14,7 @@ public class MapChunkCache {
private World w; private World w;
private static Method getchunkdata = null; private static Method getchunkdata = null;
private static Method gethandle = null; private static Method gethandle = null;
private static Field heightmap = null;
private static boolean initialized = false; private static boolean initialized = false;
private int x_min, x_max, z_min, z_max; private int x_min, x_max, z_min, z_max;
@ -26,7 +28,6 @@ public class MapChunkCache {
public class MapIterator { public class MapIterator {
public int x, y, z; public int x, y, z;
private ChunkSnapshot snap; private ChunkSnapshot snap;
private int x4, z4;
MapIterator(int x0, int y0, int z0) { MapIterator(int x0, int y0, int z0) {
initialize(x0, y0, z0); initialize(x0, y0, z0);
@ -40,27 +41,25 @@ public class MapChunkCache {
} catch (ArrayIndexOutOfBoundsException aioobx) { } catch (ArrayIndexOutOfBoundsException aioobx) {
snap = EMPTY; snap = EMPTY;
} }
x4 = x0 & 0xF;
z4 = z0 & 0xF;
} }
public final int getBlockTypeID() { public final int getBlockTypeID() {
return snap.getBlockTypeId(x4, y, z4); return snap.getBlockTypeId(x & 0xF, y, z & 0xF);
} }
public final int getBlockData() { public final int getBlockData() {
return snap.getBlockData(x4, y, z4); return snap.getBlockData(x & 0xF, y, z & 0xF);
} }
public final int getHighestBlockYAt() { public final int getHighestBlockYAt() {
return snap.getHighestBlockYAt(x4, z4); return snap.getHighestBlockYAt(x & 0xF, z & 0xF);
} }
public final int getBlockSkyLight() { public final int getBlockSkyLight() {
return snap.getBlockSkyLight(x4, y, z4); return snap.getBlockSkyLight(x & 0xF, y, z & 0xF);
} }
public final int getBlockEmittedLight() { public final int getBlockEmittedLight() {
return snap.getBlockEmittedLight(x4, y, z4); return snap.getBlockEmittedLight(x & 0xF, y, z & 0xF);
} }
public final void incrementX() { public final void incrementX() {
x++; x4 = x & 0xF; x++;
if(x4 == 0) { /* Next chunk? */ if((x & 0xF) == 0) { /* Next chunk? */
try { try {
snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim]; snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim];
} catch (ArrayIndexOutOfBoundsException aioobx) { } catch (ArrayIndexOutOfBoundsException aioobx) {
@ -69,8 +68,8 @@ public class MapChunkCache {
} }
} }
public final void decrementX() { public final void decrementX() {
x--; x4 = x & 0xF; x--;
if(x4 == 15) { /* Next chunk? */ if((x & 0xF) == 15) { /* Next chunk? */
try { try {
snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim]; snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim];
} catch (ArrayIndexOutOfBoundsException aioobx) { } catch (ArrayIndexOutOfBoundsException aioobx) {
@ -85,8 +84,8 @@ public class MapChunkCache {
y--; y--;
} }
public final void incrementZ() { public final void incrementZ() {
z++; z4 = z & 0xF; z++;
if(z4 == 0) { /* Next chunk? */ if((z & 0xF) == 0) { /* Next chunk? */
try { try {
snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim]; snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim];
} catch (ArrayIndexOutOfBoundsException aioobx) { } catch (ArrayIndexOutOfBoundsException aioobx) {
@ -95,8 +94,8 @@ public class MapChunkCache {
} }
} }
public final void decrementZ() { public final void decrementZ() {
z--; z4 = z & 0xF; z--;
if(z4 == 15) { /* Next chunk? */ if((z & 0xF) == 15) { /* Next chunk? */
try { try {
snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim]; snap = snaparray[((x>>4) - x_min) + ((z>>4) - z_min) * x_dim];
} catch (ArrayIndexOutOfBoundsException aioobx) { } catch (ArrayIndexOutOfBoundsException aioobx) {
@ -171,10 +170,12 @@ public class MapChunkCache {
Class c = Class.forName("net.minecraft.server.Chunk"); Class c = Class.forName("net.minecraft.server.Chunk");
getchunkdata = c.getDeclaredMethod("a", new Class[] { byte[].class, int.class, getchunkdata = c.getDeclaredMethod("a", new Class[] { byte[].class, int.class,
int.class, int.class, int.class, int.class, int.class, int.class }); int.class, int.class, int.class, int.class, int.class, int.class });
heightmap = c.getDeclaredField("h");
c = Class.forName("org.bukkit.craftbukkit.CraftChunk"); c = Class.forName("org.bukkit.craftbukkit.CraftChunk");
gethandle = c.getDeclaredMethod("getHandle", new Class[0]); gethandle = c.getDeclaredMethod("getHandle", new Class[0]);
} catch (ClassNotFoundException cnfx) { } catch (ClassNotFoundException cnfx) {
} catch (NoSuchMethodException nsmx) { } catch (NoSuchMethodException nsmx) {
} catch (NoSuchFieldException nsfx) {
} }
initialized = true; initialized = true;
if(gethandle != null) if(gethandle != null)
@ -197,7 +198,10 @@ public class MapChunkCache {
Object cc = gethandle.invoke(c); Object cc = gethandle.invoke(c);
byte[] buf = new byte[32768 + 16384 + 16384 + 16384]; /* Get big enough buffer for whole chunk */ byte[] buf = new byte[32768 + 16384 + 16384 + 16384]; /* Get big enough buffer for whole chunk */
getchunkdata.invoke(cc, buf, 0, 0, 0, 16, 128, 16, 0); getchunkdata.invoke(cc, buf, 0, 0, 0, 16, 128, 16, 0);
CraftChunkSnapshot ss = new CraftChunkSnapshot(chunk.x, chunk.z, buf); byte[] h = (byte[])heightmap.get(cc);
byte[] hmap = new byte[256];
System.arraycopy(h, 0, hmap, 0, 256);
CraftChunkSnapshot ss = new CraftChunkSnapshot(chunk.x, chunk.z, buf, hmap);
snaparray[(chunk.x-x_min) + (chunk.z - z_min)*x_dim] = ss; snaparray[(chunk.x-x_min) + (chunk.z - z_min)*x_dim] = ss;
} catch (Exception x) { } catch (Exception x) {
} }