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

in deriveBodyFromHMDSensor, avoid using invalid head pose

Browse source
This commit is contained in:
Seth Alves 2017-06-05 08:58:40 -07:00
parent 1b719ee654
commit 27669d44a7
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2338,10 +2338,13 @@ glm::quat MyAvatar::getWorldBodyOrientation() const {
// old school meat hook style // old school meat hook style
glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const { glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const {
glm::vec3 headPosition;
// HMD is in sensor space. glm::quat headOrientation;
const glm::vec3 headPosition = getHeadControllerPoseInSensorFrame().translation; auto headPose = getHeadControllerPoseInSensorFrame();
const glm::quat headOrientation = getHeadControllerPoseInSensorFrame().rotation * Quaternions::Y_180; if (headPose.isValid()) {
headPosition = getHeadControllerPoseInSensorFrame().translation;
headOrientation = getHeadControllerPoseInSensorFrame().rotation * Quaternions::Y_180;
}
const glm::quat headOrientationYawOnly = cancelOutRollAndPitch(headOrientation); const glm::quat headOrientationYawOnly = cancelOutRollAndPitch(headOrientation);
const Rig& rig = _skeletonModel->getRig(); const Rig& rig = _skeletonModel->getRig();