Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix math, renamed a couple variables

Browse source
This commit is contained in:
Seth Alves 2016-08-30 09:55:42 -07:00
parent 01ee6e9e98
commit 7d13f9220c
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/physics/src/ObjectActionTravelOriented.cpp
View file

@ -58,17 +58,18 @@ void ObjectActionTravelOriented::updateActionWorker(btScalar deltaTimeStep) {
if (speed < TRAVEL_ORIENTED_TOO_SLOW) { if (speed < TRAVEL_ORIENTED_TOO_SLOW) {
return; return;
} }
velocity = glm::normalize(velocity); glm::vec3 direction = glm::normalize(velocity);
// find current angle of "forward" // find current angle of "forward"
btQuaternion bodyRotation = rigidBody->getOrientation(); btQuaternion bodyRotation = rigidBody->getOrientation();
glm::quat orientation = bulletToGLM(bodyRotation); glm::quat orientation = bulletToGLM(bodyRotation);
glm::vec3 forwardInWorldFrame = glm::normalize(orientation * _forward); glm::vec3 forwardInWorldFrame = glm::normalize(orientation * _forward);
// find the rotation that would line up velocity and forward // find the rotation that would line up direction and forward
glm::quat neededRotation = ::rotationBetween(forwardInWorldFrame, velocity); glm::quat neededRotation = glm::rotation(forwardInWorldFrame, direction);
glm::quat rotationalTarget = orientation * neededRotation; glm::quat rotationalTarget = neededRotation * orientation;
btVector3 targetVelocity(0.0f, 0.0f, 0.0f);
btVector3 targetAngularVelocity(0.0f, 0.0f, 0.0f);
auto alignmentDot = bodyRotation.dot(glmToBullet(rotationalTarget)); auto alignmentDot = bodyRotation.dot(glmToBullet(rotationalTarget));
const float ALMOST_ONE = 0.99999f; const float ALMOST_ONE = 0.99999f;
@ -86,13 +87,13 @@ void ObjectActionTravelOriented::updateActionWorker(btScalar deltaTimeStep) {
// dQ = Q1 * Q0^ // dQ = Q1 * Q0^
btQuaternion deltaQ = target * bodyRotation.inverse(); btQuaternion deltaQ = target * bodyRotation.inverse();
float speed = deltaQ.getAngle() / _angularTimeScale; float speed = deltaQ.getAngle() / _angularTimeScale;
targetVelocity = speed * deltaQ.getAxis(); targetAngularVelocity = speed * deltaQ.getAxis();
if (speed > rigidBody->getAngularSleepingThreshold()) { if (speed > rigidBody->getAngularSleepingThreshold()) {
rigidBody->activate(); rigidBody->activate();
} }
} }
// this action is aggresively critically damped and defeats the current velocity // this action is aggresively critically damped and defeats the current velocity
rigidBody->setAngularVelocity(targetVelocity); rigidBody->setAngularVelocity(targetAngularVelocity);
}); });
} }