Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed Debug Joints that wasnt used anylonger

Browse source
This commit is contained in:
Menithal 2017-09-04 22:20:00 +03:00
parent 03e076046b
commit 119a2703f7
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -912,7 +912,6 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
auto& animationGeometry = _animation->getGeometry(); auto& animationGeometry = _animation->getGeometry();
auto& animationJointNames = animationGeometry.getJointNames(); auto& animationJointNames = animationGeometry.getJointNames();
auto& fbxJoints = animationGeometry.joints; auto& fbxJoints = animationGeometry.joints;
auto& _debugFbxJoints = animationGeometry.jointIndices;
auto& originalFbx = _model->getFBXGeometry(); auto& originalFbx = _model->getFBXGeometry();
auto& originalFbxJoints = originalFbx.joints; auto& originalFbxJoints = originalFbx.joints;
@ -967,8 +966,7 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
translationMat = glm::translate(translations[index]); translationMat = glm::translate(translations[index]);
} else if (!allowTranslation && index < animationJointNames.size()){ } 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 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)) { 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. // 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. int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.