Minor edge case fix on Micropather core

selimanac · Jul 13, 2024 · 59d9d94 · 59d9d94
1 parent ece7ac0
commit 59d9d94
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ or you can add stable versions from [releases](https://github.com/selimanac/defo
 
 ## Examples
 
-New examples are on the way.
+Hexagon example: https://github.com/selimanac/defold-astar-hex-example  
 
 Old examples: https://github.com/selimanac/defold-astar-examples
 
@@ -29,6 +29,11 @@ I'd love to hear about your projects! Please share your released projects that u
 
 ## Release Notes
 
+### 1.1.1
+
+- Minor edge case fix on Micropather core. 
+- Minor code refactoring. 
+
 ### 1.1.0
 
 This is a major release. Consider it a Beta version. New examples on the way.  

diff --git a/astar/include/pather.h b/astar/include/pather.h
@@ -89,6 +89,8 @@ int WorldAt(int16_t x, int16_t y);
 void SetToWorldAt(int16_t x, int16_t y, int value);
 void NodeToXY(void *node, int16_t *x, int16_t *y);
 void *XYToNode(size_t x, size_t y);
+void PushNeighbors(StateCost *nodeCost, MPVector<StateCost> *neighbors,
+                   int16_t *nx, int16_t *ny, unsigned int a, unsigned int b);
 
 float LeastCostEstimate(void *nodeStart, void *nodeEnd);       // extern
 void AdjacentCost(void *node, MPVector<StateCost> *neighbors); // extern

diff --git a/astar/src/micropather/micropather.cpp b/astar/src/micropather/micropather.cpp
@@ -273,6 +273,8 @@ int MicroPather::Solve(void *startNode, void *endNode, MP_VECTOR<void *> *path,
     // Could add a bunch more with a little tracking.
     pathCache->AddNoSolution(endNode, &startNode, 1);
   }
+
+  pathNodePool.Clear();
   return NO_SOLUTION;
 }
 

diff --git a/astar/src/pather.cpp b/astar/src/pather.cpp
@@ -238,6 +238,13 @@ int Passable(int16_t nx, int16_t ny) {
   return -1;
 }
 
+void PushNeighbors(StateCost *nodeCost, MPVector<StateCost> *neighbors,
+                   int16_t *nx, int16_t *ny, unsigned int a, unsigned int b) {
+  nodeCost->state = XYToNode(*nx, *ny);
+  nodeCost->cost = Costs[a].costs[b];
+  neighbors->push_back(*nodeCost);
+}
+
 void AdjacentCost(void *node, MPVector<StateCost> *neighbors) {
   int16_t x, y, nx, ny, pass;
   NodeToXY(node, &x, &y);
@@ -278,14 +285,21 @@ void AdjacentCost(void *node, MPVector<StateCost> *neighbors) {
               if (XYToNode(nx, ny) == XYToNode(pathTo.x, pathTo.y) &&
                   getEntity && getNearEntities == false) {
 
-                nodeCost.state = XYToNode(nx, ny);
-                nodeCost.cost = Costs[a].costs[b];
-                neighbors->push_back(nodeCost);
+                PushNeighbors(&nodeCost, neighbors, &nx, &ny, a, b);
+                /*
+                                // TODO :add push_back to method
+                                nodeCost.state = XYToNode(nx, ny);
+                                nodeCost.cost = Costs[a].costs[b];
+                                neighbors->push_back(nodeCost);
+                                */
               } else if (getNearEntities) {
-
-                nodeCost.state = XYToNode(nx, ny);
-                nodeCost.cost = Costs[a].costs[b];
-                neighbors->push_back(nodeCost);
+                PushNeighbors(&nodeCost, neighbors, &nx, &ny, a, b);
+                /*
+                                // TODO :add push_back to method
+                                nodeCost.state = XYToNode(nx, ny);
+                                nodeCost.cost = Costs[a].costs[b];
+                                neighbors->push_back(nodeCost);
+                                */
               }
             }
           }
@@ -294,9 +308,13 @@ void AdjacentCost(void *node, MPVector<StateCost> *neighbors) {
 
       if (pass == Costs[a].tile_id) {
         if (WorldAt(nx, ny) >= 0) {
-          nodeCost.state = XYToNode(nx, ny);
-          nodeCost.cost = Costs[a].costs[b];
-          neighbors->push_back(nodeCost);
+
+          PushNeighbors(&nodeCost, neighbors, &nx, &ny, a, b);
+          /*
+            // TODO :add push_back to method
+            nodeCost.state = XYToNode(nx, ny);
+            nodeCost.cost = Costs[a].costs[b];
+            neighbors->push_back(nodeCost);*/
         }
       }
     }