From b47c028d72ef31f6d64168aabef1a0d8f577ea57 Mon Sep 17 00:00:00 2001
From: Sreekanth Arikatla <sreekanth.arikatla@kitware.com>
Date: Fri, 15 Sep 2017 13:49:27 -0400
Subject: [PATCH] ENH: Enforce real time time stepping for dynamic objects
---
Source/SimulationManager/imstkSceneManager.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Source/SimulationManager/imstkSceneManager.cpp b/Source/SimulationManager/imstkSceneManager.cpp
index 883ae26b6..ea6f7af18 100644
--- a/Source/SimulationManager/imstkSceneManager.cpp
+++ b/Source/SimulationManager/imstkSceneManager.cpp
@@ -28,6 +28,7 @@
#include "imstkDeformableObject.h"
#include "imstkVirtualCouplingPBDObject.h"
#include "imstkGeometryMap.h"
+#include "imstkTimer.h"
#include "g3log/g3log.hpp"
@@ -61,6 +62,10 @@ SceneManager::initModule()
void
SceneManager::runModule()
{
+ StopWatch wwt;
+
+ wwt.start();
+
// Reset Contact forces to 0
for (auto obj : m_scene->getSceneObjects())
{
@@ -145,8 +150,6 @@ SceneManager::runModule()
{
controller->setTrackerToOutOfDate();
}
-<<<<<<< HEAD
-=======
auto timeElapsed = wwt.getTimeElapsed(StopWatch::TimeUnitType::seconds);
@@ -174,7 +177,6 @@ SceneManager::runModule()
}
}
}
->>>>>>> 2decf6e... initial
}
void
--
GitLab