Merge pull request #9587 from hyperlogic/bug-fix/tablet-ui-network-2d-tablet

Tablet-ui: fix tablet orientation for users in 2d desktop mode
This commit is contained in:
Seth Alves 2017-02-01 20:17:40 -08:00 committed by GitHub
commit f907af1b9b

View file

@ -900,7 +900,7 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
_skeletonModel->getAbsoluteJointRotationInRigFrame(headJointIndex, rotation); _skeletonModel->getAbsoluteJointRotationInRigFrame(headJointIndex, rotation);
} }
} }
return rotation; return Quaternions::Y_180 * rotation * Quaternions::Y_180;
} }
default: { default: {
glm::quat rotation; glm::quat rotation;
@ -936,7 +936,7 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
_skeletonModel->getAbsoluteJointTranslationInRigFrame(headJointIndex, translation); _skeletonModel->getAbsoluteJointTranslationInRigFrame(headJointIndex, translation);
} }
} }
return translation; return Quaternions::Y_180 * translation * Quaternions::Y_180;
} }
default: { default: {
glm::vec3 translation; glm::vec3 translation;