Ticket #3471: FixStuckUnits.patch

binaries/data/mods/public/simulation/data/pathfinder.xml

@@ -11 +11 @@
       <Obstructions>pathfinding</Obstructions>
       <MaxWaterDepth>2</MaxWaterDepth>
       <MaxTerrainSlope>1.0</MaxTerrainSlope>
-      <Clearance>1.0</Clearance>
+      <Clearance>0.8</Clearance>
     </default>
     <large>
       <Obstructions>pathfinding</Obstructions>

source/simulation2/components/CCmpPathfinder_Vertex.cpp

@@ -127 +127 @@
 // When computing vertexes to insert into the search graph,
 // add a small delta so that the vertexes of an edge don't get interpreted
 // as crossing the edge (given minor numerical inaccuracies)
-static const entity_pos_t EDGE_EXPAND_DELTA = entity_pos_t::FromInt(1)/4;
+static const entity_pos_t EDGE_EXPAND_DELTA = entity_pos_t::FromInt(1)/16;
 
 /**
  * Check whether a ray from 'a' to 'b' crosses any of the edges.

source/simulation2/components/CCmpPathfinder.cpp

@@ -793 +793 @@
     if (!cmpObstructionManager || cmpObstructionManager->TestLine(filter, x0, z0, x1, z1, r))
         return false;
 
-    // Then test against the passability grid.
-    return Pathfinding::CheckLineMovement(x0, z0, x1, z1, passClass, *m_Grid);
+    // Then test against the terrain grid. This should not be necessary
+    // But in case we allow terrain to change it will become so.
+    return Pathfinding::CheckLineMovement(x0, z0, x1, z1, passClass, *m_TerrainOnlyGrid);
 }
 
 ICmpObstruction::EFoundationCheck CCmpPathfinder::CheckUnitPlacement(const IObstructionTestFilter& filter,

source/simulation2/helpers/Rasterize.cpp

@@ -25 +25 @@
     const ICmpObstructionManager::ObstructionSquare& shape,
     entity_pos_t clearance, entity_pos_t cellSize)
 {
+    entity_pos_t realClearance = clearance + entity_pos_t::FromInt(1);
     // Get the bounds of cells that might possibly be within the shape
     // (We'll then test each of those cells more precisely)
-    CFixedVector2D halfSize(shape.hw + clearance, shape.hh + clearance);
+    CFixedVector2D halfSize(shape.hw + realClearance, shape.hh + realClearance);
     CFixedVector2D halfBound = Geometry::GetHalfBoundingBox(shape.u, shape.v, halfSize);
     i16 i0 = ((shape.x - halfBound.X) / cellSize).ToInt_RoundToNegInfinity();
     i16 j0 = ((shape.z - halfBound.Y) / cellSize).ToInt_RoundToNegInfinity();
@@ -41 +42 @@
 
     for (i16 j = j0; j < j1; ++j)
     {
-        // Find the min/max range of cells that are strictly inside the square+clearance.
-        // (Since the square+clearance is a convex shape, we can just test each
+        // Find the min/max range of cells that are strictly inside the square+realClearance.
+        // (Since the square+realClearance is a convex shape, we can just test each
         // corner of each cell is inside the shape.)
         // (TODO: This potentially does a lot of redundant work.)
         i16 spanI0 = std::numeric_limits<i16>::max();
@@ -51 +52 @@
         {
             if (Geometry::DistanceToSquare(
                 CFixedVector2D(cellSize*i, cellSize*j) - CFixedVector2D(shape.x, shape.z),
-                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > clearance)
+                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > realClearance)
             {
                 continue;
             }
@@ -58 +59 @@
 
             if (Geometry::DistanceToSquare(
                 CFixedVector2D(cellSize*(i+1), cellSize*j) - CFixedVector2D(shape.x, shape.z),
-                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > clearance)
+                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > realClearance)
             {
                 continue;
             }
@@ -65 +66 @@
 
             if (Geometry::DistanceToSquare(
                 CFixedVector2D(cellSize*i, cellSize*(j+1)) - CFixedVector2D(shape.x, shape.z),
-                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > clearance)
+                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > realClearance)
             {
                 continue;
             }
@@ -72 +73 @@
 
             if (Geometry::DistanceToSquare(
                 CFixedVector2D(cellSize*(i+1), cellSize*(j+1)) - CFixedVector2D(shape.x, shape.z),
-                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > clearance)
+                shape.u, shape.v, CFixedVector2D(shape.hw, shape.hh), true) > realClearance)
             {
                 continue;
             }