LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.4.2: array managment optimizations to Pathfinder

Browse Source
This commit is contained in:
Evan Debenham 2016-08-24 14:50:15 -04:00 committed by Evan Debenham
parent 7b16e75553
commit 3941aa3fe4
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SPD-classes/src/main/java/com/watabou/utils/PathFinder.java
View File

@ -27,6 +27,7 @@ import java.util.LinkedList;
public class PathFinder { public class PathFinder {
public static int[] distance; public static int[] distance;
private static int[] maxVal;
private static boolean[] goals; private static boolean[] goals;
private static int[] queue; private static int[] queue;
@ -49,13 +50,20 @@ public class PathFinder {
goals = new boolean[size]; goals = new boolean[size];
queue = new int[size]; queue = new int[size];
maxVal = new int[size];
Arrays.fill(maxVal, Integer.MAX_VALUE);
dir = new int[]{-1, +1, -width, +width, -width-1, -width+1, +width-1, +width+1}; dir = new int[]{-1, +1, -width, +width, -width-1, -width+1, +width-1, +width+1};
NEIGHBOURS4 = new int[]{-width, +1, +width, -1}; NEIGHBOURS4 = new int[]{-width, +1, +width, -1};
NEIGHBOURS8 = new int[]{-width, +1-width, +1, +1+width, +width, -1+width, -1, -1-width}; NEIGHBOURS8 = new int[]{-width, +1-width, +1, +1+width, +width, -1+width, -1, -1-width};
NEIGHBOURS9 = new int[]{0, -width, +1-width, +1, +1+width, +width, -1+width, -1, -1-width}; NEIGHBOURS9 = new int[]{0, -width, +1-width, +1, +1+width, +width, -1+width, -1, -1-width};
} }
//TODO currently this isn't used, and all pathfinding is recomputed each step.
// Computing each step is performance expensive, but pre-computing a path leads to incorrect
// pathing in cases where passable changes. Need to look into a compromise, something that's
// correct but is less costly
public static Path find( int from, int to, boolean[] passable ) { public static Path find( int from, int to, boolean[] passable ) {
if (!buildDistanceMap( from, to, passable )) { if (!buildDistanceMap( from, to, passable )) {
@ -146,8 +154,8 @@ public class PathFinder {
if (from == to) { if (from == to) {
return false; return false;
} }
Arrays.fill( distance, Integer.MAX_VALUE ); System.arraycopy(maxVal, 0, distance, 0, maxVal.length);
boolean pathFound = false; boolean pathFound = false;
@ -185,7 +193,7 @@ public class PathFinder {
public static void buildDistanceMap( int to, boolean[] passable, int limit ) { public static void buildDistanceMap( int to, boolean[] passable, int limit ) {
Arrays.fill( distance, Integer.MAX_VALUE ); System.arraycopy(maxVal, 0, distance, 0, maxVal.length);
int head = 0; int head = 0;
int tail = 0; int tail = 0;
@ -223,7 +231,7 @@ public class PathFinder {
return false; return false;
} }
Arrays.fill( distance, Integer.MAX_VALUE ); System.arraycopy(maxVal, 0, distance, 0, maxVal.length);
boolean pathFound = false; boolean pathFound = false;
@ -265,7 +273,7 @@ public class PathFinder {
private static int buildEscapeDistanceMap( int cur, int from, float factor, boolean[] passable ) { private static int buildEscapeDistanceMap( int cur, int from, float factor, boolean[] passable ) {
Arrays.fill( distance, Integer.MAX_VALUE ); System.arraycopy(maxVal, 0, distance, 0, maxVal.length);
int destDist = Integer.MAX_VALUE; int destDist = Integer.MAX_VALUE;
@ -312,7 +320,7 @@ public class PathFinder {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static void buildDistanceMap( int to, boolean[] passable ) { private static void buildDistanceMap( int to, boolean[] passable ) {
Arrays.fill( distance, Integer.MAX_VALUE ); System.arraycopy(maxVal, 0, distance, 0, maxVal.length);
int head = 0; int head = 0;
int tail = 0; int tail = 0;