Ticket #3539: groupObstruction.patch

source/simulation2/components/CCmpUnitMotion.cpp

@@ -553 +553 @@
         return m_State == STATE_FORMATIONMEMBER_PATH;
     }
 
+    entity_id_t GetGroup() const
+    {
+        return IsFormationMember() ? m_TargetEntity : GetEntityId();
+    }
+
     bool HasValidPath() const
     {
         return m_PathState == PATHSTATE_FOLLOWING
@@ -668 +673 @@
     /**
      * Returns an appropriate obstruction filter for use with path requests.
      */
-    ControlGroupMovementObstructionFilter GetObstructionFilter(bool avoidPathfindingShapes) const;
+    ControlGroupMovementObstructionFilter GetObstructionFilter(bool avoidPathfindingShapes, bool noTarget) const;
 
     /**
      * Checks our movement towards the next path waypoint.
@@ -1080 +1085 @@
 
         PathGoal goal = { PathGoal::POINT, followingPoint.x, followingPoint.z };
         m_Planning.expectedPathTicket = cmpPathfinder->ComputeShortPathAsync(
-            nextPoint.x, nextPoint.z, m_Clearance, SHORT_PATH_SEARCH_RANGE, goal, m_PassClass, false, m_TargetEntity, GetEntityId());
+            nextPoint.x, nextPoint.z, m_Clearance, SHORT_PATH_SEARCH_RANGE, goal, m_PassClass, false, GetGroup(), GetEntityId());
     }
 }
 
@@ -1124 +1129 @@
         return false;
 
     // Check if there's any collisions on that route
-    if (!cmpPathfinder->CheckMovement(GetObstructionFilter(true), from.X, from.Y, goalPos.X, goalPos.Y, m_Clearance, m_PassClass))
+    if (!cmpPathfinder->CheckMovement(GetObstructionFilter(true, false), from.X, from.Y, goalPos.X, goalPos.Y, m_Clearance, m_PassClass))
         return false;
 
     // That route is okay, so update our path
@@ -1159 +1164 @@
     // Find the point on the goal shape that we should head towards
     CFixedVector2D goalPos = goal.NearestPointOnGoal(from);
 
-    // Check if there's any collisions on that route
-    if (!cmpPathfinder->CheckMovement(GetObstructionFilter(true), from.X, from.Y, goalPos.X, goalPos.Y, m_Clearance, m_PassClass))
+    // Check if there's any collisions on that route (except the target itself)
+    if (!cmpPathfinder->CheckMovement(GetObstructionFilter(true, true), from.X, from.Y, goalPos.X, goalPos.Y, m_Clearance, m_PassClass))
         return false;
 
     // That route is okay, so update our path
@@ -1268 +1273 @@
     }
 }
 
-ControlGroupMovementObstructionFilter CCmpUnitMotion::GetObstructionFilter(bool avoidPathfindingShapes) const
+/**
+ * Notarget is true when used inside tryGoingStraightToTargetEntity, in which case we do not want the target obstruction
+ */
+ControlGroupMovementObstructionFilter CCmpUnitMotion::GetObstructionFilter(bool avoidPathfindingShapes, bool noTarget) const
 {
     entity_id_t group;
-    if (IsFormationMember())
+    if (noTarget)
         group = m_TargetEntity;
     else
-        group = GetEntityId();
+        group = GetGroup();
 
     return ControlGroupMovementObstructionFilter(avoidPathfindingShapes, ShouldAvoidMovingUnits(), group);
 }
@@ -1285 +1293 @@
     if (m_PassabilityMapChangedRecently)
     {
         CmpPtr<ICmpPathfinder> cmpPathfinder(GetSystemEntity());
-        return cmpPathfinder && cmpPathfinder->CheckMovement(GetObstructionFilter(true), x0, z0, x1, z1, m_Clearance, m_PassClass);
+        return cmpPathfinder && cmpPathfinder->CheckMovement(GetObstructionFilter(true, false), x0, z0, x1, z1, m_Clearance, m_PassClass);
     }
 
     // If an obstruction blocks tile-based pathfinding, it will be handled during the path computation
     // and doesn't need to be matched by this filter for the movement.
-    ControlGroupMovementObstructionFilter filter = GetObstructionFilter(false);
+    ControlGroupMovementObstructionFilter filter = GetObstructionFilter(false, false);
 
     CmpPtr<ICmpObstructionManager> cmpObstructionManager(GetSystemEntity());
     return cmpObstructionManager && !cmpObstructionManager->TestLine(filter, x0, z0, x1, z1, m_Clearance);
@@ -1383 +1391 @@
     if (!cmpPathfinder)
         return;
 
-    m_ExpectedPathTicket = cmpPathfinder->ComputeShortPathAsync(from.X, from.Y, m_Clearance, SHORT_PATH_SEARCH_RANGE, goal, m_PassClass, avoidMovingUnits, m_TargetEntity, GetEntityId());
+    m_ExpectedPathTicket = cmpPathfinder->ComputeShortPathAsync(from.X, from.Y, m_Clearance, SHORT_PATH_SEARCH_RANGE, goal, m_PassClass, avoidMovingUnits, GetGroup(), GetEntityId());
 }
 
 bool CCmpUnitMotion::MoveToPointRange(entity_pos_t x, entity_pos_t z, entity_pos_t minRange, entity_pos_t maxRange)