EpicKnarvik97/Dynmap-Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to non-recursive fill algorithm - handle huge regions better

Browse Source
This commit is contained in:
Mike Primm
2011-12-10 23:34:46 -06:00
parent eb0a3ef83f
commit c8805ab564
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.dynmap</groupId> <groupId>org.dynmap</groupId>
<artifactId>Dynmap-Factions</artifactId> <artifactId>Dynmap-Factions</artifactId>
<version>0.10</version> <version>0.11</version>
<build> <build>
<resources> <resources>

29
src/main/java/org/dynmap/factions/DynmapFactionsPlugin.java
View File

@@ -1,5 +1,6 @@
package org.dynmap.factions; package org.dynmap.factions;
import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@@ -181,14 +182,26 @@ public class DynmapFactionsPlugin extends JavaPlugin {
*/ */
private int floodFillTarget(TileFlags src, TileFlags dest, int x, int y) { private int floodFillTarget(TileFlags src, TileFlags dest, int x, int y) {
int cnt = 0; int cnt = 0;
if(src.getFlag(x, y)) { /* Set in src */ ArrayDeque<int[]> stack = new ArrayDeque<int[]>();
src.setFlag(x, y, false); /* Clear source */ stack.push(new int[] { x, y });
dest.setFlag(x, y, true); /* Set in destination */
cnt++; while(stack.isEmpty() == false) {
cnt += floodFillTarget(src, dest, x+1, y); /* Fill adjacent blocks */ int[] nxt = stack.pop();
cnt += floodFillTarget(src, dest, x-1, y); x = nxt[0];
cnt += floodFillTarget(src, dest, x, y+1); y = nxt[1];
cnt += floodFillTarget(src, dest, x, y-1); if(src.getFlag(x, y)) { /* Set in src */
src.setFlag(x, y, false); /* Clear source */
dest.setFlag(x, y, true); /* Set in destination */
cnt++;
if(src.getFlag(x+1, y))
stack.push(new int[] { x+1, y });
if(src.getFlag(x-1, y))
stack.push(new int[] { x-1, y });
if(src.getFlag(x, y+1))
stack.push(new int[] { x, y+1 });
if(src.getFlag(x, y-1))
stack.push(new int[] { x, y-1 });
}
} }
return cnt; return cnt;
} }

4
src/main/java/org/dynmap/factions/TileFlags.java
View File

@@ -12,7 +12,7 @@ import java.util.HashMap;
*/ */
public class TileFlags { public class TileFlags {
private HashMap<Long, long[]> chunkmap = new HashMap<Long, long[]>(); private HashMap<Long, long[]> chunkmap = new HashMap<Long, long[]>();
private long last_key = Long.MIN_VALUE; private long last_key = Long.MAX_VALUE;
private long[] last_row; private long[] last_row;
public TileFlags() { public TileFlags() {
@@ -62,6 +62,6 @@ public class TileFlags {
public void clear() { public void clear() {
chunkmap.clear(); chunkmap.clear();
last_row = null; last_row = null;
last_key = Long.MIN_VALUE; last_key = Long.MAX_VALUE;
} }
} }