Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:43:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ModelEntityItem: Fix for missing pre-rotations for animated models.

Browse source 
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
This commit is contained in:
Anthony J. Thibault 2015-12-30 10:17:18 -08:00
parent a5c19c04e5
commit 8f71a5fda5
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()) {
translationMat = glm::translate(translations[index]);
}
glm::mat4 rotationMat;
glm::mat4 rotationMat(glm::mat4::_null);
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 *
rotationMat * fbxJoints[index].postTransform);