History

Merge branch 'master' into transmit-joint-translation

Anthony J. Thibault committed 11 years ago

Commit fc7b6de2 parents a1b5494 639be1e33 files · +612 −775Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 33 files). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+1−1
@@ -323,7 +323,7 @@ void SkeletonModel::applyHandPosition(int jointIndex, const glm::vec3& position) · 322 unmodified lines
323 float sign = (jointIndex == geometry.rightHandJointIndex) ? 1.0f : -1.0f;323 float sign = (jointIndex == geometry.rightHandJointIndex) ? 1.0f : -1.0f;
324 _rig->applyJointRotationDelta(jointIndex,324 _rig->applyJointRotationDelta(jointIndex,
325 rotationBetween(handRotation * glm::vec3(-sign, 0.0f, 0.0f), forearmVector),325 rotationBetween(handRotation * glm::vec3(-sign, 0.0f, 0.0f), forearmVector),
326 true, PALM_PRIORITY);326 PALM_PRIORITY);
327}327}
328 328
329void SkeletonModel::applyPalmData(int jointIndex, PalmData& palm) {329void SkeletonModel::applyPalmData(int jointIndex, PalmData& palm) {

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