optimize MoveAlgo::tryMove

* use skip-move strategy to save CPU performance on idle npc's #188
Try · Aug 29, 2021 · 4632d24 · 4632d24
1 parent a8ecb48
commit 4632d24
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/game/game/movealgo.cpp b/game/game/movealgo.cpp
@@ -9,7 +9,6 @@ const float   MoveAlgo::closeToPointThreshold = 50;
 const float   MoveAlgo::climbMove             = 55;
 const float   MoveAlgo::gravity               = DynamicWorld::gravity;
 const float   MoveAlgo::eps                   = 2.f;   // 2-santimeters
-const float   MoveAlgo::epsAni                = 0.25f; // 25-millimeters
 const int32_t MoveAlgo::flyOverWaterHint      = 999999;
 
 MoveAlgo::MoveAlgo(Npc& unit)
@@ -72,11 +71,6 @@ bool MoveAlgo::tryMove(float x, float y, float z) {
   }
 
 bool MoveAlgo::tryMove(float x,float y,float z, DynamicWorld::CollisionTest& out) {
-  if(flags==NoFlags && std::fabs(x)<epsAni && std::fabs(y)<epsAni && std::fabs(z)<epsAni) {
-    skipMove = Tempest::Vec3(x,y,z);
-    return true;
-    }
-  skipMove = Tempest::Vec3();
   return npc.tryMove({x,y,z},out);
   }
 
@@ -340,7 +334,7 @@ void MoveAlgo::implTick(uint64_t dt, MvFlags moveFlg) {
 
   if(isInAir()) {
     if(npc.isJumpAnim()) {
-      auto dp = skipMove+npcMoveSpeed(dt,moveFlg);
+      auto dp = npcMoveSpeed(dt,moveFlg);
       tryMove(dp.x,dp.y,dp.z);
       fallSpeed += dp;
       fallCount += float(dt);
@@ -356,7 +350,7 @@ void MoveAlgo::implTick(uint64_t dt, MvFlags moveFlg) {
       return;
     }
 
-  auto  dp            = skipMove+npcMoveSpeed(dt,moveFlg);
+  auto  dp            = npcMoveSpeed(dt,moveFlg);
   auto  pos           = npc.position();
   float pY            = pos.y;
   float fallThreshold = stepHeight();
@@ -860,7 +854,7 @@ void MoveAlgo::onMoveFailed(const Tempest::Vec3& dp, const DynamicWorld::Collisi
     Tempest::Vec3 corr;
     for(int i=5; i<=35; i+=5) {
       for(float angle:{float(i),-float(i)}) {
-        applyRotation(corr,dp+skipMove,float(angle*M_PI)/180.f);
+        applyRotation(corr,dp,float(angle*M_PI)/180.f);
         if(npc.tryMove(corr)) {
           if(forward)
             npc.setDirection(npc.rotation()+angle);

diff --git a/game/game/movealgo.h b/game/game/movealgo.h
@@ -149,8 +149,6 @@ class MoveAlgo final {
     Tempest::Vec3       fallSpeed ={};
     float               fallCount=0.f;
 
-    Tempest::Vec3       skipMove = {};
-
     uint64_t            climbStart=0;
     Tempest::Vec3       climbPos0={};
     float               climbHeight=0.f;
@@ -161,6 +159,5 @@ class MoveAlgo final {
 
     static const float   gravity;
     static const float   eps;
-    static const float   epsAni;
     static const int32_t flyOverWaterHint;
   };
diff --git a/game/physics/dynamicworld.cpp b/game/physics/dynamicworld.cpp
@@ -937,13 +937,22 @@ bool DynamicWorld::NpcItem::testMove(const Tempest::Vec3& dst, const Tempest::Ve
   return true;
   }
 
-bool DynamicWorld::NpcItem::tryMove(const Tempest::Vec3& dp, CollisionTest& out) {
+bool DynamicWorld::NpcItem::tryMove(const Tempest::Vec3& to, CollisionTest& out) {
   if(!obj)
-    return false;
+    return false; 
+
+  // 2-santimeters
+  static const float eps = 2;
 
   auto initial = obj->pos;
   auto r       = obj->r;
   int  count   = 1;
+  auto dp      = to-initial;
+
+  if(std::abs(dp.x)<eps && std::abs(dp.y)<eps && std::abs(dp.z)<eps) {
+    // skip-move
+    return true;
+    }
 
   if((dp.x*dp.x+dp.z*dp.z)>r*r || dp.y>obj->h*0.5f) {
     const int countXZ = int(std::ceil(std::sqrt(dp.x*dp.x+dp.z*dp.z)/r));

diff --git a/game/physics/dynamicworld.h b/game/physics/dynamicworld.h
@@ -78,7 +78,6 @@ class DynamicWorld final {
         void  setUserPointer(void* p);
 
         float centerY() const;
-        const Tempest::Vec3& position() const;
 
         bool  testMove(const Tempest::Vec3& pos, CollisionTest& out);
         bool  testMove(const Tempest::Vec3& pos, const Tempest::Vec3& from, CollisionTest& out);
@@ -92,6 +91,7 @@ class DynamicWorld final {
         NpcBody*            obj    = nullptr;
         float               r      = 0.f;
         void  implSetPosition(const Tempest::Vec3& pos);
+        const Tempest::Vec3& position() const;
 
       friend class DynamicWorld;
       };

diff --git a/game/world/objects/npc.cpp b/game/world/objects/npc.cpp
@@ -3508,19 +3508,16 @@ bool Npc::tryMove(const Tempest::Vec3& dp) {
   }
 
 bool Npc::tryMove(const Vec3& dp, DynamicWorld::CollisionTest& out) {
-  if(!physic.tryMove(dp,out))
+  auto to = Vec3(x,y,z)+dp;
+  if(!physic.tryMove(to,out))
     return false;
-  setViewPosition(physic.position());
+  setViewPosition(to);
   return true;
   }
 
 bool Npc::tryTranslate(const Vec3& pos) {
   DynamicWorld::CollisionTest out;
-  if(physic.tryMove(pos-physic.position(),out)) {
-    setViewPosition(physic.position());
-    return true;
-    }
-  return false;
+  return tryMove(pos-Vec3(x,y,z),out);
   }
 
 Npc::JumpStatus Npc::tryJump() {