Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
- Timestamp:
- Dec 13, 2008, 11:45:51 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
r2192 r2430 18 18 19 19 #include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE 20 #include "LinearMath/btVector3.h" 20 21 #include "LinearMath/btAlignedAllocator.h" 21 22 … … 24 25 /// IMPORTANT NOTE:The types are ordered polyhedral, implicit convex and concave 25 26 /// to facilitate type checking 27 /// CUSTOM_POLYHEDRAL_SHAPE_TYPE,CUSTOM_CONVEX_SHAPE_TYPE and CUSTOM_CONCAVE_SHAPE_TYPE can be used to extend Bullet without modifying source code 26 28 enum BroadphaseNativeTypes 27 29 { … … 33 35 CONVEX_HULL_SHAPE_PROXYTYPE, 34 36 CONVEX_POINT_CLOUD_SHAPE_PROXYTYPE, 37 CUSTOM_POLYHEDRAL_SHAPE_TYPE, 35 38 //implicit convex shapes 36 39 IMPLICIT_CONVEX_SHAPES_START_HERE, … … 44 47 MINKOWSKI_SUM_SHAPE_PROXYTYPE, 45 48 MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE, 49 CUSTOM_CONVEX_SHAPE_TYPE, 46 50 //concave shapes 47 51 CONCAVE_SHAPES_START_HERE, … … 60 64 EMPTY_SHAPE_PROXYTYPE, 61 65 STATIC_PLANE_PROXYTYPE, 66 CUSTOM_CONCAVE_SHAPE_TYPE, 62 67 CONCAVE_SHAPES_END_HERE, 63 68 … … 88 93 DebrisFilter = 8, 89 94 SensorTrigger = 16, 95 CharacterFilter = 32, 90 96 AllFilter = -1 //all bits sets: DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger 91 97 }; … … 93 99 //Usually the client btCollisionObject or Rigidbody class 94 100 void* m_clientObject; 95 96 101 short int m_collisionFilterGroup; 97 102 short int m_collisionFilterMask; 98 99 103 void* m_multiSapParentProxy; 100 101 102 104 int m_uniqueId;//m_uniqueId is introduced for paircache. could get rid of this, by calculating the address offset etc. 105 106 btVector3 m_aabbMin; 107 btVector3 m_aabbMax; 103 108 104 109 SIMD_FORCE_INLINE int getUid() const … … 112 117 } 113 118 114 btBroadphaseProxy( void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0)119 btBroadphaseProxy(const btVector3& aabbMin,const btVector3& aabbMax,void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0) 115 120 :m_clientObject(userPtr), 116 121 m_collisionFilterGroup(collisionFilterGroup), 117 m_collisionFilterMask(collisionFilterMask) 122 m_collisionFilterMask(collisionFilterMask), 123 m_aabbMin(aabbMin), 124 m_aabbMax(aabbMax) 118 125 { 119 126 m_multiSapParentProxy = multiSapParentProxy; … … 164 171 m_pProxy1(0), 165 172 m_algorithm(0), 166 m_ userInfo(0)173 m_internalInfo1(0) 167 174 { 168 175 } … … 174 181 m_pProxy1(other.m_pProxy1), 175 182 m_algorithm(other.m_algorithm), 176 m_ userInfo(other.m_userInfo)183 m_internalInfo1(other.m_internalInfo1) 177 184 { 178 185 } … … 193 200 194 201 m_algorithm = 0; 195 m_ userInfo= 0;202 m_internalInfo1 = 0; 196 203 197 204 } … … 201 208 202 209 mutable btCollisionAlgorithm* m_algorithm; 203 mutable void* m_userInfo;210 union { void* m_internalInfo1; int m_internalTmpValue;};//don't use this data, it will be removed in future version. 204 211 205 212 };
Note: See TracChangeset
for help on using the changeset viewer.