Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 20:39:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14270 from luiscuenca/softEntitiesLooseJointsFix

Browse source 
Extra joints on soft entities keep their local transform
This commit is contained in:
Anthony Thibault 2018-11-01 09:29:16 -07:00 committed by GitHub
commit 5c78a463de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -498,8 +498,8 @@ void Avatar::relayJointDataToChildren() {
glm::quat jointRotation; glm::quat jointRotation;
glm::vec3 jointTranslation; glm::vec3 jointTranslation;
if (avatarJointIndex < 0) { if (avatarJointIndex < 0) {
jointRotation = modelEntity->getAbsoluteJointRotationInObjectFrame(jointIndex); jointRotation = modelEntity->getLocalJointRotation(jointIndex);
jointTranslation = modelEntity->getAbsoluteJointTranslationInObjectFrame(jointIndex); jointTranslation = modelEntity->getLocalJointTranslation(jointIndex);
map.push_back(-1); map.push_back(-1);
} else { } else {
int jointIndex = getJointIndex(jointName); int jointIndex = getJointIndex(jointName);
@ -522,8 +522,8 @@ void Avatar::relayJointDataToChildren() {
jointRotation = getJointRotation(avatarJointIndex); jointRotation = getJointRotation(avatarJointIndex);
jointTranslation = getJointTranslation(avatarJointIndex); jointTranslation = getJointTranslation(avatarJointIndex);
} else { } else {
jointRotation = modelEntity->getAbsoluteJointRotationInObjectFrame(jointIndex); jointRotation = modelEntity->getLocalJointRotation(jointIndex);
jointTranslation = modelEntity->getAbsoluteJointTranslationInObjectFrame(jointIndex); jointTranslation = modelEntity->getLocalJointTranslation(jointIndex);
} }
modelEntity->setLocalJointRotation(jointIndex, jointRotation); modelEntity->setLocalJointRotation(jointIndex, jointRotation);
modelEntity->setLocalJointTranslation(jointIndex, jointTranslation); modelEntity->setLocalJointTranslation(jointIndex, jointTranslation);