From d368ef3d7193ebee40928fd0b286c85c2a1bb6c3 Mon Sep 17 00:00:00 2001 From: johnmccutchan Date: Tue, 5 Feb 2008 18:55:05 +0000 Subject: [PATCH] Remove name field and replace it with btTypedUserInfo field --- .../CollisionDispatch/btCollisionObject.cpp | 2 +- .../CollisionDispatch/btCollisionObject.h | 19 +++++++------------ .../CollisionShapes/btCollisionShape.h | 14 +++++++------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp index 43ec4e26b..704b9769e 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp @@ -26,7 +26,7 @@ btCollisionObject::btCollisionObject() m_deactivationTime(btScalar(0.)), m_friction(btScalar(0.5)), m_restitution(btScalar(0.)), - m_objectName (0), + m_typedUserInfo (NULL), m_userObjectPointer(0), m_internalOwner(0), m_hitFraction(btScalar(1.)), diff --git a/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/src/BulletCollision/CollisionDispatch/btCollisionObject.h index c5a0874ac..91e2afae9 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionObject.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -27,6 +27,7 @@ subject to the following restrictions: struct btBroadphaseProxy; class btCollisionShape; +class btTypedUserInfo; #include "LinearMath/btMotionState.h" #include "LinearMath/btAlignedAllocator.h" @@ -69,8 +70,7 @@ protected: ///m_internalOwner is reserved to point to Bullet's btRigidBody. Don't use this, use m_userObjectPointer instead. void* m_internalOwner; - // setName, getName - char* m_objectName; + btTypedUserInfo* m_typedUserInfo; ///time of impact calculation btScalar m_hitFraction; @@ -337,16 +337,14 @@ public: m_userObjectPointer = userPointer; } - char* getName () const + btTypedUserInfo* getTypedUserInfo () const { - return m_objectName; + return m_typedUserInfo; } - - /// the user is responsible for the memory management of name - void setName (char* name) + void setTypedUserInfo (btTypedUserInfo* typedUserInfo) { - m_objectName = name; + m_typedUserInfo = typedUserInfo; } inline bool checkCollideWith(btCollisionObject* co) @@ -356,9 +354,6 @@ public: return true; } - - -} -; +}; #endif //COLLISION_OBJECT_H diff --git a/src/BulletCollision/CollisionShapes/btCollisionShape.h b/src/BulletCollision/CollisionShapes/btCollisionShape.h index a2b466a60..c75babd51 100644 --- a/src/BulletCollision/CollisionShapes/btCollisionShape.h +++ b/src/BulletCollision/CollisionShapes/btCollisionShape.h @@ -16,6 +16,7 @@ subject to the following restrictions: #ifndef COLLISION_SHAPE_H #define COLLISION_SHAPE_H +class btTypedUserInfo; #include "LinearMath/btTransform.h" #include "LinearMath/btVector3.h" #include "LinearMath/btMatrix3x3.h" @@ -27,11 +28,11 @@ class btCollisionShape { void* m_userPointer; - char* m_shapeName; + btTypedUserInfo* m_typedUserInfo; public: - btCollisionShape() : m_userPointer(0), m_shapeName (0) + btCollisionShape() : m_userPointer(0), m_typedUserInfo (0) { } virtual ~btCollisionShape() @@ -104,15 +105,14 @@ public: return m_userPointer; } - char* getShapeName () const + btTypedUserInfo* getTypedUserInfo () const { - return m_shapeName; + return m_typedUserInfo; } - /// the user is responsible for the memory management of name - void setShapeName (char* name) + void setTypedUserInfo (btTypedUserInfo* typedUserInfo) { - m_shapeName = name; + m_typedUserInfo = typedUserInfo; } };