Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

Timestamp:

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

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) (12 diffs)

code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

@@ -18 +18 @@
 
 #include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
+#include "LinearMath/btVector3.h"
 #include "LinearMath/btAlignedAllocator.h"
 
@@ -24 +25 @@
 /// IMPORTANT NOTE:The types are ordered polyhedral, implicit convex and concave
 /// to facilitate type checking
+/// CUSTOM_POLYHEDRAL_SHAPE_TYPE,CUSTOM_CONVEX_SHAPE_TYPE and CUSTOM_CONCAVE_SHAPE_TYPE can be used to extend Bullet without modifying source code
 enum BroadphaseNativeTypes
 {
@@ -33 +35 @@
         CONVEX_HULL_SHAPE_PROXYTYPE,
         CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE,
+        CUSTOM_POLYHEDRAL_SHAPE_TYPE,
 //implicit convex shapes
 IMPLICIT_CONVEX_SHAPES_START_HERE,
@@ -44 +47 @@
         MINKOWSKI_SUM_SHAPE_PROXYTYPE,
         MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE,
+        CUSTOM_CONVEX_SHAPE_TYPE,
 //concave shapes
 CONCAVE_SHAPES_START_HERE,
@@ -60 +64 @@
         EMPTY_SHAPE_PROXYTYPE,
         STATIC_PLANE_PROXYTYPE,
+        CUSTOM_CONCAVE_SHAPE_TYPE,
 CONCAVE_SHAPES_END_HERE,
 
@@ -88 +93 @@
                 DebrisFilter = 8,
                         SensorTrigger = 16,
+                        CharacterFilter = 32,
                 AllFilter = -1 //all bits sets: DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger
         };
@@ -93 +99 @@
         //Usually the client btCollisionObject or Rigidbody class
         void*   m_clientObject;
-
         short int m_collisionFilterGroup;
         short int m_collisionFilterMask;
-
         void*   m_multiSapParentProxy;          
-
-
         int                     m_uniqueId;//m_uniqueId is introduced for paircache. could get rid of this, by calculating the address offset etc.
+
+        btVector3       m_aabbMin;
+        btVector3       m_aabbMax;
 
         SIMD_FORCE_INLINE int getUid() const
@@ -112 +117 @@
         }
 
-        btBroadphaseProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0)
+        btBroadphaseProxy(const btVector3& aabbMin,const btVector3& aabbMax,void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0)
                 :m_clientObject(userPtr),
                 m_collisionFilterGroup(collisionFilterGroup),
-                m_collisionFilterMask(collisionFilterMask)
+                m_collisionFilterMask(collisionFilterMask),
+                m_aabbMin(aabbMin),
+                m_aabbMax(aabbMax)
         {
                 m_multiSapParentProxy = multiSapParentProxy;
@@ -164 +171 @@
                 m_pProxy1(0),
                 m_algorithm(0),
-                m_userInfo(0)
+                m_internalInfo1(0)
         {
         }
@@ -174 +181 @@
                                 m_pProxy1(other.m_pProxy1),
                                 m_algorithm(other.m_algorithm),
-                                m_userInfo(other.m_userInfo)
+                                m_internalInfo1(other.m_internalInfo1)
         {
         }
@@ -193 +200 @@
 
                 m_algorithm = 0;
-                m_userInfo = 0;
+                m_internalInfo1 = 0;
 
         }
@@ -201 +208 @@
         
         mutable btCollisionAlgorithm* m_algorithm;
-        mutable void* m_userInfo;
+        union { void* m_internalInfo1; int m_internalTmpValue;};//don't use this data, it will be removed in future version.
 
 };