Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 6 files). Show all
Unified · Split
| @@ -115,6 +115,10 @@ void SkeletonModel::updateClusterMatrices() { · 114 unmodified lines | |||
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) { | ||
| 119 | _rig->simulateInternal(deltaTime, parentTransform, _owningAvatar->getPosition(), _owningAvatar->getVelocity(), _owningAvatar->getOrientation()); | ||
| 120 | } | ||
| 121 | |||
| 118 | void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { | 122 | void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { |
| 119 | setTranslation(_owningAvatar->getSkeletonPosition()); | 123 | setTranslation(_owningAvatar->getSkeletonPosition()); |
| 120 | static const glm::quat refOrientation = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f)); | 124 | static const glm::quat refOrientation = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f)); |
| @@ -122,7 +126,7 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { · 1 unmodified line | |||
| 122 | setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale()); | 126 | setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale()); |
| 123 | setBlendshapeCoefficients(_owningAvatar->getHead()->getBlendshapeCoefficients()); | 127 | setBlendshapeCoefficients(_owningAvatar->getHead()->getBlendshapeCoefficients()); |
| 124 | 128 | ||
| 125 | Model::simulate(deltaTime, fullUpdate, _owningAvatar->getPosition(), _owningAvatar->getVelocity(), _owningAvatar->getOrientation()); | 129 | Model::simulate(deltaTime, fullUpdate); |
| 126 | 130 | ||
| 127 | if (!isActive() || !_owningAvatar->isMyAvatar()) { | 131 | if (!isActive() || !_owningAvatar->isMyAvatar()) { |
| 128 | return; // only simulate for own avatar | 132 | return; // only simulate for own avatar |