Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 18:49:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set head pitch before making downstream eye corrections.

Browse source
This commit is contained in:
Howard Stearns 2015-08-24 11:10:29 -07:00
parent a8bbd8d43f
commit 484db87abc
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/src/avatar/SkeletonModel.cpp
View file

@ -41,7 +41,7 @@ SkeletonModel::~SkeletonModel() {
void SkeletonModel::initJointStates(QVector<JointState> states) { void SkeletonModel::initJointStates(QVector<JointState> states) {
const FBXGeometry& geometry = _geometry->getFBXGeometry(); const FBXGeometry& geometry = _geometry->getFBXGeometry();
glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset) * geometry.offset; glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset) * geometry.offset/* * glm::mat4_cast(getRotation())*/;
int rootJointIndex = geometry.rootJointIndex; int rootJointIndex = geometry.rootJointIndex;
int leftHandJointIndex = geometry.leftHandJointIndex; int leftHandJointIndex = geometry.leftHandJointIndex;
@ -123,20 +123,23 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
params.rightEyeJointIndex = geometry.rightEyeJointIndex; params.rightEyeJointIndex = geometry.rightEyeJointIndex;
_rig->updateFromHeadParameters(params); _rig->updateFromHeadParameters(params);
} else { } else if (true/*_owningAvatar->getHead()->isLookingAtMe()*/) {
// This is a little more work than we really want.
//
// Other avatars joint, including their eyes, should already be set just like any other joints // Other avatars joint, including their eyes, should already be set just like any other joints
// from the wire data. But when looking at me, we want the eyes to use the corrected lookAt. // from the wire data. But when looking at me, we want the eyes to use the corrected lookAt.
// //
// Thus this should really only be ... else if (_owningAvatar->getHead()->isLookingAtMe()) {...
// However, in the !isLookingAtMe case, the eyes aren't rotating the way they should right now.
// (They latch their looking at me position.) We will revisit that as priorities allow.
const FBXGeometry& geometry = _geometry->getFBXGeometry(); const FBXGeometry& geometry = _geometry->getFBXGeometry();
Head* head = _owningAvatar->getHead(); Head* head = _owningAvatar->getHead();
_rig->updateEyeJoints(geometry.leftEyeJointIndex, geometry.rightEyeJointIndex, // If the head is not positioned, updateEyeJoints won't get the math right
getTranslation(), getRotation(), glm::quat headOrientation;
head->getFinalOrientationInWorldFrame(), head->getCorrectedLookAtPosition()); _rig->getJointRotation(geometry.headJointIndex, headOrientation);
glm::quat modelOrientation = getRotation();
glm::quat adjust = modelOrientation;
glm::quat headOrientationInAvatar = adjust * headOrientation;
glm::vec3 eulers = safeEulerAngles(headOrientationInAvatar);
head->setBasePitch(glm::degrees(-eulers.x));
_rig->updateEyeJoints(geometry.leftEyeJointIndex, geometry.rightEyeJointIndex,
getTranslation(), modelOrientation,
head->getFinalOrientationInWorldFrame(), head->getCorrectedLookAtPosition());
} }
} }