Browse Source

dial back overly agressive setRest

AzaezelX 1 year ago
parent
commit
7552554ded
2 changed files with 4 additions and 4 deletions
  1. 2 2
      Engine/source/T3D/rigidShape.cpp
  2. 2 2
      Engine/source/T3D/vehicles/vehicle.cpp

+ 2 - 2
Engine/source/T3D/rigidShape.cpp

@@ -1117,9 +1117,9 @@ void RigidShape::updatePos(F32 dt)
       if (mCollisionList.getCount())
       {
          F32 k = mRigid.getKineticEnergy();
-         F32 G = mNetGravity;
+         F32 G = mNetGravity* dt;
          F32 Kg = 0.5 * mRigid.mass * G * G;
-         if (k < sRestTol * Kg* dt && ++restCount > sRestCount)
+         if (k < sRestTol * Kg && ++restCount > sRestCount)
             mRigid.setAtRest();
       }
       else

+ 2 - 2
Engine/source/T3D/vehicles/vehicle.cpp

@@ -807,9 +807,9 @@ void Vehicle::updatePos(F32 dt)
       if (mCollisionList.getCount()) 
       {
          F32 k = mRigid.getKineticEnergy();
-         F32 G = mNetGravity;
+         F32 G = mNetGravity* dt;
          F32 Kg = 0.5 * mRigid.mass * G * G;
-         if (k < sRestTol * Kg * dt && ++restCount > sRestCount)
+         if (k < sRestTol * Kg && ++restCount > sRestCount)
             mRigid.setAtRest();
       }
       else