updated Bullet sequential impulse constraint solver, so it matches 100% ODE PGS quickstep solver innerloop, mainly by renaming variables...

This commit is contained in:
erwin.coumans
2008-11-26 00:27:35 +00:00
parent 09aa2dbbe7
commit 82047e601e
28 changed files with 646 additions and 1135 deletions

View File

@@ -143,7 +143,7 @@ btDemoEntry g_demoEntries[] =
{"SoftBody Cluster Stack Mixed",SoftDemo27::Create},
// {"SliderConstraint",SliderConstraintDemo::Create},
// {"CcdPhysicsDemo", CcdPhysicsDemo::Create},
{"CcdPhysicsDemo", CcdPhysicsDemo::Create},
// {"ConcaveRaycastDemo",ConcaveRaycastDemo::Create},
//{"BspDemo", BspDemo::Create},
// {"Raytracer Test",Raytracer::Create},

View File

@@ -71,7 +71,7 @@ void setDefaultSettings()
{
viewX = 0.0f;
viewY = 0.0f;
framePeriod = 1;//16;//16;//todo: test if this value should be 0
framePeriod = 6;//16;//16;//todo: test if this value should be 0
width = 800;//640;
height = 600;//1024;//480;
@@ -87,8 +87,8 @@ void setDefaultSettings()
gUseSplitImpulse = 0;
gUseWarmstarting = 1;
gRandomizeConstraints = 1;
gErp = 0.2f;
gSlop=0.01f;
gErp = 0.4f;
gSlop=0.0f;
gErp2 = 0.1f;
gWarmStartingParameter = 0.85f;

View File

@@ -13,6 +13,7 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
*/
///create 125 (5x5x5) dynamic object
#define ARRAY_SIZE_X 5
#define ARRAY_SIZE_Y 5

View File

@@ -192,7 +192,7 @@ extern btScalar gJitterVelocityDampingFactor;
extern int gNumManifold;
extern int gOverlappingPairs;
extern int gTotalContactPoints;
void CcdPhysicsDemo::clientMoveAndDisplay()
{
@@ -282,10 +282,10 @@ void CcdPhysicsDemo::clientMoveAndDisplay()
#ifdef PRINT_CONTACT_STATISTICS
printf("num manifolds: %i\n",gNumManifold);
printf("num gOverlappingPairs: %i\n",gOverlappingPairs);
printf("num gTotalContactPoints : %i\n",gTotalContactPoints );
#endif //PRINT_CONTACT_STATISTICS
gTotalContactPoints = 0;
glutSwapBuffers();
}

View File

@@ -133,7 +133,7 @@ extern btScalar gJitterVelocityDampingFactor;
extern int gNumManifold;
extern int gOverlappingPairs;
extern int gTotalContactPoints;
void MultiThreadedDemo::clientMoveAndDisplay()
{
@@ -201,7 +201,7 @@ void MultiThreadedDemo::clientMoveAndDisplay()
#endif
glFlush();
gTotalContactPoints = 0;
glutSwapBuffers();
}

View File

@@ -97,7 +97,7 @@ void SoftDemo::createStack( btCollisionShape* boxShape, float halfCubeSize, int
extern int gNumManifold;
extern int gOverlappingPairs;
extern int gTotalContactPoints;
void SoftDemo::clientMoveAndDisplay()
{
@@ -200,10 +200,10 @@ void SoftDemo::clientMoveAndDisplay()
#ifdef PRINT_CONTACT_STATISTICS
printf("num manifolds: %i\n",gNumManifold);
printf("num gOverlappingPairs: %i\n",gOverlappingPairs);
printf("num gTotalContactPoints : %i\n",gTotalContactPoints );
#endif //PRINT_CONTACT_STATISTICS
gTotalContactPoints = 0;
glutSwapBuffers();
}