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

Added Joint Name check for translations

Browse source 
This way if there is a mismatch in the skeleton, the translations are
applied to the models correctly
This commit is contained in:
Menithal 2017-09-04 22:16:02 +03:00
parent 8723ff2df2
commit 03e076046b
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -909,8 +909,15 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
QVector<JointData> jointsData;
const QVector<FBXAnimationFrame>& frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
auto& fbxJoints = _animation->getGeometry().joints;
auto& originalFbxJoints = _model->getFBXGeometry().joints;
auto& animationGeometry = _animation->getGeometry();
auto& animationJointNames = animationGeometry.getJointNames();
auto& fbxJoints = animationGeometry.joints;
auto& _debugFbxJoints = animationGeometry.jointIndices;
auto& originalFbx = _model->getFBXGeometry();
auto& originalFbxJoints = originalFbx.joints;
auto& originalFbxIndices = originalFbx.jointIndices;
bool allowTranslation = entity->getAnimationAllowTranslation();
int frameCount = frames.size();
if (frameCount <= 0) {
@ -952,13 +959,22 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
jointsData.resize(_jointMapping.size());
for (int j = 0; j < _jointMapping.size(); j++) {
int index = _jointMapping[j];
if (index >= 0) {
glm::mat4 translationMat;
if (!allowTranslation){
translationMat = glm::translate(originalFbxJoints[index].translation);
} else if (index < translations.size()) {
if (allowTranslation && index < translations.size()) {
translationMat = glm::translate(translations[index]);
}
} else if (!allowTranslation && index < animationJointNames.size()){
QString jointName = fbxJoints[index].name; // Pushing this here so its not done on every entity, with the exceptions of those allowing for translation
if (originalFbxIndices.contains(jointName)) {
// Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get it's translation.
int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
translationMat = glm::translate(originalFbxJoints[remappedIndex].translation);
}
}
glm::mat4 rotationMat;
if (index < rotations.size()) {
rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
@ -975,7 +991,6 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
jointData.rotationSet = true;
}
}
// Set the data in the entity
entity->setAnimationJointsData(jointsData);