TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1191 from Azaezel/development

Browse source 
dial back overly aggressive setRest
This commit is contained in:
Brian Roberts 2024-02-01 17:47:55 -06:00 • committed by GitHub
commit efffabae06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/rigidShape.cpp
View file

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

4
Engine/source/T3D/vehicles/vehicle.cpp
View file

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