From 39d929cbb0ae52aa93ea99d66984f6d297c305b3 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sat, 5 Apr 2008 01:58:38 +0000 Subject: [PATCH] removed btTypedUserInfo again, added getUid to btTypedConstraint --- .../ConstraintSolver/btTypedConstraint.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h index 055f4906e..216dc0b61 100644 --- a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h @@ -17,7 +17,6 @@ subject to the following restrictions: #define TYPED_CONSTRAINT_H class btRigidBody; -class btTypedUserInfo; #include "LinearMath/btScalar.h" enum btTypedConstraintType @@ -35,7 +34,6 @@ class btTypedConstraint { int m_userConstraintType; int m_userConstraintId; - btTypedUserInfo* m_typedUserInfo; btTypedConstraintType m_constraintType; @@ -101,6 +99,12 @@ public: { return m_userConstraintId; } + + int getUid() const + { + return m_userConstraintId; + } + btScalar getAppliedImpulse() const { return m_appliedImpulse; @@ -111,15 +115,6 @@ public: return m_constraintType; } - btTypedUserInfo* getTypedUserInfo () const - { - return m_typedUserInfo; - } - - void setTypedUserInfo (btTypedUserInfo* typedUserInfo) - { - m_typedUserInfo = typedUserInfo; - } }; #endif //TYPED_CONSTRAINT_H