Fixes 07 (#97)
#84 #82 Added B3_RESTITUTION_ITERATIONS to override restitution iterations. Fix regression in hull stacking stability.
This commit is contained in:
parent
dfa5e6add0
commit
23861418d8
27 changed files with 877 additions and 448 deletions
|
|
@ -210,7 +210,7 @@ public:
|
|||
bodyDef.name = "cube";
|
||||
bodyDef.type = b3_dynamicBody;
|
||||
bodyDef.position = { 0.0f, 0.5f, 0.0f };
|
||||
//bodyDef.angularVelocity = { 0.0f, 10.0f, 0.0f };
|
||||
// bodyDef.angularVelocity = { 0.0f, 10.0f, 0.0f };
|
||||
m_bodyId = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
b3ShapeDef shapeDef = b3DefaultShapeDef();
|
||||
|
|
@ -409,7 +409,7 @@ public:
|
|||
{
|
||||
if ( m_context->restart == false )
|
||||
{
|
||||
m_camera->SetView( 35.0f, 15.0f, 30.0f, { 0.0f, 10.0f, 0.0f } );
|
||||
m_camera->SetView( 35.0f, 15.0f, 12.0f, { 0.0f, 2.0f, 0.0f } );
|
||||
}
|
||||
|
||||
m_shapeType = b3_hullShape;
|
||||
|
|
@ -418,42 +418,43 @@ public:
|
|||
|
||||
void CreateStack()
|
||||
{
|
||||
AddGroundBox( 60.0f );
|
||||
AddGroundBox( 20.0f );
|
||||
|
||||
b3ShapeDef shapeDef = b3DefaultShapeDef();
|
||||
shapeDef.baseMaterial.rollingResistance = m_shapeType == b3_capsuleShape ? 0.1f : 0.05f;
|
||||
b3BodyDef bodyDef = b3DefaultBodyDef();
|
||||
bodyDef.type = b3_dynamicBody;
|
||||
|
||||
float h = 1.0f;
|
||||
float r = 0.1f;
|
||||
|
||||
b3BoxHull box = b3MakeBoxHull( h, r, r );
|
||||
b3Capsule capsule = { { -h, 0.0f, 0.0f }, { h, 0.0f, 0.0f }, r };
|
||||
int count = 30;
|
||||
for ( int i = 0; i < count; ++i )
|
||||
{
|
||||
b3ShapeDef shapeDef = b3DefaultShapeDef();
|
||||
shapeDef.baseMaterial.rollingResistance = m_shapeType == b3_capsuleShape ? 0.1f : 0.01f;
|
||||
b3BodyDef bodyDef = b3DefaultBodyDef();
|
||||
bodyDef.type = b3_dynamicBody;
|
||||
float alpha = ( i & 1 ) == 1 ? 0.0f : 0.5f * B3_PI;
|
||||
|
||||
b3BoxHull box = b3MakeBoxHull( 2.5f, 0.25f, 0.25f );
|
||||
b3Capsule capsule = { { -2.5f, 0.0f, 0.0f }, { 2.5f, 0.0f, 0.0f }, 0.25f };
|
||||
float x = ( i & 1 ) == 0 ? h - 2.0f * r : 0.0f;
|
||||
float z = ( i & 1 ) == 0 ? 0.0f : h - 2.0f * r;
|
||||
|
||||
for ( int i = 0; i < m_size; ++i )
|
||||
bodyDef.position = { x, ( 2.1f * i + 0.5f ) * r, z };
|
||||
bodyDef.rotation = b3MakeQuatFromAxisAngle( b3Vec3_axisY, alpha );
|
||||
b3BodyId boxBody1 = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
bodyDef.position = { -x, ( 2.1f * i + 0.5f ) * r, -z };
|
||||
bodyDef.rotation = b3MakeQuatFromAxisAngle( b3Vec3_axisY, alpha );
|
||||
b3BodyId boxBody2 = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
if ( m_shapeType == b3_capsuleShape )
|
||||
{
|
||||
float alpha = ( i & 1 ) == 1 ? 0.0f : 0.5f * B3_PI;
|
||||
|
||||
float x = ( i & 1 ) == 0 ? 1.75f : 0.0f;
|
||||
float z = ( i & 1 ) == 0 ? 0.0f : 1.75f;
|
||||
|
||||
bodyDef.position = { x, 0.5f * i + 0.25f, z };
|
||||
bodyDef.rotation = b3MakeQuatFromAxisAngle( b3Vec3_axisY, alpha );
|
||||
b3BodyId boxBody1 = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
bodyDef.position = { -x, 0.5f * i + 0.25f, -z };
|
||||
bodyDef.rotation = b3MakeQuatFromAxisAngle( b3Vec3_axisY, alpha );
|
||||
b3BodyId boxBody2 = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
if ( m_shapeType == b3_capsuleShape )
|
||||
{
|
||||
b3CreateCapsuleShape( boxBody1, &shapeDef, &capsule );
|
||||
b3CreateCapsuleShape( boxBody2, &shapeDef, &capsule );
|
||||
}
|
||||
else
|
||||
{
|
||||
b3CreateHullShape( boxBody1, &shapeDef, &box.base );
|
||||
b3CreateHullShape( boxBody2, &shapeDef, &box.base );
|
||||
}
|
||||
b3CreateCapsuleShape( boxBody1, &shapeDef, &capsule );
|
||||
b3CreateCapsuleShape( boxBody2, &shapeDef, &capsule );
|
||||
}
|
||||
else
|
||||
{
|
||||
b3CreateHullShape( boxBody1, &shapeDef, &box.base );
|
||||
b3CreateHullShape( boxBody2, &shapeDef, &box.base );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -484,7 +485,6 @@ public:
|
|||
return new JengaStack( context );
|
||||
}
|
||||
|
||||
static constexpr int m_size = 40;
|
||||
b3ShapeType m_shapeType;
|
||||
};
|
||||
|
||||
|
|
@ -811,7 +811,7 @@ public:
|
|||
{
|
||||
if ( m_context->restart == false )
|
||||
{
|
||||
m_camera->SetView( 0.0f, 30.0f, 50.0f, { 0.0f, 5.0f, 0.0f } );
|
||||
m_camera->SetView( 40.0f, 15.0f, 50.0f, { 0.0f, 12.0f, 0.0f } );
|
||||
}
|
||||
|
||||
AddGroundBox( 40.0f );
|
||||
|
|
@ -847,3 +847,93 @@ public:
|
|||
};
|
||||
|
||||
static int samplePyramid2D = RegisterSample( "Stacking", "Pyramid2D", Pyramid2D::Create );
|
||||
|
||||
// This stresses the edge-edge handling.
|
||||
class EdgeCrossing : public Sample
|
||||
{
|
||||
public:
|
||||
explicit EdgeCrossing( SampleContext* context )
|
||||
: Sample( context )
|
||||
{
|
||||
if ( context->restart == false )
|
||||
{
|
||||
m_camera->SetView( 0.0f, 25.0f, 10.0f, b3Pos_zero );
|
||||
}
|
||||
|
||||
AddGroundBox( 40.0f );
|
||||
|
||||
b3Vec3 h = { 0.2f, 0.02f, 0.04f };
|
||||
b3BodyDef bodyDef = b3DefaultBodyDef();
|
||||
bodyDef.type = b3_dynamicBody;
|
||||
|
||||
b3ShapeDef shapeDef = b3DefaultShapeDef();
|
||||
|
||||
bodyDef.position.x = -10.0f;
|
||||
bodyDef.position.z = -2.0f;
|
||||
|
||||
b3BoxHull box1 = b3MakeBoxHull( h.x, h.y, h.z );
|
||||
b3BoxHull box2 = b3MakeBoxHull( h.x, h.z, h.y );
|
||||
|
||||
b3Vec3 axis = b3Normalize( { 0.1f, 0.9f, 0.0f } );
|
||||
for ( float angle = -B3_PI; angle < B3_PI + 0.001f; angle += 0.1f * B3_PI )
|
||||
{
|
||||
bodyDef.position.y = h.y;
|
||||
bodyDef.rotation = b3Quat_identity;
|
||||
b3BodyId bodyId1 = b3CreateBody( m_worldId, &bodyDef );
|
||||
b3CreateHullShape( bodyId1, &shapeDef, &box1.base );
|
||||
|
||||
bodyDef.position.y = 20.0f * h.y;
|
||||
bodyDef.rotation = b3MakeQuatFromAxisAngle( axis, angle );
|
||||
b3BodyId boxBody2 = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
b3CreateHullShape( boxBody2, &shapeDef, &box1.base );
|
||||
|
||||
bodyDef.position.x += 1.0f;
|
||||
}
|
||||
|
||||
bodyDef.position.x = -10.0f;
|
||||
bodyDef.position.z = 0.0f;
|
||||
|
||||
for ( float angle = -B3_PI; angle < B3_PI + 0.001f; angle += 0.1f * B3_PI )
|
||||
{
|
||||
bodyDef.position.y = h.z;
|
||||
bodyDef.rotation = b3Quat_identity;
|
||||
b3BodyId bodyId1 = b3CreateBody( m_worldId, &bodyDef );
|
||||
b3CreateHullShape( bodyId1, &shapeDef, &box2.base );
|
||||
|
||||
bodyDef.position.y = 20.0f * h.z;
|
||||
bodyDef.rotation = b3MakeQuatFromAxisAngle( axis, angle );
|
||||
b3BodyId boxBody2 = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
b3CreateHullShape( boxBody2, &shapeDef, &box2.base );
|
||||
|
||||
bodyDef.position.x += 1.0f;
|
||||
}
|
||||
|
||||
bodyDef.position.x = -10.0f;
|
||||
bodyDef.position.z = 2.0f;
|
||||
|
||||
for ( float angle = -B3_PI; angle < B3_PI + 0.001f; angle += 0.1f * B3_PI )
|
||||
{
|
||||
bodyDef.position.y = h.y;
|
||||
bodyDef.rotation = b3Quat_identity;
|
||||
b3BodyId bodyId1 = b3CreateBody( m_worldId, &bodyDef );
|
||||
b3CreateHullShape( bodyId1, &shapeDef, &box1.base );
|
||||
|
||||
bodyDef.position.y = 20.0f * h.y;
|
||||
bodyDef.rotation = b3MakeQuatFromAxisAngle( axis, angle );
|
||||
b3BodyId boxBody2 = b3CreateBody( m_worldId, &bodyDef );
|
||||
|
||||
b3CreateHullShape( boxBody2, &shapeDef, &box2.base );
|
||||
|
||||
bodyDef.position.x += 1.0f;
|
||||
}
|
||||
}
|
||||
|
||||
static Sample* Create( SampleContext* context )
|
||||
{
|
||||
return new EdgeCrossing( context );
|
||||
}
|
||||
};
|
||||
|
||||
static int sampleEdgeCrossing = RegisterSample( "Stacking", "Edge Crossing", EdgeCrossing::Create );
|
||||
|
|
|
|||
Loading…
Reference in a new issue