more refactoring, restored some profiling and some debugging

Demos/ColladaDemo/ColladaConverter.cpp

@@ -1053,9 +1053,9 @@ void	ColladaConverter::ConvertRigidBodyRef( btRigidBodyInput& rbInput,btRigidBod
 						} else
 						{
 							printf("static concave triangle <mesh> added\n");
-							//rbOutput.m_colShape = new btTriangleMeshShape(trimesh);//btBvhTriangleMeshShape(trimesh);
+							rbOutput.m_colShape = new btBvhTriangleMeshShape(trimesh);
 							//rbOutput.m_colShape = new btBvhTriangleMeshShape(trimesh);
-							rbOutput.m_colShape = new btConvexTriangleMeshShape(trimesh);
+							//rbOutput.m_colShape = new btConvexTriangleMeshShape(trimesh);
 							
 							//btTriangleMeshShape
 						}

Demos/ColladaDemo/ColladaDemo.cpp

@@ -33,7 +33,7 @@ float deltaTime = 1.f/60.f;
 #include "ColladaDemo.h"
 #include "GL_ShapeDrawer.h"
 #include "GlutStuff.h"
-int maxObj = 1;
+
 
 ///custom version of the converter, that creates physics objects/constraints
 class MyColladaConverter : public ColladaConverter
@@ -80,16 +80,6 @@ class MyColladaConverter : public ColladaConverter
 		const btTransform& startTransform,
 		btCollisionShape* shape)
 	{
-		if (!isDynamic)
-		{
-			printf("nondyna\n");
-		} else
-		{
-			if (!maxObj)
-				return 0;
-			maxObj--;
-		}
-		
 
 		btRigidBody* body = m_demoApp->localCreateRigidBody(isDynamic, mass, startTransform,shape);
 		m_demoApp->getDynamicsWorld()->addCollisionObject(body);

Demos/OpenGL/DemoApplication.cpp

@@ -696,6 +696,26 @@ void DemoApplication::renderme()
 
 			glColor3f(0, 0, 0);
 
+	#ifdef USE_QUICKPROF
+
+
+			if ( getDebugMode() & btIDebugDraw::DBG_ProfileTimings)
+			{
+				static int counter = 0;
+				counter++;
+				std::map<std::string, hidden::ProfileBlock*>::iterator iter;
+				for (iter = btProfiler::mProfileBlocks.begin(); iter != btProfiler::mProfileBlocks.end(); ++iter)
+				{
+					char blockTime[128];
+					sprintf(blockTime, "%s: %lf",&((*iter).first[0]),btProfiler::getBlockTime((*iter).first, btProfiler::BLOCK_CYCLE_SECONDS));//BLOCK_TOTAL_PERCENT));
+					glRasterPos3f(xOffset,yStart,0);
+					BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),blockTime);
+					yStart += yIncr;
+
+				}
+			}
+	#endif //USE_QUICKPROF
+
 		
 			glRasterPos3f(xOffset,yStart,0);
 			sprintf(buf,"mouse to interact");

src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp

@@ -24,6 +24,7 @@ subject to the following restrictions:
 #include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
 #include "LinearMath/btAabbUtil2.h"
+#include "LinearMath/btQuickprof.h"
 
 //When the user doesn't provide dispatcher or broadphase, create basic versions (and delete them in destructor)
 #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
@@ -114,6 +115,8 @@ void	btCollisionWorld::addCollisionObject(btCollisionObject* collisionObject,sho
 
 void	btCollisionWorld::performDiscreteCollisionDetection()
 {
+	BEGIN_PROFILE("performDiscreteCollisionDetection");
+
 	btDispatcherInfo	dispatchInfo;
 	dispatchInfo.m_timeStep = 0.f;
 	dispatchInfo.m_stepCount = 0;
@@ -133,6 +136,8 @@ void	btCollisionWorld::performDiscreteCollisionDetection()
 	if (dispatcher)
 		dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache,dispatchInfo);
 
+	END_PROFILE("performDiscreteCollisionDetection");
+
 }
 
 

src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp

@@ -34,13 +34,17 @@ subject to the following restrictions:
 #include "BulletDynamics/Vehicle/btVehicleRaycaster.h"
 #include "BulletDynamics/Vehicle/btWheelInfo.h"
 #include "LinearMath/btIDebugDraw.h"
+#include "LinearMath/btQuickprof.h"
+
+
 
 #include <algorithm>
 
 btDiscreteDynamicsWorld::btDiscreteDynamicsWorld()
 :btDynamicsWorld(),
 m_constraintSolver(new btSequentialImpulseConstraintSolver),
-m_debugDrawer(0)
+m_debugDrawer(0),
+m_profileTimings(0)
 {
 	m_islandManager = new btSimulationIslandManager();
 	m_ownsIslandManager = true;
@@ -51,7 +55,8 @@ m_debugDrawer(0)
 btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver)
 :btDynamicsWorld(dispatcher,pairCache),
 m_constraintSolver(constraintSolver? constraintSolver: new btSequentialImpulseConstraintSolver),
-m_debugDrawer(0)
+m_debugDrawer(0),
+m_profileTimings(0)
 {
 	m_islandManager = new btSimulationIslandManager();
 	m_ownsIslandManager = true;
@@ -70,6 +75,9 @@ btDiscreteDynamicsWorld::~btDiscreteDynamicsWorld()
 
 void	btDiscreteDynamicsWorld::stepSimulation(float timeStep)
 {
+	
+	startProfiling(timeStep);
+
 	///update aabbs information
 	updateAabbs();
 
@@ -106,15 +114,20 @@ void	btDiscreteDynamicsWorld::stepSimulation(float timeStep)
 
 void	btDiscreteDynamicsWorld::updateVehicles(float timeStep)
 {
+	BEGIN_PROFILE("updateVehicles");
+
 	for (int i=0;i<m_vehicles.size();i++)
 	{
 		btRaycastVehicle* vehicle = m_vehicles[i];
 		vehicle->updateVehicle( timeStep);
 	}
+	END_PROFILE("updateVehicles");
 }
 
 void	btDiscreteDynamicsWorld::updateActivationState(float timeStep)
 {
+	BEGIN_PROFILE("updateActivationState");
+
 	for (int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
@@ -134,6 +147,7 @@ void	btDiscreteDynamicsWorld::updateActivationState(float timeStep)
 			}
 		}
 	}
+	END_PROFILE("updateActivationState");
 }
 
 void	btDiscreteDynamicsWorld::addConstraint(btTypedConstraint* constraint)
@@ -168,6 +182,8 @@ void	btDiscreteDynamicsWorld::removeVehicle(btRaycastVehicle* vehicle)
 void	btDiscreteDynamicsWorld::solveContactConstraints(btContactSolverInfo& solverInfo)
 {
 	
+	BEGIN_PROFILE("solveContactConstraints");
+
 	struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback
 	{
 
@@ -200,17 +216,14 @@ void	btDiscreteDynamicsWorld::solveContactConstraints(btContactSolverInfo& solve
 	/// solve all the contact points and contact friction
 	m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld()->getCollisionObjectArray(),&solverCallback);
 
+	END_PROFILE("solveContactConstraints");
 
 }
 
 
 void	btDiscreteDynamicsWorld::solveNoncontactConstraints(btContactSolverInfo& solverInfo)
 {
-	#ifdef USE_QUICKPROF
+	BEGIN_PROFILE("solveNoncontactConstraints");
-	Profiler::beginBlock("solveConstraint");
-#endif //USE_QUICKPROF
-
-
 
 	int i;
 	int numConstraints = m_constraints.size();
@@ -235,18 +248,13 @@ void	btDiscreteDynamicsWorld::solveNoncontactConstraints(btContactSolverInfo& so
 		}
 	}
 
-#ifdef USE_QUICKPROF
+	END_PROFILE("solveNoncontactConstraints");
-	Profiler::endBlock("solveConstraint");
-#endif //USE_QUICKPROF
 
 }
 
 void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 {
-	
+	BEGIN_PROFILE("calculateSimulationIslands");
-#ifdef USE_QUICKPROF
-	Profiler::beginBlock("IslandUnionFind");
-#endif //USE_QUICKPROF
 
 	getSimulationIslandManager()->updateActivationState(getCollisionWorld(),getCollisionWorld()->getDispatcher());
 
@@ -276,14 +284,13 @@ void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 	//Store the island id in each body
 	getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld());
 
-#ifdef USE_QUICKPROF
+	END_PROFILE("calculateSimulationIslands");
-	Profiler::endBlock("IslandUnionFind");
-#endif //USE_QUICKPROF
 
 }
 
 static void DrawAabb(btIDebugDraw* debugDrawer,const btVector3& from,const btVector3& to,const btVector3& color)
 {
+
 	btVector3 halfExtents = (to-from)* 0.5f;
 	btVector3 center = (to+from) *0.5f;
 	int i,j;
@@ -315,6 +322,8 @@ static void DrawAabb(btIDebugDraw* debugDrawer,const btVector3& from,const btVec
 
 void	btDiscreteDynamicsWorld::updateAabbs()
 {
+	BEGIN_PROFILE("updateAabbs");
+	
 	btVector3 colorvec(1,0,0);
 	btTransform predictedTrans;
 	for (int i=0;i<m_collisionObjects.size();i++)
@@ -337,10 +346,13 @@ void	btDiscreteDynamicsWorld::updateAabbs()
 			}
 		}
 	}
+	
+	END_PROFILE("updateAabbs");
 }
 
 void	btDiscreteDynamicsWorld::integrateTransforms(float timeStep)
 {
+	BEGIN_PROFILE("integrateTransforms");
 	btTransform predictedTrans;
 	for (int i=0;i<m_collisionObjects.size();i++)
 	{
@@ -355,12 +367,14 @@ void	btDiscreteDynamicsWorld::integrateTransforms(float timeStep)
 			}
 		}
 	}
+	END_PROFILE("integrateTransforms");
 }
 
 
 
 void	btDiscreteDynamicsWorld::predictUnconstraintMotion(float timeStep)
 {
+	BEGIN_PROFILE("predictUnconstraintMotion");
 	for (int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
@@ -376,4 +390,41 @@ void	btDiscreteDynamicsWorld::predictUnconstraintMotion(float timeStep)
 			}
 		}
 	}
+	END_PROFILE("predictUnconstraintMotion");
 }
+
+
+void	btDiscreteDynamicsWorld::startProfiling(float timeStep)
+{
+	#ifdef USE_QUICKPROF
+
+
+	//toggle btProfiler
+	if ( m_debugDrawer && m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_ProfileTimings)
+	{
+		if (!m_profileTimings)
+		{
+			m_profileTimings = 1;
+			// To disable profiling, simply comment out the following line.
+			static int counter = 0;
+
+			char filename[128];
+			sprintf(filename,"quickprof_bullet_timings%i.csv",counter++);
+			btProfiler::init(filename, btProfiler::BLOCK_CYCLE_SECONDS);//BLOCK_TOTAL_MICROSECONDS
+		} else
+		{
+			btProfiler::endProfilingCycle();
+		}
+
+	} else
+	{
+		if (m_profileTimings)
+		{
+			btProfiler::endProfilingCycle();
+
+			m_profileTimings = 0;
+			btProfiler::destroy();
+		}
+	}
+#endif //USE_QUICKPROF
+}

src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

@@ -48,6 +48,8 @@ protected:
 
 	std::vector<btRaycastVehicle*>	m_vehicles;
 
+	int	m_profileTimings;
+
 	void	predictUnconstraintMotion(float timeStep);
 	
 	void	integrateTransforms(float timeStep);
@@ -62,6 +64,7 @@ protected:
 
 	void	updateVehicles(float timeStep);
 
+	void	startProfiling(float timeStep);
 public:
 
 

src/LinearMath/btQuickprof.h

@@ -27,13 +27,13 @@
 // Credits: The Clock class was inspired by the Timer classes in 
 // Ogre (www.ogre3d.org).
 
+#ifndef QUICK_PROF_H
+#define QUICK_PROF_H
 
 //#define USE_QUICKPROF 1
 
 #ifdef USE_QUICKPROF
 
-#ifndef QUICK_PROF_H
-#define QUICK_PROF_H
 
 #include <iostream>
 #include <fstream>
@@ -580,25 +580,25 @@ void btProfiler::endProfilingCycle()
 		{
 			// On the first iteration, print a header line that shows the 
 			// names of each profiling block.
-			mOutputFile << "#cycle; ";
+			mOutputFile << "#cycle, ";
 
 			for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); 
 				++iter)
 			{
-				mOutputFile << (*iter).first << "; ";
+				mOutputFile << (*iter).first << ", ";
 			}
 
 			mOutputFile << std::endl;
 			mFirstFileOutput = false;
 		}
 
-		mOutputFile << mCycleNumber << "; ";
+		mOutputFile << mCycleNumber << ", ";
 
 		for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); 
 			++iter)
 		{
 			mOutputFile << getBlockTime((*iter).first, mFileOutputMethod) 
-				<< "; ";
+				<< ", ";
 		}
 
 		mOutputFile << std::endl;
@@ -673,6 +673,14 @@ std::string btProfiler::createStatsString(BlockTimingMethod method)
 	return s;
 }
 
-#endif
+
+#define BEGIN_PROFILE(a) btProfiler::beginBlock(a)
+#define END_PROFILE(a) btProfiler::endBlock(a)
+
+#else //USE_QUICKPROF
+#define BEGIN_PROFILE(a)
+#define END_PROFILE(a)
 
 #endif //USE_QUICKPROF
+
+#endif //QUICK_PROF_H