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

enabled the vehicle demo again (still needs lots of tuning before it drives well)

Browse Source 
fixed some warnings
This commit is contained in:
ejcoumans
2006-10-29 03:36:16 +00:00
parent caca3a1ca2
commit d6c6cbaee6
16 changed files with 179 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletCollision/CollisionDispatch/btCollisionObject.h
View File

@@ -79,26 +79,26 @@ struct btCollisionObject
inline bool mergesSimulationIslands() const
{
///static objects, kinematic and object without contact response don't merge islands
return !(m_collisionFlags & (CF_STATIC_OBJECT | CF_KINEMATIC_OJBECT | CF_NO_CONTACT_RESPONSE) );
return ((m_collisionFlags & (CF_STATIC_OBJECT | CF_KINEMATIC_OJBECT | CF_NO_CONTACT_RESPONSE) )==0);
}
inline bool isStaticObject() const {
return m_collisionFlags & CF_STATIC_OBJECT;
return (m_collisionFlags & CF_STATIC_OBJECT) != 0;
}
inline bool isKinematicObject() const
{
return m_collisionFlags & CF_KINEMATIC_OJBECT;
return (m_collisionFlags & CF_KINEMATIC_OJBECT) != 0;
}
inline bool isStaticOrKinematicObject() const
{
return m_collisionFlags & (CF_KINEMATIC_OJBECT | CF_STATIC_OBJECT);
return (m_collisionFlags & (CF_KINEMATIC_OJBECT | CF_STATIC_OBJECT)) != 0 ;
}
inline bool hasContactResponse() const {
return !(m_collisionFlags & CF_NO_CONTACT_RESPONSE);
return (m_collisionFlags & CF_NO_CONTACT_RESPONSE)==0;
}