Showing the changes to libraries/render-utils/src/Model.cpp (1 of 51 files). Show all
Unified · Split
| @@ -1325,12 +1325,16 @@ void Model::simulate(float deltaTime, bool fullUpdate) { · 1324 unmodified lines | |||
| 1325 | } | 1325 | } |
| 1326 | } | 1326 | } |
| 1327 | 1327 | ||
| 1328 | //virtual | ||
| 1329 | void Model::updateRig(float deltaTime, glm::mat4 parentTransform) { | ||
| 1330 | _rig->updateAnimations(deltaTime, parentTransform); | ||
| 1331 | } | ||
| 1328 | void Model::simulateInternal(float deltaTime) { | 1332 | void Model::simulateInternal(float deltaTime) { |
| 1329 | // update the world space transforms for all joints | 1333 | // update the world space transforms for all joints |
| 1330 | 1334 | ||
| 1331 | const FBXGeometry& geometry = _geometry->getFBXGeometry(); | 1335 | const FBXGeometry& geometry = _geometry->getFBXGeometry(); |
| 1332 | glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset) * geometry.offset; | 1336 | glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset) * geometry.offset; |
| 1333 | _rig->simulateInternal(deltaTime, parentTransform, getTranslation(), getRotation()); | 1337 | updateRig(deltaTime, parentTransform); |
| 1334 | 1338 | ||
| 1335 | glm::mat4 modelToWorld = glm::mat4_cast(_rotation); | 1339 | glm::mat4 modelToWorld = glm::mat4_cast(_rotation); |
| 1336 | for (int i = 0; i < _meshStates.size(); i++) { | 1340 | for (int i = 0; i < _meshStates.size(); i++) { |