Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:24:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for Model Entity animations.

Browse source 
Because rig->setJoint* methods take parameters in geometry space
the animations preRotation has to be applied manually.
This commit is contained in:
Anthony J. Thibault 2015-11-23 11:06:11 -08:00
parent db21db3cbc
commit dd3f43705c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -224,6 +224,7 @@ void ModelEntityItem::getAnimationFrame(bool& newFrame,
if (myAnimation && myAnimation->isLoaded()) { if (myAnimation && myAnimation->isLoaded()) {
const QVector<FBXAnimationFrame>& frames = myAnimation->getFramesReference(); // NOTE: getFrames() is too heavy const QVector<FBXAnimationFrame>& frames = myAnimation->getFramesReference(); // NOTE: getFrames() is too heavy
auto& fbxJoints = myAnimation->getGeometry().joints;
int frameCount = frames.size(); int frameCount = frames.size();
if (frameCount > 0) { if (frameCount > 0) {
@ -244,7 +245,7 @@ void ModelEntityItem::getAnimationFrame(bool& newFrame,
for (int j = 0; j < _jointMapping.size(); j++) { for (int j = 0; j < _jointMapping.size(); j++) {
int index = _jointMapping[j]; int index = _jointMapping[j];
if (index != -1 && index < rotations.size()) { if (index != -1 && index < rotations.size()) {
_lastKnownFrameDataRotations[j] = rotations[index]; _lastKnownFrameDataRotations[j] = fbxJoints[index].preRotation * rotations[index];
} }
if (index != -1 && index < translations.size()) { if (index != -1 && index < translations.size()) {
_lastKnownFrameDataTranslations[j] = translations[index]; _lastKnownFrameDataTranslations[j] = translations[index];