physics fixup

Author: Try

game/game/movealgo.cpp

@@ -860,10 +860,10 @@ void MoveAlgo::onMoveFailed(const Tempest::Vec3& dp, const DynamicWorld::Collisi
   if(std::abs(val)>threshold) {
     // emulate bouncing behaviour of original game
     Tempest::Vec3 corr;
-    for(int i=5; i<=45; i+=5) {
+    for(int i=5; i<=35; i+=5) {
       for(float angle:{float(i),-float(i)}) {
-        applyRotation(corr,dp,float(angle*M_PI)/180.f);
-        if(tryMove(corr.x,corr.y,corr.z)) {
+        applyRotation(corr,dp+skipMove,float(angle*M_PI)/180.f);
+        if(npc.tryMove(corr)) {
           if(forward)
             npc.setDirection(npc.rotation()+angle);
           return;

game/physics/dynamicworld.cpp

@@ -61,12 +61,12 @@ struct DynamicWorld::NpcBody : btRigidBody {
 
 struct DynamicWorld::NpcBodyList final {
   struct Record final {
-    NpcBody* body     = nullptr;
-    float    x        = 0.f;
+    NpcBody* body = nullptr;
+    float    x    = 0.f;
     };
 
   NpcBodyList(DynamicWorld& wrld):wrld(wrld){
-    body.reserve(1024);
+    body  .reserve(1024);
     frozen.reserve(1024);
     }
 
@@ -88,9 +88,7 @@ struct DynamicWorld::NpcBodyList final {
     obj->setWorldTransform(trans);
     obj->setUserIndex(C_Ghost);
     obj->setFlags(btCollisionObject::CF_NO_CONTACT_RESPONSE);
-    //obj->setCollisionFlags(btCollisionObject::CO_GHOST_OBJECT);
 
-    //world->addCollisionObject(obj);
     add(obj);
     resize(*obj,height,dx,dz);
     return obj;
@@ -652,7 +650,7 @@ DynamicWorld::NpcItem DynamicWorld::ghostObj(std::string_view visual) {
     }
   auto  obj = npcList->create(min,max);
   float dim = std::max(obj->rX,obj->rZ);
-  return NpcItem(this,obj,obj->h,dim*0.5f);
+  return NpcItem(this,obj,dim*0.5f);
   }
 
 DynamicWorld::Item DynamicWorld::staticObj(const PhysicMeshShape *shape, const Tempest::Matrix4x4 &m) {
@@ -955,22 +953,24 @@ bool DynamicWorld::NpcItem::tryMove(const Tempest::Vec3& dp, CollisionTest& out)
   if(!obj)
     return false;
 
-  auto prev  = obj->pos;
-  auto r     = obj->r*100.f;
+  auto initial  = obj->pos;
+  auto r        = obj->r;
   int  count = 1;
 
   if(dp.quadLength()>r*r)
     count = int(std::ceil(dp.manhattanLength()/r));
 
+  auto prev = initial;
   for(int i=1; i<=count; ++i) {
-    auto pos = prev+(dp*float(i))/float(count);
+    auto pos = initial+(dp*float(i))/float(count);
     implSetPosition(pos);
     if(owner->hasCollision(*this,out)) {
       if(i>1) {
         // moved a bit
-        break;
+        setPosition(prev);
+        return true;
         }
-      implSetPosition(prev);
+      implSetPosition(initial);
       if(owner->hasCollision(*this,out)) {
         // was in collision from the start
         setPosition(pos);

game/physics/dynamicworld.h

@@ -60,14 +60,13 @@ class DynamicWorld final {
     struct NpcItem {
       public:
         NpcItem()=default;
-        NpcItem(DynamicWorld* owner,NpcBody* obj,float h,float r):owner(owner),obj(obj),height(h),r(r){}
-        NpcItem(NpcItem&& it):owner(it.owner),obj(it.obj),height(it.height),r(it.r){it.obj=nullptr;}
+        NpcItem(DynamicWorld* owner,NpcBody* obj,float r):owner(owner),obj(obj),r(r){}
+        NpcItem(NpcItem&& it):owner(it.owner),obj(it.obj),r(it.r){it.obj=nullptr;}
         ~NpcItem();
 
         NpcItem& operator = (NpcItem&& it){
           std::swap(owner,it.owner);
           std::swap(obj,it.obj);
-          std::swap(height,it.height);
           std::swap(r,it.r);
           return *this;
           }
@@ -89,7 +88,6 @@ class DynamicWorld final {
       private:
         DynamicWorld*       owner  = nullptr;
         NpcBody*            obj    = nullptr;
-        float               height = 0.f;
         float               r      = 0.f;
         void  implSetPosition(const Tempest::Vec3& pos);