+ improved split impulse constraint solver option

+ improved friction warm starting
+ made constraint solver configuration more consistent (moved m_solverMode into btContactSolverInfo)
+ reset timing in CDTestFramework after initialization (SAP init destorts timings)
+ make it easier to change default sizes for stack allocator in btDefaultCollisionConfiguration

Demos/AllBulletDemos/DemoEntries.cpp

@@ -102,6 +102,7 @@ public:
 
 btDemoEntry g_demoEntries[] =
 {
+	
 	{"SoftBody Cloth",SoftDemo0::Create},
 	{"SoftBody Pressure",SoftDemo1::Create},
 	{"SoftBody Volume",SoftDemo2::Create},

Demos/AllBulletDemos/Main.cpp

@@ -21,7 +21,7 @@
 #include "glui/GL/glui.h"
 #include "LinearMath/btScalar.h"
 #include "LinearMath/btMinMax.h"
-
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
 #include "DemoApplication.h"
 #include "DemoEntries.h"
 #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
@@ -34,25 +34,83 @@
 
 namespace
 {
-	int testIndex = 0;
+	int testIndex=0;
-	int testSelection = 0;
+	int testSelection=0;
 	btDemoEntry* entry;
 	DemoApplication* demo;
-	int iterationCount = 10;
+	int iterationCount;
-	int width = 640;
+	int width;
-	int height = 480;
+	int height;
-	int framePeriod = 16;//todo: test if this value should be 0
+	int framePeriod;//todo: test if this value should be 0
 	int mainWindow;
 	GLUI *glui;
 	float hz;
-	float viewZoom = 20.0f;
+	float viewZoom=20.f;
-	float viewX = 0.0f;
+	float viewX;
-	float viewY = 0.0f;
+	float viewY;
 	int tx, ty, tw, th;
-	int	gDrawAabb=0;
+	int	gDrawAabb;
-	int	gWireFrame=0;
+	int	gWireFrame;
-	int	gDebugContacts=0;
+	int	gDebugContacts;
-	int gDebugNoDeactivation = 0;
+	int gDebugNoDeactivation;
+	int	gUseWarmstarting;
+	int	gRandomizeConstraints;
+	int	gUseSplitImpulse;
+	float	gErp;
+	float	gSlop;
+	float	gErp2;
+	float	gWarmStartingParameter;
+}
+
+
+void	setDefaultSettings()
+{
+	viewX = 0.0f;
+	viewY = 0.0f;
+	framePeriod = 16;//todo: test if this value should be 0
+	
+	width = 640;
+	height = 480;
+	iterationCount = 10;
+	gDrawAabb=0;
+	gWireFrame=0;
+	gDebugContacts=0;
+	gDebugNoDeactivation = 0;
+	gUseSplitImpulse = 0;
+	gUseWarmstarting = 1;
+	gRandomizeConstraints = 1;
+	gErp = 0.2f;
+	gSlop=0.0f;
+	gErp2 = 0.1f;
+	gWarmStartingParameter = 0.85f;
+	
+}
+
+void	setDefaultSettingsAndSync()
+{
+	setDefaultSettings();
+	glui->sync_live();
+}
+
+
+void	TogglePause()
+{
+	if (demo)
+		demo->toggleIdle();
+}
+
+void	ResetScene()
+{
+	if (demo)
+		demo->clientResetScene();
+}
+
+
+
+void	SingleSimulationStep()
+{
+	if (demo)
+		demo->clientMoveAndDisplay();
 }
 
 
@@ -136,6 +194,7 @@ void SimulationLoop()
 		demo->setDebugMode(demo->getDebugMode() & (~btIDebugDraw::DBG_DrawContactPoints));
 	}
 
+	
 	if (gDebugNoDeactivation)
 	{
 		demo->setDebugMode(demo->getDebugMode() |btIDebugDraw::DBG_NoDeactivation);
@@ -148,8 +207,31 @@ void SimulationLoop()
 	{
 		btDiscreteDynamicsWorld* discreteWorld = (btDiscreteDynamicsWorld*) demo->getDynamicsWorld();
 		discreteWorld->getSolverInfo().m_numIterations = iterationCount;
-	}
+		discreteWorld->getSolverInfo().m_erp = gErp;
+		discreteWorld->getSolverInfo().m_erp2 = gErp2;
 		
+		discreteWorld->getSolverInfo().m_linearSlop = gSlop;
+				
+		discreteWorld->getSolverInfo().m_warmstartingFactor = gWarmStartingParameter;
+		discreteWorld->getSolverInfo().m_splitImpulse = gUseSplitImpulse;
+
+		btSequentialImpulseConstraintSolver* solver = ((btSequentialImpulseConstraintSolver*) discreteWorld->getConstraintSolver());
+
+		if (gUseWarmstarting)
+		{
+			discreteWorld->getSolverInfo().m_solverMode |= SOLVER_USE_WARMSTARTING;
+		} else
+		{
+			discreteWorld->getSolverInfo().m_solverMode &= (~SOLVER_USE_WARMSTARTING);
+		}
+		if (gRandomizeConstraints)
+		{
+			discreteWorld->getSolverInfo().m_solverMode |= SOLVER_RANDMIZE_ORDER;
+		} else
+		{
+			discreteWorld->getSolverInfo().m_solverMode &= (~SOLVER_RANDMIZE_ORDER);
+		}
+	}
 
 	if (!demo->isIdle())
 	{
@@ -176,6 +258,19 @@ void SimulationLoop()
 	}
 }	
 
+void	RestartScene()
+{
+	if (demo->getDynamicsWorld() && demo->getDynamicsWorld()->getDebugDrawer())
+			delete demo->getDynamicsWorld()->getDebugDrawer();
+	delete demo;
+	entry = g_demoEntries + testIndex;
+	demo = CreatDemo(entry);
+	viewZoom = 20.0f;
+	viewX = 0.0f;
+	viewY = 0.0f;
+	Resize(width, height);
+}
+
 void Keyboard(unsigned char key, int x, int y)
 {
 
@@ -234,7 +329,7 @@ void MouseMotion(int x, int y)
 int main(int argc, char** argv)
 {
 	
-
+	setDefaultSettings();
 	
 	int bulletVersion = btGetVersion();
 	printf("Bullet version %d\n",bulletVersion);
@@ -260,6 +355,8 @@ int main(int argc, char** argv)
 	glui = GLUI_Master.create_glui_subwindow( mainWindow, 
 		GLUI_SUBWINDOW_RIGHT );
 
+	
+
 	glui->add_statictext("Tests");
 	GLUI_Listbox* testList =
 		glui->add_listbox("", &testSelection);
@@ -268,20 +365,35 @@ int main(int argc, char** argv)
 
 	GLUI_Spinner* iterationSpinner =
 		glui->add_spinner("Iterations", GLUI_SPINNER_INT, &iterationCount);
-	iterationSpinner->set_int_limits(1, 100);
+	iterationSpinner->set_int_limits(1, 250);
 
 /*	GLUI_Spinner* hertzSpinner =
 		glui->add_spinner("Hertz", GLUI_SPINNER_FLOAT, &hz);
 	hertzSpinner->set_float_limits(5.0f, 200.0f);
 */
 
-//	glui->add_checkbox("Position Correction", &settings.enablePositionCorrection);
-//	glui->add_checkbox("Warm Starting", &settings.enablePositionCorrection);
-	glui->add_checkbox("DisableDeactivation", &gDebugNoDeactivation);
 	
+	glui->add_checkbox("DisableDeactivation", &gDebugNoDeactivation);
+	glui->add_checkbox("Split Impulse", &gUseSplitImpulse);
+	GLUI_Spinner* spinner = 0;
+
+	spinner = glui->add_spinner("ERP", GLUI_SPINNER_FLOAT, &gErp);
+	spinner->set_float_limits(0.f,1.f);
+	spinner = glui->add_spinner("ERP2", GLUI_SPINNER_FLOAT, &gErp2);
+	spinner->set_float_limits(0.f,1.f);
+	spinner = glui->add_spinner("Slop", GLUI_SPINNER_FLOAT, &gSlop);
+	spinner->set_float_limits(0.f,1.f);
+
+	spinner = glui->add_spinner("WSP", GLUI_SPINNER_FLOAT,&gWarmStartingParameter);
+	spinner->set_float_limits (0.f,1.0);
+	glui->add_checkbox("Warmstarting", &gUseWarmstarting);
+	glui->add_checkbox("Randomize Constraints", &gRandomizeConstraints);
+	
+
+	glui->add_button("Reset Defaults", 0,(GLUI_Update_CB)setDefaultSettingsAndSync);
 	glui->add_separator();
 
-	GLUI_Panel* drawPanel =	glui->add_panel("Draw");
+	GLUI_Panel* drawPanel =	glui->add_panel("Debug Draw");
 
 	glui->add_checkbox_to_panel(drawPanel, "AABBs", &gDrawAabb);
 	glui->add_checkbox_to_panel(drawPanel, "Wireframe", &gWireFrame);
@@ -300,7 +412,18 @@ int main(int argc, char** argv)
 		++e;
 	}
 	
-	glui->add_button("Quit", 0,(GLUI_Update_CB)exit);
+	glui->add_separator();
+
+	glui->add_button("Toggle Pause", 0,(GLUI_Update_CB)TogglePause);
+	
+	glui->add_button("Single Step", 0,(GLUI_Update_CB)SingleSimulationStep);
+	glui->add_button("Reset Scene", 0,(GLUI_Update_CB)ResetScene);
+	glui->add_button("Restart Scene", 0,(GLUI_Update_CB)RestartScene);
+
+	glui->add_separator();
+	
+	glui->add_button("Exit", 0,(GLUI_Update_CB)exit);
+
 	glui->set_main_gfx_window( mainWindow );
 
 	// Use a timer to control the frame rate.

Demos/Benchmarks/BenchmarkDemo.cpp

@@ -277,7 +277,7 @@ void	BenchmarkDemo::initPhysics()
 
 	///the default constraint solver. For parallel processing you can use a different solver (see Extras/BulletMultiThreaded)
 	btSequentialImpulseConstraintSolver* sol = new btSequentialImpulseConstraintSolver;
-	sol->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_CACHE_FRIENDLY);
+	
 	m_solver = sol;
 
 	m_dynamicsWorld = new btDiscreteDynamicsWorld(m_dispatcher,m_overlappingPairCache,m_solver,m_collisionConfiguration);

Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp

@@ -25,8 +25,9 @@ subject to the following restrictions:
 //#define CENTER_OF_MASS_SHIFT 1
 //#define VERBOSE_TIMESTEPPING_CONSOLEOUTPUT 1
 
-//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver
 //#define USE_PARALLEL_DISPATCHER 1
+//#define USE_PARALLEL_SOLVER 1 //experimental parallel solver
+
 
 //from Bullet 2.68 onwards ODE Quickstep constraint solver is optional part of Bullet, re-distributed under the ZLib license with permission of Russell L. Smith
 //#define COMPARE_WITH_QUICKSTEP 1
@@ -338,6 +339,7 @@ void	CcdPhysicsDemo::initPhysics()
 #ifdef DO_BENCHMARK_PYRAMIDS
 	m_collisionShapes.push_back(new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)));
 #else
+//	m_collisionShapes.push_back(new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)));
 	m_collisionShapes.push_back(new btCylinderShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)));
 #endif
 	
@@ -432,22 +434,24 @@ int maxNumOutstandingTasks = 4;
 #else
 	btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver();
 
-	m_solver = solver;
+	m_solver = solver;//new btOdeQuickstepConstraintSolver();
-	//default solverMode is SOLVER_RANDMIZE_ORDER. Warmstarting seems not to improve convergence, see 
-	//solver->setSolverMode(0);//btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
 	
 #endif //USE_PARALLEL_SOLVER
 
 #endif
 		
-#ifdef	USER_DEFINED_FRICTION_MODEL
+
-	//user defined friction model is not supported in 'cache friendly' solver yet, so switch to old solver
-		m_solver->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
-#endif //USER_DEFINED_FRICTION_MODEL
 
 		btDiscreteDynamicsWorld* world = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
 		m_dynamicsWorld = world;
 
+#ifdef	USER_DEFINED_FRICTION_MODEL
+	//user defined friction model is not supported in 'cache friendly' solver yet, so switch to old solver
+
+		world->getSolverInfo().m_solverMode = SOLVER_RANDMIZE_ORDER;
+
+#endif //USER_DEFINED_FRICTION_MODEL
+
 #ifdef DO_BENCHMARK_PYRAMIDS
 		world->getSolverInfo().m_numIterations = 4;
 #endif //DO_BENCHMARK_PYRAMIDS
@@ -460,9 +464,9 @@ int maxNumOutstandingTasks = 4;
 #ifdef USER_DEFINED_FRICTION_MODEL
 	{
 		//m_solver->setContactSolverFunc(ContactSolverFunc func,USER_CONTACT_SOLVER_TYPE1,DEFAULT_CONTACT_SOLVER_TYPE);
-		m_solver->SetFrictionSolverFunc(myFrictionModel,USER_CONTACT_SOLVER_TYPE1,DEFAULT_CONTACT_SOLVER_TYPE);
+		solver->SetFrictionSolverFunc(myFrictionModel,USER_CONTACT_SOLVER_TYPE1,DEFAULT_CONTACT_SOLVER_TYPE);
-		m_solver->SetFrictionSolverFunc(myFrictionModel,DEFAULT_CONTACT_SOLVER_TYPE,USER_CONTACT_SOLVER_TYPE1);
+		solver->SetFrictionSolverFunc(myFrictionModel,DEFAULT_CONTACT_SOLVER_TYPE,USER_CONTACT_SOLVER_TYPE1);
-		m_solver->SetFrictionSolverFunc(myFrictionModel,USER_CONTACT_SOLVER_TYPE1,USER_CONTACT_SOLVER_TYPE1);
+		solver->SetFrictionSolverFunc(myFrictionModel,USER_CONTACT_SOLVER_TYPE1,USER_CONTACT_SOLVER_TYPE1);
 		//m_physicsEnvironmentPtr->setNumIterations(2);
 	}
 #endif //USER_DEFINED_FRICTION_MODEL

Demos/SoftDemo/SoftDemo.cpp

@@ -132,18 +132,18 @@ void SoftDemo::clientMoveAndDisplay()
 		m_node->m_v+=(m_goal-m_node->m_x)/dt;
 		}
 	
-#define FIXED_STEP
+//#define FIXED_STEP
 #ifdef FIXED_STEP
 		m_dynamicsWorld->stepSimulation(dt=1.0f/60.f,0);
 
 #else
-		//during idle mode, just run 1 simulation step maximum
+		//during idle mode, just run 1 simulation step maximum, otherwise 4 at max
-		int maxSimSubSteps = m_idle ? 1 : 1;
+		int maxSimSubSteps = m_idle ? 1 : 4;
-		if (m_idle)
+		//if (m_idle)
-			dt = 1.0/420.f;
+		//	dt = 1.0/420.f;
 
-		int numSimSteps = 0;
+		int numSimSteps;
-		numSimSteps = m_dynamicsWorld->stepSimulation(dt,maxSimSubSteps);		
+		numSimSteps = m_dynamicsWorld->stepSimulation(dt);
 
 #ifdef VERBOSE_TIMESTEPPING_CONSOLEOUTPUT
 		if (!numSimSteps)

Extras/CDTestFramework/BulletSAPCompleteBoxPruningTest.cpp

@@ -537,7 +537,6 @@ void BulletSAPCompleteBoxPruningTest::PerformTest()
 	if (m_firstTime)
 	{
 		numUpdatedBoxes = mNbBoxes;
-		m_firstTime = false;
 	}
 	mProfiler.Start();
 	UpdateBoxes(numUpdatedBoxes);
@@ -567,6 +566,13 @@ void BulletSAPCompleteBoxPruningTest::PerformTest()
 	mProfiler.End();
 	mProfiler.Accum();
 
+	if (m_firstTime)
+	{
+		//initialization messes up timings
+		m_firstTime = false;
+		mProfiler.Reset();
+	}
+	
 //	printf("%d pairs colliding\r     ", mPairs.GetNbPairs());
 
 	ZeroMemory(mFlags,sizeof(bool)*mNbBoxes);

Extras/CDTestFramework/CDTestFramework.cpp

@@ -59,7 +59,7 @@ enum TestIndex
 //	TEST_OBB_MESH_QUERY,
 //	TEST_CAPSULE_MESH_QUERY,
 //	TEST_COMPLETE_BOX_PRUNING=0,
- //	TEST_COMPLETE_BOX_PRUNING_8192,
+ 	TEST_COMPLETE_BOX_PRUNING_8192,
 //	TEST_BULLET_SAP_1024,
  //	TEST_BULLET_SAP_8192,
 //	TEST_BULLET_SAP_SORTEDPAIRS_8192,
@@ -286,7 +286,7 @@ int main(int argc, char** argv)
 //			{TEST_OBB_MESH_QUERY, "OBB-mesh query"},
 //			{TEST_CAPSULE_MESH_QUERY, "Capsule-mesh query"},
 //			{TEST_COMPLETE_BOX_PRUNING, "OPCODE SAP 1024"},
-	//		{TEST_COMPLETE_BOX_PRUNING_8192, "OPCODE SAP 8192"},
+			{TEST_COMPLETE_BOX_PRUNING_8192, "OPCODE SAP 8192"},
 //			{TEST_BULLET_SAP_1024, "Bullet SAP HASHPAIR 1024"},
 	//		{TEST_BULLET_SAP_8192, "Bullet SAP HASHPAIR 8192"},
 //			{TEST_BULLET_SAP_SORTEDPAIRS_8192, "Bullet SAP SORTEDPAIR 8192"},
@@ -306,7 +306,7 @@ int main(int argc, char** argv)
 //	gCollisionTests[TEST_CAPSULE_MESH_QUERY]	= new CapsuleMeshQuery;
 //	gCollisionTests[TEST_COMPLETE_BOX_PRUNING]	= new CompleteBoxPruningTest(NUM_SAP_BOXES);
  //	gCollisionTests[TEST_COMPLETE_BOX_PRUNING_8192]	= new CompleteBoxPruningTest(NUM_SAP_BOXES);
-//	gCollisionTests[TEST_COMPLETE_BOX_PRUNING_8192]	= new CompleteBoxPruningTest(NUM_SAP_BOXES);
+	gCollisionTests[TEST_COMPLETE_BOX_PRUNING_8192]	= new CompleteBoxPruningTest(NUM_SAP_BOXES);
 //	gCollisionTests[TEST_BULLET_SAP_1024]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,1);
  //	gCollisionTests[TEST_BULLET_SAP_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,1);
 //	gCollisionTests[TEST_BULLET_SAP_SORTEDPAIRS_8192]	= new BulletSAPCompleteBoxPruningTest(NUM_SAP_BOXES,3);

Extras/CDTestFramework/Profiling.h

@@ -60,6 +60,14 @@ subject to the following restrictions:
 									QueryPerformanceCounter((LARGE_INTEGER*)&mCounter1);
 								}
 
+					void	Reset()
+								{
+									mCycles = 0;
+									mTime = 0.0f;
+									mNbQueries = 0;
+									mMsTime=0.0f;
+								}
+
 				void			Accum()
 								{
 									double t = ((double)mCounter1 - (double)mCounter0)/(double)mFreq;

Extras/COLLADA_DOM/include/dae/daeDom.h

@@ -15,10 +15,17 @@
 #define __DAE_DOM__
 
 class daeMetaElement;
+
+#ifdef WIN32
 	#pragma warning(disable : 4324) // disable padding warning
 	#pragma warning(disable:4530) // Disable the exception disable but used in MSCV Stl warning.
 	#pragma warning(disable:4996) //Turn off warnings about deprecated C routines
 	#pragma warning(disable:4786) // Disable the "debug name too long" warning
+	#pragma warning(disable:4244) // Disable the "possible loss of data" warning
+	#pragma warning(disable:4018) // signed/unsigned int mismatch
+	#pragma warning(disable:4267) // possible loss of data
+	#pragma warning(disable:4530) // C++ exception handler used
+#endif
 
 daeMetaElement* initializeDomMeta();
 

Extras/COLLADA_DOM/include/dae/daeTypes.h

@@ -20,6 +20,9 @@
 	#pragma warning(disable:4996) //Turn off warnings about deprecated C routines
 	#pragma warning(disable:4786) // Disable the "debug name too long" warning
 	#pragma warning(disable:4244) // Disable the "possible loss of data" warning
+	#pragma warning(disable:4018) // signed/unsigned int mismatch
+	#pragma warning(disable:4267) // possible loss of data
+	#pragma warning(disable:4530) // C++ exception handler used
 
 #include <dae/daeWin32Platform.h>
 #elif defined( __GCC__ )

src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp

@@ -1,4 +1,3 @@
-
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
@@ -26,6 +25,7 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h"
 #include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
 #include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
 
 
@@ -35,17 +35,24 @@ subject to the following restrictions:
 
 
 
-#define DEFAULT_MAX_OVERLAPPING_PAIRS 65535
-#define DEFAULT_STACK_ALLOCATOR_SIZE	(5*1024*1024)
 
 
-btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(btStackAlloc*	stackAlloc,btPoolAllocator*	persistentManifoldPool,btPoolAllocator*	collisionAlgorithmPool)
+btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
+//btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(btStackAlloc*	stackAlloc,btPoolAllocator*	persistentManifoldPool,btPoolAllocator*	collisionAlgorithmPool)
 {
 
 	void* mem = btAlignedAlloc(sizeof(btVoronoiSimplexSolver),16);
 	m_simplexSolver = new (mem)btVoronoiSimplexSolver();
+	
+#define USE_EPA 1
+#ifdef USE_EPA
 	mem = btAlignedAlloc(sizeof(btGjkEpaPenetrationDepthSolver),16);
 	m_pdSolver = new (mem)btGjkEpaPenetrationDepthSolver;
+#else
+	mem = btAlignedAlloc(sizeof(btMinkowskiPenetrationDepthSolver),16);
+	m_pdSolver = new (mem)btMinkowskiPenetrationDepthSolver;
+#endif//USE_EPA	
+	
 
 	//default CreationFunctions, filling the m_doubleDispatch table
 	mem = btAlignedAlloc(sizeof(btConvexConvexAlgorithm::CreateFunc),16);
@@ -94,37 +101,37 @@ btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(btStackAlloc*	s
 	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize3);
 	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize4);
 
-	if (stackAlloc)
+	if (constructionInfo.m_stackAlloc)
 	{
 		m_ownsStackAllocator = false;
-		this->m_stackAlloc = stackAlloc;
+		this->m_stackAlloc = constructionInfo.m_stackAlloc;
 	} else
 	{
 		m_ownsStackAllocator = true;
 		void* mem = btAlignedAlloc(sizeof(btStackAlloc),16);
-		m_stackAlloc = new(mem)btStackAlloc(DEFAULT_STACK_ALLOCATOR_SIZE);
+		m_stackAlloc = new(mem)btStackAlloc(constructionInfo.m_defaultStackAllocatorSize);
 	}
 		
-	if (persistentManifoldPool)
+	if (constructionInfo.m_persistentManifoldPool)
 	{
 		m_ownsPersistentManifoldPool = false;
-		m_persistentManifoldPool = persistentManifoldPool;
+		m_persistentManifoldPool = constructionInfo.m_persistentManifoldPool;
 	} else
 	{
 		m_ownsPersistentManifoldPool = true;
 		void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
-		m_persistentManifoldPool = new (mem) btPoolAllocator(sizeof(btPersistentManifold),DEFAULT_MAX_OVERLAPPING_PAIRS);
+		m_persistentManifoldPool = new (mem) btPoolAllocator(sizeof(btPersistentManifold),constructionInfo.m_defaultMaxPersistentManifoldPoolSize);
 	}
 	
-	if (collisionAlgorithmPool)
+	if (constructionInfo.m_collisionAlgorithmPool)
 	{
 		m_ownsCollisionAlgorithmPool = false;
-		m_collisionAlgorithmPool = collisionAlgorithmPool;
+		m_collisionAlgorithmPool = constructionInfo.m_collisionAlgorithmPool;
 	} else
 	{
 		m_ownsCollisionAlgorithmPool = true;
 		void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
-		m_collisionAlgorithmPool = new(mem) btPoolAllocator(collisionAlgorithmMaxElementSize,DEFAULT_MAX_OVERLAPPING_PAIRS);
+		m_collisionAlgorithmPool = new(mem) btPoolAllocator(collisionAlgorithmMaxElementSize,constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize);
 	}
 
 
@@ -187,7 +194,9 @@ btDefaultCollisionConfiguration::~btDefaultCollisionConfiguration()
 
 	m_simplexSolver->~btVoronoiSimplexSolver();
 	btAlignedFree(m_simplexSolver);
-	m_pdSolver->~btGjkEpaPenetrationDepthSolver();
+
+	m_pdSolver->~btConvexPenetrationDepthSolver();
+	
 	btAlignedFree(m_pdSolver);
 
 

src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h

@@ -18,7 +18,28 @@ subject to the following restrictions:
 
 #include "btCollisionConfiguration.h"
 class btVoronoiSimplexSolver;
-class btGjkEpaPenetrationDepthSolver;
+class btConvexPenetrationDepthSolver;
+
+struct	btDefaultCollisionConstructionInfo
+{
+	btStackAlloc*		m_stackAlloc;
+	btPoolAllocator*	m_persistentManifoldPool;
+	btPoolAllocator*	m_collisionAlgorithmPool;
+	int					m_defaultMaxPersistentManifoldPoolSize;
+	int					m_defaultMaxCollisionAlgorithmPoolSize;
+	int					m_defaultStackAllocatorSize;
+
+	btDefaultCollisionConstructionInfo()
+		:m_stackAlloc(0),
+		m_persistentManifoldPool(0),
+		m_collisionAlgorithmPool(0),
+		m_defaultMaxPersistentManifoldPoolSize(65535),
+		m_defaultMaxCollisionAlgorithmPoolSize(65535),
+		m_defaultStackAllocatorSize(5*1024*1024)
+	{
+	}
+};
+
 
 
 ///btCollisionConfiguration allows to configure Bullet collision detection
@@ -40,7 +61,7 @@ class	btDefaultCollisionConfiguration : public btCollisionConfiguration
 
 	//default simplex/penetration depth solvers
 	btVoronoiSimplexSolver*	m_simplexSolver;
-	btGjkEpaPenetrationDepthSolver*	m_pdSolver;
+	btConvexPenetrationDepthSolver*	m_pdSolver;
 	
 	//default CreationFunctions, filling the m_doubleDispatch table
 	btCollisionAlgorithmCreateFunc*	m_convexConvexCreateFunc;
@@ -60,7 +81,8 @@ class	btDefaultCollisionConfiguration : public btCollisionConfiguration
 	
 public:
 
-	btDefaultCollisionConfiguration(btStackAlloc*	stackAlloc=0,btPoolAllocator*	persistentManifoldPool=0,btPoolAllocator*	collisionAlgorithmPool=0);
+
+	btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
 
 	virtual ~btDefaultCollisionConfiguration();
 

src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h

@@ -31,6 +31,7 @@ class btManifoldPoint
 			btManifoldPoint()
 				:m_userPersistentData(0),
 				m_appliedImpulse(0.f),
+				m_lateralFrictionInitialized(false),
 				m_lifeTime(0)
 			{
 			}
@@ -46,6 +47,9 @@ class btManifoldPoint
 					m_combinedRestitution(btScalar(0.)),
 					m_userPersistentData(0),
 					m_appliedImpulse(0.f),
+					m_lateralFrictionInitialized(false),
+					m_appliedImpulseLateral1(0.f),
+					m_appliedImpulseLateral2(0.f),
 					m_lifeTime(0)
 			{
 				
@@ -74,7 +78,13 @@ class btManifoldPoint
 			mutable void*	m_userPersistentData;
 			btScalar		m_appliedImpulse;
 
-			int		m_lifeTime;//lifetime of the contactpoint in frames
+			bool			m_lateralFrictionInitialized;
+			btScalar		m_appliedImpulseLateral1;
+			btScalar		m_appliedImpulseLateral2;
+			int				m_lifeTime;//lifetime of the contactpoint in frames
+			
+			btVector3		m_lateralFrictionDir1;
+			btVector3		m_lateralFrictionDir2;
 
 			btScalar getDistance() const
 			{

src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h

@@ -125,6 +125,9 @@ public:
 			//get rid of duplicated userPersistentData pointer
 			m_pointCache[lastUsedIndex].m_userPersistentData = 0;
 			m_pointCache[lastUsedIndex].m_appliedImpulse = 0.f;
+			m_pointCache[lastUsedIndex].m_lateralFrictionInitialized = false;
+			m_pointCache[lastUsedIndex].m_appliedImpulseLateral1 = 0.f;
+			m_pointCache[lastUsedIndex].m_appliedImpulseLateral2 = 0.f;
 			m_pointCache[lastUsedIndex].m_lifeTime = 0;
 		}
 
@@ -139,6 +142,9 @@ public:
 #ifdef MAINTAIN_PERSISTENCY
 		int	lifeTime = m_pointCache[insertIndex].getLifeTime();
 		btScalar	appliedImpulse = m_pointCache[insertIndex].m_appliedImpulse;
+		btScalar	appliedLateralImpulse1 = m_pointCache[insertIndex].m_appliedImpulseLateral1;
+		btScalar	appliedLateralImpulse2 = m_pointCache[insertIndex].m_appliedImpulseLateral2;
+				
 		btAssert(lifeTime>=0);
 		void* cache = m_pointCache[insertIndex].m_userPersistentData;
 		
@@ -146,6 +152,9 @@ public:
 
 		m_pointCache[insertIndex].m_userPersistentData = cache;
 		m_pointCache[insertIndex].m_appliedImpulse = appliedImpulse;
+		m_pointCache[insertIndex].m_appliedImpulseLateral1 = appliedLateralImpulse1;
+		m_pointCache[insertIndex].m_appliedImpulseLateral2 = appliedLateralImpulse2;
+		
 		m_pointCache[insertIndex].m_lifeTime = lifeTime;
 #else
 		clearUserCache(m_pointCache[insertIndex]);

src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h

@@ -16,8 +16,18 @@ subject to the following restrictions:
 #ifndef CONTACT_SOLVER_INFO
 #define CONTACT_SOLVER_INFO
 
+enum	btSolverMode
+{
+	SOLVER_RANDMIZE_ORDER = 1,
+	SOLVER_FRICTION_SEPARATE = 2,
+	SOLVER_USE_WARMSTARTING = 4,
+	SOLVER_CACHE_FRIENDLY = 8
+};
+
 struct btContactSolverInfoData
 {
+	
+
 	btScalar	m_tau;
 	btScalar	m_damping;
 	btScalar	m_friction;
@@ -27,10 +37,13 @@ struct btContactSolverInfoData
 	btScalar	m_maxErrorReduction;
 	btScalar	m_sor;
 	btScalar	m_erp;//used as Baumgarte factor
-	bool		m_splitImpulse;
+	btScalar	m_erp2;//used in Split Impulse
+	int			m_splitImpulse;
 	btScalar	m_splitImpulsePenetrationThreshold;
 	btScalar	m_linearSlop;
+	btScalar	m_warmstartingFactor;
 
+	int			m_solverMode;
 
 
 };
@@ -38,6 +51,8 @@ struct btContactSolverInfoData
 struct btContactSolverInfo : public btContactSolverInfoData
 {
 
+	
+
 	inline btContactSolverInfo()
 	{
 		m_tau = btScalar(0.6);
@@ -47,10 +62,13 @@ struct btContactSolverInfo : public btContactSolverInfoData
 		m_maxErrorReduction = btScalar(20.);
 		m_numIterations = 10;
 		m_erp = btScalar(0.2);
+		m_erp2 = btScalar(0.1);
 		m_sor = btScalar(1.3);
-		m_splitImpulse = true;
+		m_splitImpulse = false;
-		m_splitImpulsePenetrationThreshold = 1.f;
+		m_splitImpulsePenetrationThreshold = -0.02f;
-		m_linearSlop = 0.0002f;
+		m_linearSlop = btScalar(0.0);
+		m_warmstartingFactor=btScalar(0.85);
+		m_solverMode = SOLVER_RANDMIZE_ORDER | SOLVER_CACHE_FRIENDLY | SOLVER_USE_WARMSTARTING;
 	}
 };
 

src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp

@@ -297,18 +297,6 @@ void btOdeQuickstepConstraintSolver::ConvertConstraint(btPersistentManifold* man
     for (i=0;i<numContacts;i++)
     {
 
-        if (debugDrawer)
-        {
-            const btManifoldPoint& cp = manifold->getContactPoint(i);
-
-            debugDrawer->drawContactPoint(
-                cp.m_positionWorldOnB,
-                cp.m_normalWorldOnB,
-                cp.getDistance(),
-                cp.getLifeTime(),
-                color);
-
-        }
         //assert (m_CurJoint < ODE_MAX_SOLVER_JOINTS);
 
 //		if (manifold->getContactPoint(i).getDistance() < 0.0f)

src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp

@@ -106,8 +106,7 @@ bool  MyContactDestroyedCallback(void* userPersistentData)
 
 
 btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
-:m_solverMode(SOLVER_RANDMIZE_ORDER | SOLVER_CACHE_FRIENDLY | SOLVER_USE_WARMSTARTING ),
+:m_btSeed2(0)
-m_btSeed2(0)
 {
 	gContactDestroyedCallback = &MyContactDestroyedCallback;
 
@@ -154,6 +153,8 @@ void	initSolverBody(btSolverBody* solverBody, btCollisionObject* collisionObject
 	solverBody->m_turnVelocity.setValue(0.f,0.f,0.f);
 }
 
+
+
 int		gNumSplitImpulseRecoveries = 0;
 
 btScalar restitutionCurve(btScalar rel_vel, btScalar restitution);
@@ -179,7 +180,7 @@ void	resolveSplitPenetrationImpulseCacheFriendly(
 {
         (void)solverInfo;
 
-		if (contactConstraint.m_penetration > solverInfo.m_splitImpulsePenetrationThreshold)
+		if (contactConstraint.m_penetration < solverInfo.m_splitImpulsePenetrationThreshold)
         {
 
 				gNumSplitImpulseRecoveries++;
@@ -200,7 +201,7 @@ void	resolveSplitPenetrationImpulseCacheFriendly(
                 rel_vel = vel1Dotn-vel2Dotn;
 
 
-                btScalar positionalError = contactConstraint.m_penetration;
+				btScalar positionalError = -contactConstraint.m_penetration * solverInfo.m_erp2/solverInfo.m_timeStep;
                 //      btScalar positionalError = contactConstraint.m_penetration;
 
                 btScalar velocityError = contactConstraint.m_restitution - rel_vel;// * damping;
@@ -264,9 +265,9 @@ btScalar resolveSingleCollisionCombinedCacheFriendly(
 		rel_vel = vel1Dotn-vel2Dotn;
 
 		btScalar positionalError = 0.f;
-		if (!solverInfo.m_splitImpulse || (contactConstraint.m_penetration<solverInfo.m_splitImpulsePenetrationThreshold))
+		if (!solverInfo.m_splitImpulse || (contactConstraint.m_penetration > solverInfo.m_splitImpulsePenetrationThreshold))
 		{
-			positionalError = contactConstraint.m_penetration;
+ 			positionalError = -contactConstraint.m_penetration * solverInfo.m_erp/solverInfo.m_timeStep;
 		}
 
 		btScalar velocityError = contactConstraint.m_restitution - rel_vel;// * damping;
@@ -725,8 +726,10 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 								solverConstraint.m_restitution = 0.f;
 							};
 
+							
 							btScalar penVel = -solverConstraint.m_penetration/infoGlobal.m_timeStep;
-							solverConstraint.m_penetration *= -(infoGlobal.m_erp/infoGlobal.m_timeStep);
+
+							
 
 							if (solverConstraint.m_restitution > penVel)
 							{
@@ -736,40 +739,76 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 							
 							
 							///warm starting (or zero if disabled)
-							if (m_solverMode & SOLVER_USE_WARMSTARTING)
+							if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
 							{
-								solverConstraint.m_appliedImpulse = cp.m_appliedImpulse;
+								solverConstraint.m_appliedImpulse = cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor;
 								if (rb0)
-									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(solverConstraint.m_contactNormal*rb0->getInvMass(),solverConstraint.m_angularComponentA,cp.m_appliedImpulse);
+									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(solverConstraint.m_contactNormal*rb0->getInvMass(),solverConstraint.m_angularComponentA,solverConstraint.m_appliedImpulse);
 								if (rb1)
-									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(solverConstraint.m_contactNormal*rb1->getInvMass(),solverConstraint.m_angularComponentB,-cp.m_appliedImpulse);
+									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(solverConstraint.m_contactNormal*rb1->getInvMass(),solverConstraint.m_angularComponentB,-solverConstraint.m_appliedImpulse);
 							} else
 							{
 								solverConstraint.m_appliedImpulse = 0.f;
 							}
 
 							solverConstraint.m_appliedPushImpulse = 0.f;
-						}
 							
-						{
+							solverConstraint.m_frictionIndex = m_tmpSolverFrictionConstraintPool.size();
-							btVector3 frictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
+							if (!cp.m_lateralFrictionInitialized)
-							btScalar lat_rel_vel = frictionDir1.length2();
-							if (lat_rel_vel > SIMD_EPSILON)//0.0f)
 							{
-								frictionDir1 /= btSqrt(lat_rel_vel);
+								cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
-								addFrictionConstraint(frictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+								btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
-								btVector3 frictionDir2 = frictionDir1.cross(cp.m_normalWorldOnB);
+								if (lat_rel_vel > SIMD_EPSILON)//0.0f)
-								frictionDir2.normalize();//??
+								{
-								addFrictionConstraint(frictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+									cp.m_lateralFrictionDir1 /= btSqrt(lat_rel_vel);
+									addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+									cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
+									cp.m_lateralFrictionDir2.normalize();//??
+									addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+								} else
+								{
+									//re-calculate friction direction every frame, todo: check if this is really needed
+									
+									btPlaneSpace1(cp.m_normalWorldOnB,cp.m_lateralFrictionDir1,cp.m_lateralFrictionDir2);
+									addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+									addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+								}
+								cp.m_lateralFrictionInitialized = true;
+								
 							} else
 							{
-								//re-calculate friction direction every frame, todo: check if this is really needed
+								addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-								btVector3	frictionDir1,frictionDir2;
+								addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-								btPlaneSpace1(cp.m_normalWorldOnB,frictionDir1,frictionDir2);
-								addFrictionConstraint(frictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-								addFrictionConstraint(frictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
 							}
 
+							{
+								btSolverConstraint& frictionConstraint1 = m_tmpSolverFrictionConstraintPool[solverConstraint.m_frictionIndex];
+								if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+								{
+									frictionConstraint1.m_appliedImpulse = cp.m_appliedImpulseLateral1 * infoGlobal.m_warmstartingFactor;
+									if (rb0)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(frictionConstraint1.m_contactNormal*rb0->getInvMass(),frictionConstraint1.m_angularComponentA,frictionConstraint1.m_appliedImpulse);
+									if (rb1)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(frictionConstraint1.m_contactNormal*rb1->getInvMass(),frictionConstraint1.m_angularComponentB,-frictionConstraint1.m_appliedImpulse);
+								} else
+								{
+									frictionConstraint1.m_appliedImpulse = 0.f;
+								}
+							}
+							{
+								btSolverConstraint& frictionConstraint2 = m_tmpSolverFrictionConstraintPool[solverConstraint.m_frictionIndex+1];
+								if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+								{
+									frictionConstraint2.m_appliedImpulse = cp.m_appliedImpulseLateral2 * infoGlobal.m_warmstartingFactor;
+									if (rb0)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(frictionConstraint2.m_contactNormal*rb0->getInvMass(),frictionConstraint2.m_angularComponentA,frictionConstraint2.m_appliedImpulse);
+									if (rb1)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(frictionConstraint2.m_contactNormal*rb1->getInvMass(),frictionConstraint2.m_angularComponentB,-frictionConstraint2.m_appliedImpulse);
+								} else
+								{
+									frictionConstraint2.m_appliedImpulse = 0.f;
+								}
+							}
 						}
 
 
@@ -829,7 +868,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(
 		{			
 
 			int j;
-			if (m_solverMode & SOLVER_RANDMIZE_ORDER)
+			if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
 			{
 				if ((iteration & 7) == 0) {
 					for (j=0; j<numConstraintPool; ++j) {
@@ -907,6 +946,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(
 	
 		if (infoGlobal.m_splitImpulse)
 		{
+			
 			for ( iteration = 0;iteration<infoGlobal.m_numIterations;iteration++)
 			{
 				{
@@ -946,6 +986,9 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 		btManifoldPoint* pt = (btManifoldPoint*) solveManifold.m_originalContactPoint;
 		btAssert(pt);
 		pt->m_appliedImpulse = solveManifold.m_appliedImpulse;
+		pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+		pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex+1].m_appliedImpulse;
+
 		//do a callback here?
 
 	}
@@ -989,7 +1032,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc,btDispatcher* /*dispatcher*/)
 {
 	BT_PROFILE("solveGroup");
-	if (getSolverMode() & SOLVER_CACHE_FRIENDLY)
+	if (infoGlobal.m_solverMode & SOLVER_CACHE_FRIENDLY)
 	{
 		//you need to provide at least some bodies
 		//btSimpleDynamicsWorld needs to switch off SOLVER_CACHE_FRIENDLY
@@ -1040,7 +1083,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 		for ( iteration = 0;iteration<numiter;iteration++)
 		{
 			int j;
-			if (m_solverMode & SOLVER_RANDMIZE_ORDER)
+			if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
 			{
 				if ((iteration & 7) == 0) {
 					for (j=0; j<totalPoints; ++j) {
@@ -1198,7 +1241,7 @@ void	btSequentialImpulseConstraintSolver::prepareConstraints(btPersistentManifol
 				
 
 				btScalar relaxation = info.m_damping;
-				if (m_solverMode & SOLVER_USE_WARMSTARTING)
+				if (info.m_solverMode & SOLVER_USE_WARMSTARTING)
 				{
 					cpd->m_appliedImpulse *= relaxation;
 				} else

src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h

@@ -46,20 +46,12 @@ protected:
 	ContactSolverFunc m_contactDispatch[MAX_CONTACT_SOLVER_TYPES][MAX_CONTACT_SOLVER_TYPES];
 	ContactSolverFunc m_frictionDispatch[MAX_CONTACT_SOLVER_TYPES][MAX_CONTACT_SOLVER_TYPES];
 
-	//choose between several modes, different friction model etc.
+	
-	int	m_solverMode;
 	///m_btSeed2 is used for re-arranging the constraint rows. improves convergence/quality of friction
 	unsigned long	m_btSeed2;
 
 public:
 
-	enum	eSolverMode
-	{
-		SOLVER_RANDMIZE_ORDER = 1,
-		SOLVER_FRICTION_SEPARATE = 2,
-		SOLVER_USE_WARMSTARTING = 4,
-		SOLVER_CACHE_FRIENDLY = 8
-	};
 	
 	btSequentialImpulseConstraintSolver();
 
@@ -92,15 +84,6 @@ public:
 	btScalar solveCombinedContactFriction(btRigidBody* body0,btRigidBody* body1, btManifoldPoint& cp, const btContactSolverInfo& info,int iter,btIDebugDraw* debugDrawer);
 
 
-	void	setSolverMode(int mode)
-	{
-		m_solverMode = mode;
-	}
-
-	int	getSolverMode() const
-	{
-		return m_solverMode;
-	}
 	
 	unsigned long btRand2();
 

src/BulletDynamics/ConstraintSolver/btSolverConstraint.h

@@ -1,5 +1,3 @@
-
-
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/

src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

@@ -23,7 +23,7 @@ class btOverlappingPairCache;
 class btConstraintSolver;
 class btSimulationIslandManager;
 class btTypedConstraint;
-#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+
 
 class btRaycastVehicle;
 class btIDebugDraw;
@@ -52,8 +52,6 @@ protected:
 	bool	m_ownsIslandManager;
 	bool	m_ownsConstraintSolver;
 
-	btContactSolverInfo	m_solverInfo;
-
 	
 	btAlignedObjectArray<btRaycastVehicle*>	m_vehicles;
 
@@ -140,10 +138,6 @@ public:
 
 	virtual const btTypedConstraint* getConstraint(int index) const;
 
-	btContactSolverInfo& getSolverInfo()
-	{
-		return m_solverInfo;
-	}
 	
 	virtual btDynamicsWorldType	getWorldType() const
 	{

src/BulletDynamics/Dynamics/btDynamicsWorld.h

@@ -17,11 +17,13 @@ subject to the following restrictions:
 #define BT_DYNAMICS_WORLD_H
 
 #include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+
 class btTypedConstraint;
 class btRaycastVehicle;
 class btConstraintSolver;
-
 class btDynamicsWorld;
+
 /// Type for the callback for each tick
 typedef void (*btInternalTickCallback)(const btDynamicsWorld *world, btScalar timeStep);
 
@@ -35,7 +37,13 @@ enum btDynamicsWorldType
 ///btDynamicsWorld is the baseclass for several dynamics implementation, basic, discrete, parallel, and continuous
 class btDynamicsWorld : public btCollisionWorld
 {
-	public:
+
+protected:
+			btInternalTickCallback m_internalTickCallback;
+
+			btContactSolverInfo	m_solverInfo;
+
+public:
 		
 
 		btDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphase,btCollisionConfiguration* collisionConfiguration)
@@ -90,7 +98,10 @@ class btDynamicsWorld : public btCollisionWorld
 		/// Set the callback for when an internal tick (simulation substep) happens
 		void setInternalTickCallback(btInternalTickCallback cb) { m_internalTickCallback = cb; }
 
-		btInternalTickCallback m_internalTickCallback;
+		btContactSolverInfo& getSolverInfo()
+		{
+			return m_solverInfo;
+		}
 
 
 };

src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp

@@ -20,8 +20,8 @@ subject to the following restrictions:
 
 #define ENABLE_SOFTBODY_CONCAVE_COLLISIONS 1
 
-btSoftBodyRigidBodyCollisionConfiguration::btSoftBodyRigidBodyCollisionConfiguration(btStackAlloc*	stackAlloc,btPoolAllocator*	persistentManifoldPool,btPoolAllocator*	collisionAlgorithmPool)
+btSoftBodyRigidBodyCollisionConfiguration::btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
-:btDefaultCollisionConfiguration(stackAlloc,persistentManifoldPool,collisionAlgorithmPool)
+:btDefaultCollisionConfiguration(constructionInfo)
 {
 	void* mem;
 

src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h

@@ -35,7 +35,7 @@ class	btSoftBodyRigidBodyCollisionConfiguration : public btDefaultCollisionConfi
 	
 public:
 
-	btSoftBodyRigidBodyCollisionConfiguration(btStackAlloc*	stackAlloc=0,btPoolAllocator*	persistentManifoldPool=0,btPoolAllocator*	collisionAlgorithmPool=0);
+	btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
 
 	virtual ~btSoftBodyRigidBodyCollisionConfiguration();