Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 51 files). Show all
Unified · Split
| @@ -24,7 +24,7 @@ void SkeletonModel::simulate(float deltaTime, bool delayLoad) { · 23 unmodified lines | ||
| 24 | 24 | return; |
| 25 | 25 | } |
| 26 | 26 | setTranslation(_owningAvatar->getPosition()); |
| 27 | − setRotation(_owningAvatar->getOrientation() * glm::angleAxis(180.0f, glm::vec3(0.0f, 1.0f, 0.0f))); | |
| 27 | + setRotation(_owningAvatar->getOrientation() * glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f))); | |
| 28 | 28 | const float MODEL_SCALE = 0.0006f; |
| 29 | 29 | setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale() * MODEL_SCALE); |
| 30 | 30 | |
| @@ -199,8 +199,9 @@ void SkeletonModel::maybeUpdateLeanRotation(const JointState& parentState, const · 168 unmodified lines | ||
| 199 | 199 | glm::mat3 axes = glm::mat3_cast(_rotation); |
| 200 | 200 | glm::mat3 inverse = glm::mat3(glm::inverse(parentState.transform * glm::translate(state.translation) * |
| 201 | 201 | joint.preTransform * glm::mat4_cast(joint.preRotation * joint.rotation))); |
| 202 | − state.rotation = glm::angleAxis(-_owningAvatar->getHead()->getLeanSideways(), glm::normalize(inverse * axes[2])) * | |
| 203 | − glm::angleAxis(-_owningAvatar->getHead()->getLeanForward(), glm::normalize(inverse * axes[0])) * joint.rotation; | |
| 202 | + state.rotation = glm::angleAxis(- RADIANS_PER_DEGREE * _owningAvatar->getHead()->getLeanSideways(), | |
| 203 | + glm::normalize(inverse * axes[2])) * glm::angleAxis(- RADIANS_PER_DEGREE * _owningAvatar->getHead()->getLeanForward(), | |
| 204 | + glm::normalize(inverse * axes[0])) * joint.rotation; | |
| 204 | 205 | } |
| 205 | 206 | |
| 206 | 207 | void SkeletonModel::stretchArm(int jointIndex, const glm::vec3& position) { |