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

Merge pull request #2953 from PhilipRosedale/master

Browse source 
Fixes having large yaw movements get head and body out of alignment with oculus
This commit is contained in:
Andrzej Kapolka 2014-05-29 19:00:37 -07:00
commit b93b009cd8
2 changed files with 5 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,8 +76,7 @@ MyAvatar::MyAvatar() :
_lastFloorContactPoint(0.0f), _lastFloorContactPoint(0.0f),
_lookAtTargetAvatar(), _lookAtTargetAvatar(),
_shouldRender(true), _shouldRender(true),
_billboardValid(false), _billboardValid(false)
_oculusYawOffset(0.0f)
{ {
for (int i = 0; i < MAX_DRIVE_KEYS; i++) { for (int i = 0; i < MAX_DRIVE_KEYS; i++) {
_driveKeys[i] = 0.0f; _driveKeys[i] = 0.0f;
@ -91,7 +90,6 @@ MyAvatar::~MyAvatar() {
void MyAvatar::reset() { void MyAvatar::reset() {
_skeletonModel.reset(); _skeletonModel.reset();
getHead()->reset(); getHead()->reset();
_oculusYawOffset = 0.0f;
setVelocity(glm::vec3(0.0f)); setVelocity(glm::vec3(0.0f));
setThrust(glm::vec3(0.0f)); setThrust(glm::vec3(0.0f));
@ -864,43 +862,8 @@ void MyAvatar::updateOrientation(float deltaTime) {
OculusManager::getEulerAngles(yaw, pitch, roll); OculusManager::getEulerAngles(yaw, pitch, roll);
// ... so they need to be converted to degrees before we do math... // ... so they need to be converted to degrees before we do math...
// The neck is limited in how much it can yaw, so we check its relative
// yaw from the body and yaw the body if necessary.
yaw *= DEGREES_PER_RADIAN;
float bodyToHeadYaw = yaw - _oculusYawOffset;
const float MAX_NECK_YAW = 85.0f; // degrees
if ((fabs(bodyToHeadYaw) > 2.0f * MAX_NECK_YAW) && (yaw * _oculusYawOffset < 0.0f)) {
// We've wrapped around the range for yaw so adjust
// the measured yaw to be relative to _oculusYawOffset.
if (yaw > 0.0f) {
yaw -= 360.0f;
} else {
yaw += 360.0f;
}
bodyToHeadYaw = yaw - _oculusYawOffset;
}
float delta = fabs(bodyToHeadYaw) - MAX_NECK_YAW;
if (delta > 0.0f) {
yaw = MAX_NECK_YAW;
if (bodyToHeadYaw < 0.0f) {
delta *= -1.0f;
bodyToHeadYaw = -MAX_NECK_YAW;
} else {
bodyToHeadYaw = MAX_NECK_YAW;
}
// constrain _oculusYawOffset to be within range [-180,180]
_oculusYawOffset = fmod((_oculusYawOffset + delta) + 180.0f, 360.0f) - 180.0f;
// We must adjust the body orientation using a delta rotation (rather than
// doing yaw math) because the body's yaw ranges are not the same
// as what the Oculus API provides.
glm::quat bodyCorrection = glm::angleAxis(glm::radians(delta), _worldUpDirection);
orientation = orientation * bodyCorrection;
}
Head* head = getHead(); Head* head = getHead();
head->setBaseYaw(bodyToHeadYaw); head->setBaseYaw(yaw * DEGREES_PER_RADIAN);
head->setBasePitch(pitch * DEGREES_PER_RADIAN); head->setBasePitch(pitch * DEGREES_PER_RADIAN);
head->setBaseRoll(roll * DEGREES_PER_RADIAN); head->setBaseRoll(roll * DEGREES_PER_RADIAN);
} }

4
libraries/avatars/src/HeadData.h
View file

@ -20,8 +20,8 @@
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
// degrees // degrees
const float MIN_HEAD_YAW = -110.f; const float MIN_HEAD_YAW = -180.f;
const float MAX_HEAD_YAW = 110.f; const float MAX_HEAD_YAW = 180.f;
const float MIN_HEAD_PITCH = -60.f; const float MIN_HEAD_PITCH = -60.f;
const float MAX_HEAD_PITCH = 60.f; const float MAX_HEAD_PITCH = 60.f;
const float MIN_HEAD_ROLL = -50.f; const float MIN_HEAD_ROLL = -50.f;