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
6464 glm::quat deltaQ = _rotationalTarget * qZeroInverse;
6565 glm::vec3 axis = glm::axis(deltaQ);
6666 float angle = glm::angle(deltaQ);
67− glm::vec3 newAngularVelocity = (-angle / _angularTimeScale) * glm::normalize(axis);
67+ glm::vec3 newAngularVelocity = (angle / _angularTimeScale) * glm::normalize(axis);
6868 rigidBody->setAngularVelocity(glmToBullet(newAngularVelocity));
69+ rigidBody->activate();
6970 }
7071 }
7172 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t