fix saddle tunnel
This commit is contained in:
parent
5986b5b565
commit
a2adbafec0
6 changed files with 1569 additions and 1126 deletions
|
|
@ -1,9 +1,9 @@
|
|||
filter,base,generations,shape,tunnels,awake,depth4,depth8,depth16,depth32
|
||||
all,12345,1000,box,0,0,1539,220,4,0
|
||||
all,12345,1000,box,0,0,1538,220,3,0
|
||||
all,12345,1000,capsule,0,0,14507,3488,28,0
|
||||
all,12345,1000,cylinder,0,0,11211,2354,37,0
|
||||
all,12345,1000,cylinder,0,0,11210,2353,37,0
|
||||
all,12345,1000,sphere,0,0,56,0,0,0
|
||||
all,12345,16000,box,0,0,23679,3193,45,0
|
||||
all,12345,16000,capsule,0,0,231497,54551,515,0
|
||||
all,12345,16000,cylinder,0,0,178988,37442,480,0
|
||||
all,12345,16000,box,0,0,23676,3191,44,0
|
||||
all,12345,16000,capsule,0,0,231496,54552,515,0
|
||||
all,12345,16000,cylinder,0,0,178981,37441,480,0
|
||||
all,12345,16000,sphere,0,0,987,0,0,0
|
||||
|
|
|
|||
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -3212,7 +3212,7 @@ int b3Hull2D( b3Point2D* pts, int count, b3Point2D* hull, int flags )
|
|||
}
|
||||
else
|
||||
{
|
||||
b3Weld2D( pts, count );
|
||||
count1 = b3Weld2D( pts, count );
|
||||
}
|
||||
|
||||
bool keepCollinear = ( flags & b3_hull2DKeepCollinear ) != 0;
|
||||
|
|
|
|||
|
|
@ -759,19 +759,19 @@ static b3NeighborResult b3TestNeighbors( const b3Shape* shape, int triangleIndex
|
|||
return b3IsInVertexRegion( vertices, vertexIndex, normal ) ? b3_neighborSkip : b3_neighborSnap;
|
||||
}
|
||||
|
||||
// Check vertex area first to avoid a saddle tunnel.
|
||||
if ( vertexIndex != B3_NULL_INDEX && b3IsInVertexRegion( vertices, vertexIndex, normal ) &&
|
||||
b3IsInVertexCone( shape, triangleIndex, vertexIndex, meshToLocal, normal ) )
|
||||
{
|
||||
return b3_neighborAdmit;
|
||||
}
|
||||
|
||||
if ( convex )
|
||||
{
|
||||
// todo comment
|
||||
return *ownerEdge == B3_NULL_INDEX ? b3_neighborDrop : b3_neighborSkip;
|
||||
}
|
||||
|
||||
// Check vertex.
|
||||
if ( vertexIndex != B3_NULL_INDEX &&
|
||||
b3AdmitsVertexNormal( shape, triangleIndex, vertices, vertexIndex, meshToLocal, normal ) )
|
||||
{
|
||||
return b3_neighborAdmit;
|
||||
}
|
||||
|
||||
return b3_neighborSnap;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,25 +21,25 @@
|
|||
#if defined( BOX3D_DOUBLE_PRECISION )
|
||||
#define RAGDOLL_SLEEP_STEP 282
|
||||
#define RAGDOLL_HASH 0x6E4B13AD
|
||||
#define WAVE_PILE_SLEEP_STEP 291
|
||||
#define WAVE_PILE_HASH 0x1D5475C3
|
||||
#define WAVE_PILE_SLEEP_STEP 290
|
||||
#define WAVE_PILE_HASH 0x86682E98
|
||||
#define QUERY_SPAWN_SLEEP_STEP 242
|
||||
#define QUERY_SPAWN_HASH 0x489585E6
|
||||
#define QUERY_SPAWN_HIT_COUNT 59
|
||||
#define QUERY_SPAWN_QUERY_HASH 0x5B4429DC
|
||||
#define MESH_DROP_SLEEP_STEP 197
|
||||
#define MESH_DROP_HASH 0xE9BD8B61
|
||||
#define MESH_DROP_HASH 0x71517836
|
||||
#else
|
||||
#define RAGDOLL_SLEEP_STEP 277
|
||||
#define RAGDOLL_HASH 0x45E77CAA
|
||||
#define RAGDOLL_HASH 0x5E042B6E
|
||||
#define WAVE_PILE_SLEEP_STEP 290
|
||||
#define WAVE_PILE_HASH 0x9E66034A
|
||||
#define WAVE_PILE_HASH 0x889A0741
|
||||
#define QUERY_SPAWN_SLEEP_STEP 242
|
||||
#define QUERY_SPAWN_HASH 0xF3AD9BA6
|
||||
#define QUERY_SPAWN_HIT_COUNT 59
|
||||
#define QUERY_SPAWN_QUERY_HASH 0xE3271F3D
|
||||
#define MESH_DROP_SLEEP_STEP 197
|
||||
#define MESH_DROP_HASH 0xBF720313
|
||||
#define MESH_DROP_HASH 0xCB94D984
|
||||
#endif
|
||||
|
||||
// The goldens above pin exact values for the default four point manifold. A build that
|
||||
|
|
|
|||
Loading…
Reference in a new issue