From 4d260bb7366192fd9d0daa5aeb78551221e1ef25 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Thu, 6 Dec 2007 03:05:57 +0000 Subject: [PATCH] added new demos to build system, fixed timing report (is in milliseconds -> ms) --- Demos/AllBulletDemos/Jamfile | 2 ++ Demos/OpenGL/DemoApplication.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Demos/AllBulletDemos/Jamfile b/Demos/AllBulletDemos/Jamfile index ece1eeb0d..60afe933b 100644 --- a/Demos/AllBulletDemos/Jamfile +++ b/Demos/AllBulletDemos/Jamfile @@ -7,8 +7,10 @@ FrameWorkDemo AllBulletDemos : ../BspDemo/BspDemo.cpp ../BspDemo/BspConverter.cpp ../BspDemo/BspLoader.cpp + ../DynamicControlDemo/MotorDemo.cpp ../ConcaveDemo/ConcavePhysicsDemo.cpp ../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp + ../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp ../RagdollDemo/RagdollDemo.cpp ../GimpactTestDemo/GimpactTestDemo.cpp diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp index 923689d4d..dff36d663 100644 --- a/Demos/OpenGL/DemoApplication.cpp +++ b/Demos/OpenGL/DemoApplication.cpp @@ -806,7 +806,7 @@ void DemoApplication::showProfileInfo(float& xOffset,float& yStart, float yIncr) double parent_time = m_profileIterator->Is_Root() ? time_since_reset : m_profileIterator->Get_Current_Parent_Total_Time(); { - sprintf(blockTime,"--- Profiling: %s (total running time: %.3f m) ---", m_profileIterator->Get_Current_Parent_Name(), parent_time ); + sprintf(blockTime,"--- Profiling: %s (total running time: %.3f ms) ---", m_profileIterator->Get_Current_Parent_Name(), parent_time ); displayProfileString(xOffset,yStart,blockTime); yStart += yIncr; sprintf(blockTime,"press number (1,2...) to display child timings, or 0 to go up to parent" );