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

more soft body preparations, moved some parts from Demo/SoftBody to src/BulletDynamics/SoftBody

Browse Source 
moved Extras/ConvexHull/btConvexHull.* to src/LinearMath/btConvexHull.*
removed btCollisionObject::m_internalOwner, replaced it by m_internalType. This should not affect external API (it was clearly marked as internal)
This commit is contained in:
erwin.coumans
2008-04-10 20:00:41 +00:00
parent 03d846add0
commit 1139c06a4d
36 changed files with 3316 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletDynamics/Dynamics/btRigidBody.h
View File

@@ -160,11 +160,15 @@ public:
///but a rigidbody is derived from btCollisionObject, so we can safely perform an upcast
static const btRigidBody* upcast(const btCollisionObject* colObj)
{
return (const btRigidBody*)colObj->getInternalOwner();
if (colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY)
return (const btRigidBody*)colObj;
return 0;
}
static btRigidBody* upcast(btCollisionObject* colObj)
{
return (btRigidBody*)colObj->getInternalOwner();
if (colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY)
return (btRigidBody*)colObj;
return 0;
}
/// continuous collision detection needs prediction