From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001
From: sschirm <sschirm@nvidia.com>
Date: Fri, 23 Dec 2016 14:20:36 +0100
Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124

---
 APEX_1.4/samples_v2/SampleBase/ApexController.cpp | 25 +++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'APEX_1.4/samples_v2/SampleBase/ApexController.cpp')

diff --git a/APEX_1.4/samples_v2/SampleBase/ApexController.cpp b/APEX_1.4/samples_v2/SampleBase/ApexController.cpp
index d8c7eb67..cf63f274 100644
--- a/APEX_1.4/samples_v2/SampleBase/ApexController.cpp
+++ b/APEX_1.4/samples_v2/SampleBase/ApexController.cpp
@@ -32,6 +32,9 @@ ApexController::ApexController(PxSimulationFilterShader filterShader, CFirstPers
 , mFilterShader(filterShader)
 , mLastSimulationTime(0)
 , mPaused(false)
+, mUseFixedTimestep(true)
+, mFixedTimestep(1.0/60.0)
+, mTimeRemainder(0.0)
 {
 	QueryPerformanceFrequency(&mPerformanceFreq);
 }
@@ -271,8 +274,26 @@ void ApexController::Animate(double dt)
 	if (mPaused)
 		return;
 
-	// slower physics if fps is too low
-	dt = PxClamp(dt, 0.001, 0.33);
+	if (mFixedTimestep)
+	{
+		mTimeRemainder += dt;
+		if (mTimeRemainder <= 0.0)
+		{
+			return;
+		}
+		mTimeRemainder -= mFixedTimestep;
+		if (mTimeRemainder > 0.0)
+		{
+			// slower physics if fps is below 1/mFixedTimestep
+			mTimeRemainder = 0.0;
+		}
+		dt = mFixedTimestep;
+	}
+	else
+	{
+		// slower physics if fps is too low
+		dt = PxClamp(dt, 0.001, 0.33);
+	}
 
 	LARGE_INTEGER time0;
 	QueryPerformanceCounter(&time0);
-- 
cgit v1.2.3