summaryrefslogtreecommitdiff
path: root/Demos/GimpactTestDemo
diff options
context:
space:
mode:
authorejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>2008-01-03 04:42:00 +0000
committerejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>2008-01-03 04:42:00 +0000
commitd051e2eacb01a948c7b53e24fd3d9942ce64bdcc (patch)
tree11e119e6430bd17cf11a0804b025747f3cda9def /Demos/GimpactTestDemo
parent4a5af68c04dbe7d141b2d4143640720c6f0cb7c3 (diff)
downloadbullet3-d051e2eacb01a948c7b53e24fd3d9942ce64bdcc.tar.gz
First commit of 2008, Happy New Year!
Add option to compile without btClock and without profiling: comment out USE_BT_CLOCK, and #define BT_NO_PROFILE Fixed typo/case in #include "LinearMath/btQuickProf.h", in SpuParallelSolver.cpp Removed unnecessary files from libxml CMakeLists.txt
Diffstat (limited to 'Demos/GimpactTestDemo')
-rw-r--r--Demos/GimpactTestDemo/GimpactTestDemo.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Demos/GimpactTestDemo/GimpactTestDemo.cpp b/Demos/GimpactTestDemo/GimpactTestDemo.cpp
index 5207b1b8c..c6a07fea9 100644
--- a/Demos/GimpactTestDemo/GimpactTestDemo.cpp
+++ b/Demos/GimpactTestDemo/GimpactTestDemo.cpp
@@ -582,7 +582,7 @@ void GimpactConcaveDemo::clientMoveAndDisplay()
#endif //USE_KINEMATIC_GROUND
- unsigned long int time = m_clock.getTimeMilliseconds();
+ unsigned long int time = getDeltaTimeMicroseconds()/btScalar(1000);
printf("%i time %i ms \n",m_steps_done,time);
//#ifdef BULLET_GIMPACT
@@ -596,7 +596,6 @@ void GimpactConcaveDemo::clientMoveAndDisplay()
- m_clock.reset();
m_dynamicsWorld->stepSimulation(dt);
//optional but useful: debug drawing