Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:52:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4403 from AndrewMeadows/thermonuclear

Browse source 
fix crash: avoid assert for zero-length character velocity
This commit is contained in:
Brad Hefta-Gaub 2015-03-09 20:56:42 -07:00
commit d662c30405
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/physics/src/PhysicsEngine.cpp
View file

@ -290,8 +290,15 @@ void PhysicsEngine::stepSimulation() {
if (_avatarData->isPhysicsEnabled()) { if (_avatarData->isPhysicsEnabled()) {
_avatarGhostObject->setWorldTransform(btTransform(glmToBullet(_avatarData->getOrientation()), _avatarGhostObject->setWorldTransform(btTransform(glmToBullet(_avatarData->getOrientation()),
glmToBullet(_avatarData->getPosition()))); glmToBullet(_avatarData->getPosition())));
// _characterController->setWalkDirection(glmToBullet(_avatarData->getVelocity())); // WORKAROUND: there is a bug in the debug Bullet-2.82 libs where a zero length walk velocity will trigger
_characterController->setVelocityForTimeInterval(glmToBullet(_avatarData->getVelocity()), timeStep); // an assert when the getNormalizedVector() helper function in btKinematicCharacterController.cpp tries to
// first normalize a vector before checking its length. Here we workaround the problem by checking the
// length first. NOTE: the character's velocity is reset to zero after each step, so when we DON'T set
// the velocity for this time interval it is the same thing as setting its velocity to zero.
btVector3 walkVelocity = glmToBullet(_avatarData->getVelocity());
if (walkVelocity.length2() > FLT_EPSILON * FLT_EPSILON) {
_characterController->setVelocityForTimeInterval(walkVelocity, timeStep);
}
} }
// This is step (2). // This is step (2).
@ -609,11 +616,11 @@ void PhysicsEngine::setAvatarData(AvatarData *avatarData) {
glmToBullet(_avatarData->getPosition()))); glmToBullet(_avatarData->getPosition())));
// XXX these values should be computed from the character model. // XXX these values should be computed from the character model.
btScalar characterHeight = 1.75; btScalar characterRadius = 0.3;
btScalar characterWidth = 1.75; btScalar characterHeight = 1.75 - 2.0f * characterRadius;
btScalar stepHeight = btScalar(0.35); btScalar stepHeight = btScalar(0.35);
btConvexShape* capsule = new btCapsuleShape(characterWidth, characterHeight); btConvexShape* capsule = new btCapsuleShape(characterRadius, characterHeight);
_avatarGhostObject->setCollisionShape(capsule); _avatarGhostObject->setCollisionShape(capsule);
_avatarGhostObject->setCollisionFlags(btCollisionObject::CF_CHARACTER_OBJECT); _avatarGhostObject->setCollisionFlags(btCollisionObject::CF_CHARACTER_OBJECT);