History

work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation

Seth Alves committed 9 years ago

Commit 3359a0a1 parent c40a76f5 files · +57 −47Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+4−4
@@ -2091,7 +2091,7 @@ void Application::paintGL() { · 2090 unmodified lines
20912091 _myCamera.setOrientation(glm::quat_cast(camMat));
20922092 } else {
20932093 _myCamera.setPosition(myAvatar->getDefaultEyePosition());
2094− _myCamera.setOrientation(myAvatar->getMyHead()->getCameraOrientation());
2094+ _myCamera.setOrientation(myAvatar->getMyHead()->getHeadOrientation());
20952095 }
20962096 } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
20972097 if (isHMDMode()) {
@@ -4047,9 +4047,9 @@ void Application::updateMyAvatarLookAtPosition() { · 1949 unmodified lines
40474047 } else {
40484048 // I am not looking at anyone else, so just look forward
40494049 if (isHMD) {
4050− glm::mat4 worldHMDMat = myAvatar->getSensorToWorldMatrix() *
4051− myAvatar->getHeadControllerPoseInSensorFrame().getMatrix() * Matrices::Y_180;
4052− lookAtSpot = transformPoint(worldHMDMat, glm::vec3(0.0f, 0.0f, -TREE_SCALE));
4050+ glm::mat4 worldHeadMat = myAvatar->getSensorToWorldMatrix() *
4051+ myAvatar->getHeadControllerPoseInSensorFrame().getMatrix();
4052+ lookAtSpot = transformPoint(worldHeadMat, glm::vec3(0.0f, 0.0f, TREE_SCALE));
40534053 } else {
40544054 lookAtSpot = myAvatar->getHead()->getEyePosition() +
40554055 (myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE));