#49: Add proper pathfinding taking VBL into account

 - Buildable version...

Task-Url: #49

Signed-off-by: Jamz <[email protected]>

build.gradle

@@ -45,7 +45,7 @@ applicationDefaultJvmArgs = ["-Xss4M"]
 
 // Custom properties
 ext {
-	vendor = "Nerps" // Change to RPTools for official builds
+	vendor = "Nerps-BETA" // Change to RPTools for official builds
 	git = org.ajoberstar.grgit.Grgit.open(currentDir: file('.'))
 	revision = git.head().abbreviatedId
 	revisionFull = git.head().id

src/main/java/net/rptools/maptool/client/MapTool.java

@@ -1502,7 +1502,7 @@ public static void main(String[] args) {
 		} else {
 			DebugStream.deactivate();
 		}
-		
+
 		// List out passed in arguments
 		for (String arg : args) {
 			log.info("argument passed via command line: " + arg);

src/main/java/net/rptools/maptool/client/ui/zone/ZoneView.java

@@ -58,7 +58,7 @@
 
 public class ZoneView implements ModelChangeListener {
 	private static final Logger log = LogManager.getLogger(ZoneView.class);
-	
+
 	private final Zone zone;
 
 	// VISION

src/main/java/net/rptools/maptool/client/ui/zone/vbl/AreaTree.java

@@ -23,7 +23,7 @@ public class AreaTree {
 	private static final Logger log = LogManager.getLogger(AreaTree.class);
 	private AreaOcean theOcean;
 	private Area theArea; // in case we want to return the original area undigested
-	
+
 	public AreaTree(Area area) {
 		digest(area);
 	}
@@ -40,13 +40,14 @@ AreaOcean getOcean() {
 	public Area getArea() {
 		return theArea;
 	}
+
 	private void digest(Area area) {
 		if (area == null) {
 			return;
 		}
-		
+
 		theArea = area;
-		
+
 		List<AreaOcean> oceanList = new ArrayList<AreaOcean>();
 		List<AreaIsland> islandList = new ArrayList<AreaIsland>();
 

src/main/java/net/rptools/maptool/client/walker/astar/AStarCellPoint.java

@@ -31,7 +31,7 @@ public AStarCellPoint(CellPoint p) {
 	public double cost() {
 		return h + g;
 	}
-	
+
 	@Override
 	public int compareTo(AStarCellPoint other) {
 		return Double.compare(f, other.f);

src/main/java/net/rptools/maptool/client/walker/astar/AStarHorizHexEuclideanWalker.java

@@ -8,6 +8,9 @@
  */
 package net.rptools.maptool.client.walker.astar;
 
+import java.util.List;
+import java.util.Set;
+
 import net.rptools.maptool.model.Zone;
 
 public class AStarHorizHexEuclideanWalker extends AbstractAStarHexEuclideanWalker {
@@ -35,4 +38,10 @@ protected void initNeighborMaps() {
 	protected int[][] getNeighborMap(int x, int y) {
 		return y % 2 == 0 ? evenNeighborMap : oddNeighborMap;
 	}
+
+	@Override
+	protected List<AStarCellPoint> getNeighbors(AStarCellPoint node, Set<AStarCellPoint> closedSet) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/net/rptools/maptool/client/walker/astar/AStarSquareEuclideanWalker.java

@@ -72,7 +72,7 @@ protected List<AStarCellPoint> getNeighbors(AStarCellPoint node, Set<AStarCellPo
 
 			if (closedSet.contains(neighbor))
 				continue;
-			
+
 			Rectangle cellBounds = zone.getGrid().getBounds(neighbor);
 
 			// VBL Check
@@ -135,7 +135,7 @@ private double metricDistance(CellPoint node, CellPoint goal) {
 			distance = Math.max(Math.abs(xDist), Math.abs(yDist));
 			break;
 		}
-		
+
 		return distance;
 	}
 

src/main/java/net/rptools/maptool/client/walker/astar/AStarVertHexEuclideanWalker.java

@@ -8,6 +8,9 @@
  */
 package net.rptools.maptool.client.walker.astar;
 
+import java.util.List;
+import java.util.Set;
+
 import net.rptools.maptool.model.Zone;
 
 public class AStarVertHexEuclideanWalker extends AbstractAStarHexEuclideanWalker {
@@ -34,4 +37,10 @@ protected int[][] getNeighborMap(int x, int y) {
 		return x % 2 == 0 ? evenNeighborMap : oddNeighborMap;
 	}
 
+	@Override
+	protected List<AStarCellPoint> getNeighbors(AStarCellPoint node, Set<AStarCellPoint> closedSet) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }

src/main/java/net/rptools/maptool/client/walker/astar/AbstractAStarWalker.java

@@ -82,11 +82,11 @@ protected List<CellPoint> calculatePath(CellPoint start, CellPoint end) {
 
 		// If debug is enabled, MapTool is pretty busy so...
 		double estimatedTimeoutNeeded = 50;
-		if(log.isDebugEnabled()) {
+		if (log.isDebugEnabled()) {
 			estimatedTimeoutNeeded = hScore(start, end) * 10;
 			log.debug("A* Path timeout estimate: " + estimatedTimeoutNeeded);
 		}
-		
+
 		while (!openList.isEmpty()) {
 			if (System.currentTimeMillis() > timeOut + estimatedTimeoutNeeded) {
 				log.info("Timing out...");

src/main/java/net/rptools/maptool/client/walker/astar/AbstractAStarWalker_OLD.java

@@ -61,8 +61,8 @@ protected List<CellPoint> calculatePath(CellPoint start, CellPoint end) {
 		Area vbl = zone.getTopology();
 
 		// If end point is in VBL GTFO
-		//if (vbl.intersects(zone.getGrid().getBounds(end)))
-			//return null;
+		// if (vbl.intersects(zone.getGrid().getBounds(end)))
+		// return null;
 
 		long timeOut = System.currentTimeMillis() + 2000;
 		// log.info("openList size: " + openList.size());
@@ -124,7 +124,7 @@ protected List<CellPoint> calculatePath(CellPoint start, CellPoint end) {
 
 				Rectangle cellBounds = zone.getGrid().getBounds(neighborNode);
 				double perc = 0;
-				
+
 				if (vbl.intersects(cellBounds)) {
 					Area cellArea = new Area(cellBounds);
 					cellArea.intersect(vbl);