Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2017-06-03 08:16:59 -07:00
parent 1d1c822d52 861766f1d5
commit ff695dd328
78 changed files with 356 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bullet3Common/b3Quaternion.h
View File

@@ -901,6 +901,7 @@ b3ShortestArcQuat(const b3Vector3& v0, const b3Vector3& v1) // Game Programming
b3Scalar rs = 1.0f / s;
return b3Quaternion(c.getX()*rs,c.getY()*rs,c.getZ()*rs,s * 0.5f);
}
B3_FORCE_INLINE b3Quaternion

4
src/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp
View File

@@ -66,7 +66,7 @@ btPersistentManifold* btCollisionDispatcherMt::getNewManifold( const btCollision
{
// batch updater will update manifold pointers array after finishing, so
// only need to update array when not batch-updating
btAssert( !btThreadsAreRunning() );
//btAssert( !btThreadsAreRunning() );
manifold->m_index1a = m_manifoldsPtr.size();
m_manifoldsPtr.push_back( manifold );
}
@@ -77,7 +77,7 @@ btPersistentManifold* btCollisionDispatcherMt::getNewManifold( const btCollision
void btCollisionDispatcherMt::releaseManifold( btPersistentManifold* manifold )
{
clearManifold( manifold );
btAssert( !btThreadsAreRunning() );
//btAssert( !btThreadsAreRunning() );
if ( !m_batchUpdating )
{
// batch updater will update manifold pointers array after finishing, so