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

Merge pull request #9431 from sethalves/tablet-ui

Browse source 
avoid unthreadsafe use of getJointIndex
This commit is contained in:
Seth Alves 2017-01-18 14:59:02 -08:00 committed by GitHub
commit aeb02001ed
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/avatar/Avatar.cpp
View file

@ -929,7 +929,12 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
} }
case CAMERA_MATRIX_INDEX: { case CAMERA_MATRIX_INDEX: {
glm::quat rotation; glm::quat rotation;
_skeletonModel->getAbsoluteJointRotationInRigFrame(getJointIndex("head"), rotation); if (_skeletonModel) {
int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
if (headJointIndex >= 0) {
_skeletonModel->getAbsoluteJointRotationInRigFrame(headJointIndex, rotation);
}
}
return rotation; return rotation;
} }
default: { default: {
@ -960,7 +965,12 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
} }
case CAMERA_MATRIX_INDEX: { case CAMERA_MATRIX_INDEX: {
glm::vec3 translation; glm::vec3 translation;
_skeletonModel->getAbsoluteJointTranslationInRigFrame(getJointIndex("head"), translation); if (_skeletonModel) {
int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
if (headJointIndex >= 0) {
_skeletonModel->getAbsoluteJointTranslationInRigFrame(headJointIndex, translation);
}
}
return translation; return translation;
} }
default: { default: {