Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 17:05:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

oops, need to update angularVelocity after damping

Browse source
This commit is contained in:
Andrew Meadows 2015-01-05 12:23:55 -08:00
parent bf6b8f9ca7
commit 6fb4e1f622
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityItem.cpp
View file

@ -662,13 +662,14 @@ void EntityItem::simulate(const quint64& now) {
const float EPSILON_ANGULAR_VELOCITY_LENGTH = 0.0017453f; // ~0.1 degree/sec const float EPSILON_ANGULAR_VELOCITY_LENGTH = 0.0017453f; // ~0.1 degree/sec
if (angularSpeed < EPSILON_ANGULAR_VELOCITY_LENGTH) { if (angularSpeed < EPSILON_ANGULAR_VELOCITY_LENGTH) {
setAngularVelocity(NO_ANGULAR_VELOCITY); angularVelocity = NO_ANGULAR_VELOCITY;
} else { } else {
float angle = timeElapsed * angularSpeed; float angle = timeElapsed * angularSpeed;
glm::quat dQ = glm::angleAxis(angle, glm::normalize(angularVelocity)); glm::quat dQ = glm::angleAxis(angle, glm::normalize(angularVelocity));
rotation = glm::normalize(dQ * rotation); rotation = glm::normalize(dQ * rotation);
setRotation(rotation); setRotation(rotation);
} }
setAngularVelocity(angularVelocity);
} }
#ifdef USE_BULLET_PHYSICS #ifdef USE_BULLET_PHYSICS