Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 20:55:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6751 from hyperlogic/tony/model-entity-item-animation-fix

Browse source 
ModelEntityItem: Fix for missing pre-rotations for animated models.
This commit is contained in:
Seth Alves 2016-01-01 07:08:24 -08:00
commit b190b2757e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/ModelEntityItem.cpp
View file

@ -252,9 +252,11 @@ void ModelEntityItem::getAnimationFrame(bool& newFrame,
if (index < translations.size()) { if (index < translations.size()) {
translationMat = glm::translate(translations[index]); translationMat = glm::translate(translations[index]);
} }
glm::mat4 rotationMat; glm::mat4 rotationMat(glm::mat4::_null);
if (index < rotations.size()) { if (index < rotations.size()) {
rotationMat = glm::mat4_cast(rotations[index]); rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
} else {
rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
} }
glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform * glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
rotationMat * fbxJoints[index].postTransform); rotationMat * fbxJoints[index].postTransform);