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

Made the move from sourceforge to googlecode (no svn sync any longer)

Browse Source 
Fixed BulletColladaConverter load/save
Removed btTypedUserInfo
Added btHashMap
Fixed btCapsuleShape
This commit is contained in:
erwin.coumans
2008-03-13 05:16:42 +00:00
parent 2f80e7f814
commit fe5386a5c8
20 changed files with 771 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
View File

@@ -23,7 +23,6 @@ btTypedConstraint::btTypedConstraint(btTypedConstraintType type)
:m_userConstraintType(-1),
m_userConstraintId(-1),
m_constraintType (type),
m_typedUserInfo(0),
m_rbA(s_fixed),
m_rbB(s_fixed),
m_appliedImpulse(btScalar(0.))
@@ -33,7 +32,6 @@ m_appliedImpulse(btScalar(0.))
btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA)
:m_userConstraintType(-1),
m_userConstraintId(-1),
m_typedUserInfo(0),
m_constraintType (type),
m_rbA(rbA),
m_rbB(s_fixed),
@@ -47,7 +45,6 @@ m_appliedImpulse(btScalar(0.))
btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA,btRigidBody& rbB)
:m_userConstraintType(-1),
m_userConstraintId(-1),
m_typedUserInfo(0),
m_constraintType (type),
m_rbA(rbA),
m_rbB(rbB),

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

@@ -17,7 +17,6 @@ subject to the following restrictions:
#define TYPED_CONSTRAINT_H
class btRigidBody;
class btTypedUserInfo;
#include "LinearMath/btScalar.h"
enum btTypedConstraintType
@@ -34,7 +33,6 @@ class btTypedConstraint
{
int m_userConstraintType;
int m_userConstraintId;
btTypedUserInfo* m_typedUserInfo;
btTypedConstraintType m_constraintType;
@@ -100,6 +98,13 @@ public:
{
return m_userConstraintId;
}
///unique id is needed by the btHashMap during serialization
int getUid() const
{
return m_userConstraintId;
}
btScalar getAppliedImpulse() const
{
return m_appliedImpulse;
@@ -110,15 +115,6 @@ public:
return m_constraintType;
}
btTypedUserInfo* getTypedUserInfo () const
{
return m_typedUserInfo;
}
void setTypedUserInfo (btTypedUserInfo* typedUserInfo)
{
m_typedUserInfo = typedUserInfo;
}
};
#endif //TYPED_CONSTRAINT_H