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

removed btTypedUserInfo again, added getUid to btTypedConstraint

Browse Source
This commit is contained in:
erwin.coumans
2008-04-05 01:58:38 +00:00
parent 99d248ddfd
commit 39d929cbb0
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
View File

@@ -17,7 +17,6 @@ subject to the following restrictions:
#define TYPED_CONSTRAINT_H #define TYPED_CONSTRAINT_H
class btRigidBody; class btRigidBody;
class btTypedUserInfo;
#include "LinearMath/btScalar.h" #include "LinearMath/btScalar.h"
enum btTypedConstraintType enum btTypedConstraintType
@@ -35,7 +34,6 @@ class btTypedConstraint
{ {
int m_userConstraintType; int m_userConstraintType;
int m_userConstraintId; int m_userConstraintId;
btTypedUserInfo* m_typedUserInfo;
btTypedConstraintType m_constraintType; btTypedConstraintType m_constraintType;
@@ -101,6 +99,12 @@ public:
{ {
return m_userConstraintId; return m_userConstraintId;
} }
int getUid() const
{
return m_userConstraintId;
}
btScalar getAppliedImpulse() const btScalar getAppliedImpulse() const
{ {
return m_appliedImpulse; return m_appliedImpulse;
@@ -111,15 +115,6 @@ public:
return m_constraintType; return m_constraintType;
} }
btTypedUserInfo* getTypedUserInfo () const
{
return m_typedUserInfo;
}
void setTypedUserInfo (btTypedUserInfo* typedUserInfo)
{
m_typedUserInfo = typedUserInfo;
}
}; };
#endif //TYPED_CONSTRAINT_H #endif //TYPED_CONSTRAINT_H