Ticket #3790: planNext.patch

source/simulation2/components/CCmpUnitMotion.cpp

@@ -638 +638 @@
      * If yes, try to anticipate.
      * TODO: remove this and use a more general "pushing" manager.
      */
-    void PlanNextStep(const CFixedVector2D& pos, const CFixedVector2D& currentOffset);
+    void PlanNextStep(const CFixedVector2D& pos, const CFixedVector2D& currentOffset, const fixed& maxSteps);
 
     /**
      * Decide whether to approximate the given range from a square target as a circle,
@@ -829 +829 @@
 
         // else we could, so reset our number of tries.
         m_Tries = 0;
-        
+
         // Now we've got a short path that we can follow
         if (!HasValidPath())
             StartSucceeded();
@@ -977 +977 @@
 
                 if (cmpPathfinder->CheckMovement(GetObstructionFilter(), pos.X, pos.Y, target.X, target.Y, m_Clearance, m_PassClass))
                 {
-                    PlanNextStep(pos, offset);
                     pos = target;
+                    fixed maxSteps = (offsetLength - maxdist) / maxdist;
+                    PlanNextStep(pos, offset, maxSteps);
                     break;
                 }
                 else
@@ -1119 +1120 @@
     }
 }
 
-void CCmpUnitMotion::PlanNextStep(const CFixedVector2D& pos, const CFixedVector2D& currentOffset)
+void CCmpUnitMotion::PlanNextStep(const CFixedVector2D& pos, const CFixedVector2D& currentOffset, const fixed& maxSteps)
 {
     if (m_LongPath.m_Waypoints.empty())
         return;
-    
+    // Do not plan if a path is already being computed
+    if (m_ExpectedPathTicket)
+        return;
+
     CmpPtr<ICmpPathfinder> cmpPathfinder(GetSystemEntity());
     CmpPtr<ICmpObstructionManager> cmpObstructionManager(GetSystemEntity());
     if (!cmpPathfinder || !cmpObstructionManager)
         return;
-    
-    m_Planning = SUnitMotionPlanning();
-    
-    // see 2 turns in advance, otherwise this would start to lag in MP
-    CFixedVector2D futurePos = pos + currentOffset*2;
-    
+
+    // Plan 1 turn in advance
+    fixed step = std::min(fixed::FromFloat(1.0f), maxSteps);
+    CFixedVector2D futurePos = pos + currentOffset.Multiply(step);
+
     // Don't actually use CheckMovement since we want to check against units only, we assume the rest is taken care of.
     if (!cmpObstructionManager->TestLine(GetObstructionFilter(true, false), pos.X, pos.Y, futurePos.X, futurePos.Y, m_Clearance, true))
         return;
-    
+
     // we will run into a static unit obstruction. Try to shortpath around it.
     PathGoal goal;
     if (m_LongPath.m_Waypoints.size() > 1 || m_FinalGoal.DistanceToPoint(pos) > LONG_PATH_MIN_DIST)