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

fixed some merging conflicts

Browse Source
This commit is contained in:
ejcoumans
2006-09-27 20:58:49 +00:00
parent eb23bb5c0c
commit d0f09040e9
8 changed files with 42 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/BulletDynamics/Dynamics/btRigidBody.h
View File

@@ -42,22 +42,22 @@ extern float gAngularSleepingTreshold;
class btRigidBody : public btCollisionObject
{
SimdMatrix3x3 m_invInertiaTensorWorld;
SimdVector3 m_linearVelocity;
SimdVector3 m_angularVelocity;
SimdScalar m_inverseMass;
btMatrix3x3 m_invInertiaTensorWorld;
btVector3 m_linearVelocity;
btVector3 m_angularVelocity;
btScalar m_inverseMass;
SimdVector3 m_gravity;
SimdVector3 m_invInertiaLocal;
SimdVector3 m_totalForce;
SimdVector3 m_totalTorque;
btVector3 m_gravity;
btVector3 m_invInertiaLocal;
btVector3 m_totalForce;
btVector3 m_totalTorque;
SimdScalar m_linearDamping;
SimdScalar m_angularDamping;
btScalar m_linearDamping;
btScalar m_angularDamping;
SimdScalar m_kinematicTimeStep;
btScalar m_kinematicTimeStep;
BroadphaseProxy* m_broadphaseProxy;
btBroadphaseProxy* m_broadphaseProxy;
public: