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

fixed 2 issues, one related to wrong 'safety' catch for large objects

Browse Source 
and COLLADA constaints didn't recognize rigid body names
This commit is contained in:
ejcoumans
2006-10-31 02:11:29 +00:00
parent 68c78eaf4b
commit 82ba30caa6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/ColladaDemo/ColladaConverter.cpp
View File

@@ -704,7 +704,7 @@ void ColladaConverter::PreparePhysicsObject(struct btRigidBodyInput& input, bool
btRigidBody* body= createRigidBody(isDynamics,mass,startTransform,colShape); btRigidBody* body= createRigidBody(isDynamics,mass,startTransform,colShape);
if (body && body->m_userObjectPointer) if (body)
{ {
//bodyName is used as identifier for constraints //bodyName is used as identifier for constraints
body->m_userObjectPointer = (void*)input.m_bodyName; body->m_userObjectPointer = (void*)input.m_bodyName;

4
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -503,7 +503,9 @@ void btDiscreteDynamicsWorld::updateAabbs()
btPoint3 minAabb,maxAabb; btPoint3 minAabb,maxAabb;
colObj->m_collisionShape->getAabb(colObj->m_worldTransform, minAabb,maxAabb); colObj->m_collisionShape->getAabb(colObj->m_worldTransform, minAabb,maxAabb);
btSimpleBroadphase* bp = (btSimpleBroadphase*)m_broadphasePairCache; btSimpleBroadphase* bp = (btSimpleBroadphase*)m_broadphasePairCache;
if ( colObj->m_collisionShape->isInfinite() || ((maxAabb-minAabb).length2() < 1e12f))
//moving objects should be moderately sized, probably something wrong if not
if ( colObj->isStaticObject() || ((maxAabb-minAabb).length2() < 1e12f))
{ {
bp->setAabb(body->m_broadphaseHandle,minAabb,maxAabb); bp->setAabb(body->m_broadphaseHandle,minAabb,maxAabb);
} else } else