diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-10-31 21:19:57 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-10-31 21:19:57 +0300 |
| commit | 92fd0433463695bff37167a03e1fd87921368955 (patch) | |
| tree | 184bd01d47b1fcd0eea144c4a46b1f40520625db /extern/bullet2/src/LinearMath | |
| parent | 35d6c6e695351051febf7d6aa84761db1d733295 (diff) | |
update Bullet 2.x with latest changes, notice that the integration is not finished yet, and GameBlender is still using extern/bullet.
Diffstat (limited to 'extern/bullet2/src/LinearMath')
| -rw-r--r-- | extern/bullet2/src/LinearMath/btDefaultMotionState.h | 4 | ||||
| -rw-r--r-- | extern/bullet2/src/LinearMath/btTransformUtil.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extern/bullet2/src/LinearMath/btDefaultMotionState.h b/extern/bullet2/src/LinearMath/btDefaultMotionState.h index c64f1352e10..805631ac56f 100644 --- a/extern/bullet2/src/LinearMath/btDefaultMotionState.h +++ b/extern/bullet2/src/LinearMath/btDefaultMotionState.h @@ -9,7 +9,7 @@ struct btDefaultMotionState : public btMotionState btTransform m_startWorldTrans; void* m_userPointer; - btDefaultMotionState(const btTransform& startTrans,const btTransform& centerOfMassOffset = btTransform::getIdentity()) + btDefaultMotionState(const btTransform& startTrans = btTransform::getIdentity(),const btTransform& centerOfMassOffset = btTransform::getIdentity()) : m_graphicsWorldTrans(startTrans), m_centerOfMassOffset(centerOfMassOffset), m_startWorldTrans(startTrans), @@ -31,4 +31,4 @@ struct btDefaultMotionState : public btMotionState } }; -#endif //DEFAULT_MOTION_STATE_H
\ No newline at end of file +#endif //DEFAULT_MOTION_STATE_H diff --git a/extern/bullet2/src/LinearMath/btTransformUtil.h b/extern/bullet2/src/LinearMath/btTransformUtil.h index da8e4aa72a8..12ca634c232 100644 --- a/extern/bullet2/src/LinearMath/btTransformUtil.h +++ b/extern/bullet2/src/LinearMath/btTransformUtil.h @@ -17,7 +17,7 @@ subject to the following restrictions: #define SIMD_TRANSFORM_UTIL_H #include "LinearMath/btTransform.h" -#define ANGULAR_MOTION_TRESHOLD 0.5f*SIMD_HALF_PI +#define ANGULAR_MOTION_THRESHOLD 0.5f*SIMD_HALF_PI @@ -82,9 +82,9 @@ public: btVector3 axis; btScalar fAngle = angvel.length(); //limit the angular motion - if (fAngle*timeStep > ANGULAR_MOTION_TRESHOLD) + if (fAngle*timeStep > ANGULAR_MOTION_THRESHOLD) { - fAngle = ANGULAR_MOTION_TRESHOLD / timeStep; + fAngle = ANGULAR_MOTION_THRESHOLD / timeStep; } if ( fAngle < 0.001f ) |