Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix several bugs for eye tracking from input plugins to function

Browse source
This commit is contained in:
Anthony J. Thibault 2019-11-21 17:57:44 -08:00
parent 9d6ce44131
commit 404d1a3c93
4 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/avatar/MyAvatar.cpp
View file

@ -6593,18 +6593,18 @@ void MyAvatar::updateEyesLookAtPosition(float deltaTime) {
// A script has set the eye rotations, so use these to set lookAtSpot
glm::quat leftEyeRotation = getAbsoluteJointRotationInObjectFrame(leftEyeJointIndex);
glm::quat rightEyeRotation = getAbsoluteJointRotationInObjectFrame(rightEyeJointIndex);
glm::vec3 leftVec = getWorldOrientation() * leftEyeRotation * IDENTITY_FORWARD;
glm::vec3 rightVec = getWorldOrientation() * rightEyeRotation * IDENTITY_FORWARD;
glm::vec3 leftVec = getWorldOrientation() * leftEyeRotation * Vectors::UNIT_Z;
glm::vec3 rightVec = getWorldOrientation() * rightEyeRotation * Vectors::UNIT_Z;
glm::vec3 leftEyePosition = myHead->getLeftEyePosition();
glm::vec3 rightEyePosition = myHead->getRightEyePosition();
float t1, t2;
bool success = findClosestApproachOfLines(leftEyePosition, leftVec, rightEyePosition, rightVec, t1, t2);
if (success) {
if (success && t1 > 0 && t2 > 0) {
glm::vec3 leftFocus = leftEyePosition + leftVec * t1;
glm::vec3 rightFocus = rightEyePosition + rightVec * t2;
lookAtSpot = (leftFocus + rightFocus) / 2.0f; // average
} else {
lookAtSpot = myHead->getEyePosition() + glm::normalize(leftVec) * 1000.0f;
lookAtSpot = myHead->getEyePosition() + glm::normalize(leftVec) * 20.0f;
}
} else if (_scriptControlsEyesLookAt) {
if (_scriptEyesControlTimer < MAX_LOOK_AT_TIME_SCRIPT_CONTROL) {
@ -6618,19 +6618,18 @@ void MyAvatar::updateEyesLookAtPosition(float deltaTime) {
controller::Pose rightEyePose = getControllerPoseInAvatarFrame(controller::Action::RIGHT_EYE);
if (leftEyePose.isValid() && rightEyePose.isValid()) {
// an eye tracker is in use, set lookAtSpot from this
glm::vec3 leftVec = getWorldOrientation() * leftEyePose.rotation * glm::vec3(0.0f, 0.0f, -1.0f);
glm::vec3 rightVec = getWorldOrientation() * rightEyePose.rotation * glm::vec3(0.0f, 0.0f, -1.0f);
glm::vec3 leftVec = getWorldOrientation() * leftEyePose.rotation * Vectors::UNIT_Z;
glm::vec3 rightVec = getWorldOrientation() * rightEyePose.rotation * Vectors::UNIT_Z;
glm::vec3 leftEyePosition = myHead->getLeftEyePosition();
glm::vec3 rightEyePosition = myHead->getRightEyePosition();
float t1, t2;
bool success = findClosestApproachOfLines(leftEyePosition, leftVec, rightEyePosition, rightVec, t1, t2);
if (success) {
if (success && t1 > 0 && t2 > 0) {
glm::vec3 leftFocus = leftEyePosition + leftVec * t1;
glm::vec3 rightFocus = rightEyePosition + rightVec * t2;
lookAtSpot = (leftFocus + rightFocus) / 2.0f; // average
} else {
lookAtSpot = myHead->getEyePosition() + glm::normalize(leftVec) * 1000.0f;
lookAtSpot = myHead->getEyePosition() + glm::normalize(leftVec) * 20.0f;
}
} else {
// no script override, no eye tracker, so do procedural eye motion

14
libraries/avatars-renderer/src/avatars-renderer/Head.cpp
View file

@ -96,18 +96,21 @@ void Head::simulate(float deltaTime) {
const float BLINK_START_VARIABILITY = 0.25f;
const float FULLY_OPEN = 0.0f;
const float FULLY_CLOSED = 1.0f;
const float TALKING_LOUDNESS = 150.0f;
_timeWithoutTalking += deltaTime;
if ((_averageLoudness - _longTermAverageLoudness) > TALKING_LOUDNESS) {
_timeWithoutTalking = 0.0f;
}
if (getProceduralAnimationFlag(HeadData::BlinkProceduralBlendshapeAnimation) &&
!getSuppressProceduralAnimationFlag(HeadData::BlinkProceduralBlendshapeAnimation)) {
// handle automatic blinks
// Detect transition from talking to not; force blink after that and a delay
bool forceBlink = false;
const float TALKING_LOUDNESS = 150.0f;
const float BLINK_AFTER_TALKING = 0.25f;
_timeWithoutTalking += deltaTime;
if ((_averageLoudness - _longTermAverageLoudness) > TALKING_LOUDNESS) {
_timeWithoutTalking = 0.0f;
} else if (_timeWithoutTalking - deltaTime < BLINK_AFTER_TALKING && _timeWithoutTalking >= BLINK_AFTER_TALKING) {
if (_timeWithoutTalking - deltaTime < BLINK_AFTER_TALKING && _timeWithoutTalking >= BLINK_AFTER_TALKING) {
forceBlink = true;
}
if (_leftEyeBlinkVelocity == 0.0f && _rightEyeBlinkVelocity == 0.0f) {
@ -151,6 +154,7 @@ void Head::simulate(float deltaTime) {
} else {
_rightEyeBlink = FULLY_OPEN;
_leftEyeBlink = FULLY_OPEN;
updateEyeLookAt();
}
// use data to update fake Faceshift blendshape coefficients

2
libraries/avatars/src/AvatarData.cpp
View file

@ -376,7 +376,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
tranlationChangedSince(lastSentTime) ||
parentInfoChangedSince(lastSentTime));
hasHandControllers = _controllerLeftHandMatrixCache.isValid() || _controllerRightHandMatrixCache.isValid();
hasFaceTrackerInfo = !dropFaceTracking && getHasScriptedBlendshapes() &&
hasFaceTrackerInfo = !dropFaceTracking && (getHasScriptedBlendshapes() || _headData->_hasInputDrivenBlendshapes) &&
(sendAll || faceTrackerInfoChangedSince(lastSentTime));
hasJointData = !sendMinimum;
hasJointDefaultPoseFlags = hasJointData;

8
plugins/hifiOsc/src/OscPlugin.cpp
View file

@ -374,16 +374,16 @@ static int genericHandlerFunc(const char* path, const char* types, lo_arg** argv
// map /ELR to left eye rot
if (path[0] == '/' && path[1] == 'E' && path[2] == 'L' && path[3] == 'R' &&
types[0] == 'f' && types[1] == 'f') {
glm::vec3 euler(-argv[0]->f, -argv[1]->f, 0.0f);
container->_eyeLeftRot = glm::quat(glm::radians(euler)) * Quaternions::Y_180;
glm::vec3 euler(argv[0]->f, -argv[1]->f, 0.0f);
container->_eyeLeftRot = container->_headRot * glm::quat(glm::radians(euler));
container->_eyeLeftRotValid = true;
}
// map /ERR to right eye rot
if (path[0] == '/' && path[1] == 'E' && path[2] == 'R' && path[3] == 'R' &&
types[0] == 'f' && types[1] == 'f') {
glm::vec3 euler((float)-argv[0]->f, (float)-argv[1]->f, 0.0f);
container->_eyeRightRot = glm::quat(glm::radians(euler)) * Quaternions::Y_180;
glm::vec3 euler((float)argv[0]->f, (float)-argv[1]->f, 0.0f);
container->_eyeRightRot = container->_headRot * glm::quat(glm::radians(euler));
container->_eyeRightRotValid = true;
}