History

grab.js rotation sort-of works now

Seth Alves committed 11 years ago

Commit ccb2f171 parent 42f94304 files · +15 −14Browse files

Showing the changes to libraries/physics/src/ObjectActionSpring.cpp (1 of 4 files). Show all

Unified · Split

libraries/physics/src/ObjectActionSpring.cpp+2−1
@@ -64,8 +64,9 @@ void ObjectActionSpring::updateAction(btCollisionWorld* collisionWorld, btScalar · 63 unmodified lines
64 glm::quat deltaQ = _rotationalTarget * qZeroInverse;64 glm::quat deltaQ = _rotationalTarget * qZeroInverse;
65 glm::vec3 axis = glm::axis(deltaQ);65 glm::vec3 axis = glm::axis(deltaQ);
66 float angle = glm::angle(deltaQ);66 float angle = glm::angle(deltaQ);
67 glm::vec3 newAngularVelocity = (-angle / _angularTimeScale) * glm::normalize(axis);67 glm::vec3 newAngularVelocity = (angle / _angularTimeScale) * glm::normalize(axis);
68 rigidBody->setAngularVelocity(glmToBullet(newAngularVelocity));68 rigidBody->setAngularVelocity(glmToBullet(newAngularVelocity));
69 rigidBody->activate();
69 }70 }
70 }71 }
71 }72 }