Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 09:19:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

added the case where my avatar has no parent of hips, but the animation does

Browse source
This commit is contained in:
amantley 2019-03-01 12:41:05 -08:00
parent 217145f4c5
commit 54f14b2772
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/animation/src/AnimClip.cpp
View file

@ -153,11 +153,11 @@ void AnimClip::copyFromNetworkAnim() {
const float EPSILON = 0.0001f; const float EPSILON = 0.0001f;
const int avatarHipsParentIndex = avatarSkeleton->getParentIndex(avatarSkeleton->nameToJointIndex("Hips")); const int avatarHipsParentIndex = avatarSkeleton->getParentIndex(avatarSkeleton->nameToJointIndex("Hips"));
if (avatarJointIndex == avatarSkeleton->nameToJointIndex("Hips") && (avatarHipsParentIndex >= 0)) { const int animHipsParentIndex = animSkeleton.getParentIndex(animSkeleton.nameToJointIndex("Hips"));
if (avatarJointIndex == avatarSkeleton->nameToJointIndex("Hips") && (avatarHipsParentIndex >= 0) || (animHipsParentIndex >= 0)) {
const AnimPose& animHipsAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animSkeleton.nameToJointIndex("Hips")); const AnimPose& animHipsAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animSkeleton.nameToJointIndex("Hips"));
const AnimPose& avatarHipsAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarSkeleton->nameToJointIndex("Hips")); const AnimPose& avatarHipsAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarSkeleton->nameToJointIndex("Hips"));
const AnimPose& avatarHipsParentAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarHipsParentIndex);
// the get the units and the heights for the animation and the avatar // the get the units and the heights for the animation and the avatar
const float animationUnitScale = extractScale(animModel.offset).y; const float animationUnitScale = extractScale(animModel.offset).y;
@ -166,10 +166,12 @@ void AnimClip::copyFromNetworkAnim() {
const float animHeightInMeters = animationUnitScale * animHipsAbsoluteDefaultPose.trans().y; const float animHeightInMeters = animationUnitScale * animHipsAbsoluteDefaultPose.trans().y;
// get the parent scales for the avatar and the animation // get the parent scales for the avatar and the animation
const float avatarHipsParentScale = avatarHipsParentAbsoluteDefaultPose.scale().y; float avatarHipsParentScale = 1.0f;
float animHipsParentScale = 1.0f; float animHipsParentScale = 1.0f;
const int animHipsParentIndex = animSkeleton.getParentIndex(animSkeleton.nameToJointIndex("Hips")); if (avatarHipsParentIndex >= 0) {
// also, check to see if the animation hips have a scaled parent. const AnimPose& avatarHipsParentAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarHipsParentIndex);
avatarHipsParentScale = avatarHipsParentAbsoluteDefaultPose.scale().y;
}
if (animHipsParentIndex >= 0) { if (animHipsParentIndex >= 0) {
const AnimPose& animationHipsParentAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animHipsParentIndex); const AnimPose& animationHipsParentAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animHipsParentIndex);
animHipsParentScale = animationHipsParentAbsoluteDefaultPose.scale().y; animHipsParentScale = animationHipsParentAbsoluteDefaultPose.scale().y;