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

added the sanity check to see if the shoulders have flipped

Browse source
This commit is contained in:
amantley 2018-08-24 16:29:08 -07:00
parent a60ab863a3
commit 2bec867863
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -458,9 +458,11 @@ void MyAvatar::update(float deltaTime) {
glm::vec3 handHipAzimuthSensorSpace = transformVectorFast(worldToSensorMat, glm::vec3(handHipAzimuthWorldSpace.x, 0.0f, handHipAzimuthWorldSpace.z));
glm::vec2 normedHandHip = glm::normalize(glm::vec2(handHipAzimuthSensorSpace.x, handHipAzimuthSensorSpace.z));
glm::vec2 headFacingPlusHandHipAzimuthMix = lerp(normedHandHip, _headControllerFacing, 0.5f);
//qCDebug(interfaceapp) << "the hand hip azimuth " << normedHandHip << "the head look at" << _headControllerFacing;
// if head facing dot mid point hands facing is close to -1 and the hands midpoint is close to -1 you then flip
// qCDebug(interfaceapp) << "the hand hip azimuth " << normedHandHip << "the head look at" << _headControllerFacing;
_headControllerFacingMovingAverage = lerp(_headControllerFacingMovingAverage, headFacingPlusHandHipAzimuthMix, tau);
qCDebug(interfaceapp) << "the hand hip azimuth average " << _headControllerFacingMovingAverage;
// qCDebug(interfaceapp) << "the hand hip azimuth average " << _headControllerFacingMovingAverage;
if (_smoothOrientationTimer < SMOOTH_TIME_ORIENTATION) {
_rotationChanged = usecTimestampNow();
@ -831,11 +833,22 @@ void MyAvatar::computeHandAzimuth() {
// qCDebug(interfaceapp) << "the right hand in avatar space" << rightHandRigSpace;
if (leftHandPoseAvatarSpace.isValid() && rightHandPoseAvatarSpace.isValid()) {
vec2 oldAzimuthReading = _hipToHandController;
_hipToHandController = lerp(glm::normalize(glm::vec2(rightHandPoseAvatarSpace.translation.x, rightHandPoseAvatarSpace.translation.z)), glm::normalize(glm::vec2(leftHandPoseAvatarSpace.translation.x, leftHandPoseAvatarSpace.translation.z)), 0.5f);
//if they are 180 apart
float cosForwardAngle = glm::dot(_hipToHandController, oldAzimuthReading);
float cosBackwardAngle = glm::dot(_hipToHandController, -oldAzimuthReading);
if (cosBackwardAngle > cosForwardAngle) {
// this means we have lost continuity with the current chest position
_hipToHandController = -_hipToHandController;
}
//need to use easing function here.
//var rotateAngle = ((Math.cos((leftRightMidpoint / 180.0) * Math.PI) + 2.0) / 3.0) * leftRightMidpoint;
} else {
_hipToHandController = glm::vec2(0.0f, 1.0f);
// _hipToHandController = glm::vec2(0.0f, -1.0f);
}
}

2
interface/src/avatar/MyAvatar.h
View file

@ -1663,7 +1663,7 @@ private:
glm::vec2 _headControllerFacingMovingAverage { 0.0f, 0.0f }; // facing vector in xz plane (sensor space)
glm::quat _averageHeadRotation { 0.0f, 0.0f, 0.0f, 1.0f };
glm::vec2 _hipToHandController; // spine2 facing vector in xz plane (avatar space)
glm::vec2 _hipToHandController { 0.0f, -1.0f }; // spine2 facing vector in xz plane (avatar space)
float _currentStandingHeight { 0.0f };
bool _resetMode { true };