Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h

Timestamp:

Dec 13, 2008, 11:45:51 PM (16 years ago)

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (modified) (11 diffs)

code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h

@@ -30 +30 @@
 #include "LinearMath/btMotionState.h"
 #include "LinearMath/btAlignedAllocator.h"
-
+#include "LinearMath/btAlignedObjectArray.h"
+
+
+typedef btAlignedObjectArray<class btCollisionObject*> btCollisionObjectArray;
 
 
@@ -72 +75 @@
         void*                   m_userObjectPointer;
 
-        ///m_internalType is reserved to distinguish Bullet's btCollisionObject, btRigidBody, btSoftBody etc.
+        ///m_internalType is reserved to distinguish Bullet's btCollisionObject, btRigidBody, btSoftBody, btGhostObject etc.
         ///do not assign your own m_internalType unless you write a new dynamics object class.
         int                             m_internalType;
@@ -104 +107 @@
                 CF_KINEMATIC_OBJECT= 2,
                 CF_NO_CONTACT_RESPONSE = 4,
-                CF_CUSTOM_MATERIAL_CALLBACK = 8//this allows per-triangle material (friction/restitution)
+                CF_CUSTOM_MATERIAL_CALLBACK = 8,//this allows per-triangle material (friction/restitution)
+                CF_CHARACTER_OBJECT = 16
         };
 
@@ -111 +115 @@
                 CO_COLLISION_OBJECT =1,
                 CO_RIGID_BODY,
-                CO_SOFT_BODY
+                CO_SOFT_BODY,
+                ///CO_GHOST_OBJECT keeps track of all objects overlapping its AABB and that pass its collision filter
+                ///It is useful for collision sensors, explosion objects, character controller etc.
+                CO_GHOST_OBJECT
         };
 
@@ -177 +184 @@
         }
 
-        int     getActivationState() const { return m_activationState1;}
+        SIMD_FORCE_INLINE       int     getActivationState() const { return m_activationState1;}
         
         void setActivationState(int newState);
@@ -194 +201 @@
         void    activate(bool forceActivation = false);
 
-        inline bool isActive() const
+        SIMD_FORCE_INLINE bool isActive() const
         {
                 return ((getActivationState() != ISLAND_SLEEPING) && (getActivationState() != DISABLE_SIMULATION));
@@ -238 +245 @@
 
 
-        btBroadphaseProxy*      getBroadphaseHandle()
+        SIMD_FORCE_INLINE btBroadphaseProxy*    getBroadphaseHandle()
         {
                 return m_broadphaseHandle;
         }
 
-        const btBroadphaseProxy*        getBroadphaseHandle() const
+        SIMD_FORCE_INLINE const btBroadphaseProxy*      getBroadphaseHandle() const
         {
                 return m_broadphaseHandle;
@@ -289 +296 @@
         }
 
-        const int getIslandTag() const
+        SIMD_FORCE_INLINE int getIslandTag() const
         {
                 return  m_islandTag1;
@@ -299 +306 @@
         }
 
-        const int getCompanionId() const
+        SIMD_FORCE_INLINE int getCompanionId() const
         {
                 return  m_companionId;
@@ -309 +316 @@
         }
 
-        const btScalar                  getHitFraction() const
+        SIMD_FORCE_INLINE btScalar                      getHitFraction() const
         {
                 return m_hitFraction; 
@@ -320 +327 @@
 
         
-        const int       getCollisionFlags() const
+        SIMD_FORCE_INLINE int   getCollisionFlags() const
         {
                 return m_collisionFlags;