adding scale

This commit is contained in:
Dante Ruiz 2018-01-15 10:43:26 -08:00
parent 283b9a8003
commit c76fdd1f5f
2 changed files with 4 additions and 2 deletions

View file

@ -397,8 +397,9 @@ void Avatar::relayJointDataToChildren() {
modelEntity->setLocalJointTranslation(jointIndex, jointTranslation);
}
}
modelEntity->setOverrideTransform(_skeletonModel->getTransform(), _skeletonModel->getOffset());
Transform avatarTransform = _skeletonModel->getTransform();
avatarTransform.setScale(_skeletonModel->getScale());
modelEntity->setOverrideTransform(avatarTransform, _skeletonModel->getOffset());
modelEntity->simulateRelayedJoints();
}
}

View file

@ -1373,6 +1373,7 @@ void Model::overrideModelTransformAndOffset(const Transform& transform, const gl
_overrideTranslation = transform.getTranslation();
_overrideRotation = transform.getRotation();
_overrideModelTransform = true;
setScale(transform.getScale());
setOffset(offset);
}