From 7552554ded20a70bd69bf99a082081080ea8e730 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Thu, 1 Feb 2024 17:47:30 -0600 Subject: [PATCH] dial back overly agressive setRest --- Engine/source/T3D/rigidShape.cpp | 4 ++-- Engine/source/T3D/vehicles/vehicle.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Engine/source/T3D/rigidShape.cpp b/Engine/source/T3D/rigidShape.cpp index faa704ba0..cfdd8258f 100644 --- a/Engine/source/T3D/rigidShape.cpp +++ b/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 diff --git a/Engine/source/T3D/vehicles/vehicle.cpp b/Engine/source/T3D/vehicles/vehicle.cpp index fcddd5cc0..a1e4a426a 100644 --- a/Engine/source/T3D/vehicles/vehicle.cpp +++ b/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