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

Remove name field and replace it with btTypedUserInfo field

Browse Source
This commit is contained in:
johnmccutchan
2008-02-05 18:55:05 +00:00
parent 7be6c98c60
commit d368ef3d71
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
View File

@@ -26,7 +26,7 @@ btCollisionObject::btCollisionObject()
m_deactivationTime(btScalar(0.)), m_deactivationTime(btScalar(0.)),
m_friction(btScalar(0.5)), m_friction(btScalar(0.5)),
m_restitution(btScalar(0.)), m_restitution(btScalar(0.)),
m_objectName (0), m_typedUserInfo (NULL),
m_userObjectPointer(0), m_userObjectPointer(0),
m_internalOwner(0), m_internalOwner(0),
m_hitFraction(btScalar(1.)), m_hitFraction(btScalar(1.)),

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

@@ -27,6 +27,7 @@ subject to the following restrictions:
struct btBroadphaseProxy; struct btBroadphaseProxy;
class btCollisionShape; class btCollisionShape;
class btTypedUserInfo;
#include "LinearMath/btMotionState.h" #include "LinearMath/btMotionState.h"
#include "LinearMath/btAlignedAllocator.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. ///m_internalOwner is reserved to point to Bullet's btRigidBody. Don't use this, use m_userObjectPointer instead.
void* m_internalOwner; void* m_internalOwner;
// setName, getName btTypedUserInfo* m_typedUserInfo;
char* m_objectName;
///time of impact calculation ///time of impact calculation
btScalar m_hitFraction; btScalar m_hitFraction;
@@ -337,16 +337,14 @@ public:
m_userObjectPointer = userPointer; m_userObjectPointer = userPointer;
} }
char* getName () const btTypedUserInfo* getTypedUserInfo () const
{ {
return m_objectName; return m_typedUserInfo;
} }
void setTypedUserInfo (btTypedUserInfo* typedUserInfo)
/// the user is responsible for the memory management of name
void setName (char* name)
{ {
m_objectName = name; m_typedUserInfo = typedUserInfo;
} }
inline bool checkCollideWith(btCollisionObject* co) inline bool checkCollideWith(btCollisionObject* co)
@@ -356,9 +354,6 @@ public:
return true; return true;
} }
};
}
;
#endif //COLLISION_OBJECT_H #endif //COLLISION_OBJECT_H

14
src/BulletCollision/CollisionShapes/btCollisionShape.h
View File

@@ -16,6 +16,7 @@ subject to the following restrictions:
#ifndef COLLISION_SHAPE_H #ifndef COLLISION_SHAPE_H
#define COLLISION_SHAPE_H #define COLLISION_SHAPE_H
class btTypedUserInfo;
#include "LinearMath/btTransform.h" #include "LinearMath/btTransform.h"
#include "LinearMath/btVector3.h" #include "LinearMath/btVector3.h"
#include "LinearMath/btMatrix3x3.h" #include "LinearMath/btMatrix3x3.h"
@@ -27,11 +28,11 @@ class btCollisionShape
{ {
void* m_userPointer; void* m_userPointer;
char* m_shapeName; btTypedUserInfo* m_typedUserInfo;
public: public:
btCollisionShape() : m_userPointer(0), m_shapeName (0) btCollisionShape() : m_userPointer(0), m_typedUserInfo (0)
{ {
} }
virtual ~btCollisionShape() virtual ~btCollisionShape()
@@ -104,15 +105,14 @@ public:
return m_userPointer; 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 setTypedUserInfo (btTypedUserInfo* typedUserInfo)
void setShapeName (char* name)
{ {
m_shapeName = name; m_typedUserInfo = typedUserInfo;
} }
}; };