Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 5 files). Show all
Unified · Split
| @@ -36,8 +36,6 @@ SkeletonModel::~SkeletonModel() { · 35 unmodified lines | ||
| 36 | 36 | _ragdoll = NULL; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | −const float MODEL_SCALE = 0.0006f; | |
| 40 | − | |
| 41 | 39 | void SkeletonModel::setJointStates(QVector<JointState> states) { |
| 42 | 40 | Model::setJointStates(states); |
| 43 | 41 | |
| @@ -57,7 +55,7 @@ void SkeletonModel::setJointStates(QVector<JointState> states) { · 13 unmodified lines | ||
| 57 | 55 | _defaultEyeModelPosition.z = -_defaultEyeModelPosition.z; |
| 58 | 56 | |
| 59 | 57 | // Skeleton may have already been scaled so unscale it |
| 60 | − _defaultEyeModelPosition = MODEL_SCALE * _defaultEyeModelPosition / _scale; | |
| 58 | + _defaultEyeModelPosition = _defaultEyeModelPosition / _scale; | |
| 61 | 59 | } |
| 62 | 60 | |
| 63 | 61 | // the SkeletonModel override of updateJointState() will clear the translation part |
| @@ -80,7 +78,7 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { · 16 unmodified lines | ||
| 80 | 78 | setTranslation(_owningAvatar->getSkeletonPosition()); |
| 81 | 79 | static const glm::quat refOrientation = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f)); |
| 82 | 80 | setRotation(_owningAvatar->getOrientation() * refOrientation); |
| 83 | − setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale() * MODEL_SCALE); | |
| 81 | + setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale()); | |
| 84 | 82 | setBlendshapeCoefficients(_owningAvatar->getHead()->getBlendshapeCoefficients()); |
| 85 | 83 | |
| 86 | 84 | Model::simulate(deltaTime, fullUpdate); |