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

get rid of _trackedHeadPosition

Browse source 
(cherry picked from commit e909938b232e11400832ae7dd29de16968967668)
This commit is contained in:
Seth Alves 2017-04-19 07:21:50 -07:00 committed by Anthony J. Thibault
parent 0cd2863df4
commit 23592f4a53
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -642,7 +642,6 @@ void MyAvatar::updateSensorToWorldMatrix() {
updateJointFromController(controller::Action::RIGHT_HAND, _controllerRightHandMatrixCache);
}
// Update avatar head rotation with sensor data
void MyAvatar::updateFromTrackers(float deltaTime) {
glm::vec3 estimatedPosition, estimatedRotation;
@ -659,14 +658,8 @@ void MyAvatar::updateFromTrackers(float deltaTime) {
if (inHmd) {
estimatedPosition = extractTranslation(getHMDSensorMatrix());
estimatedPosition.x *= -1.0f;
_trackedHeadPosition = estimatedPosition;
// wut
// const float OCULUS_LEAN_SCALE = 0.05f;
// estimatedPosition /= OCULUS_LEAN_SCALE;
} else if (inFacetracker) {
estimatedPosition = tracker->getHeadTranslation();
_trackedHeadPosition = estimatedPosition;
estimatedRotation = glm::degrees(safeEulerAngles(tracker->getHeadRotation()));
}
@ -1429,7 +1422,6 @@ void MyAvatar::setHeadControllerPoseInSensorFrame(const controller::Pose& headPo
Head* head = getHead();
if (inHmd) {
_headControllerPoseInSensorFrameCache.set(headPose);
_trackedHeadPosition = headPose.translation;
head->setDeltaPitch(headPose.rotation.x);
head->setDeltaYaw(headPose.rotation.y);
head->setDeltaRoll(headPose.rotation.z);

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

@ -353,7 +353,6 @@ public:
eyeContactTarget getEyeContactTarget();
Q_INVOKABLE glm::vec3 getTrackedHeadPosition() const { return _trackedHeadPosition; }
Q_INVOKABLE glm::vec3 getHeadPosition() const { return getHead()->getPosition(); }
Q_INVOKABLE float getHeadFinalYaw() const { return getHead()->getFinalYaw(); }
Q_INVOKABLE float getHeadFinalRoll() const { return getHead()->getFinalRoll(); }