Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -2091,7 +2091,7 @@ void Application::paintGL() { · 2090 unmodified lines | |||
| 2091 | _myCamera.setOrientation(glm::quat_cast(camMat)); | 2091 | _myCamera.setOrientation(glm::quat_cast(camMat)); |
| 2092 | } else { | 2092 | } else { |
| 2093 | _myCamera.setPosition(myAvatar->getDefaultEyePosition()); | 2093 | _myCamera.setPosition(myAvatar->getDefaultEyePosition()); |
| 2094 | _myCamera.setOrientation(myAvatar->getMyHead()->getCameraOrientation()); | 2094 | _myCamera.setOrientation(myAvatar->getMyHead()->getHeadOrientation()); |
| 2095 | } | 2095 | } |
| 2096 | } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { | 2096 | } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { |
| 2097 | if (isHMDMode()) { | 2097 | if (isHMDMode()) { |
| @@ -4047,9 +4047,9 @@ void Application::updateMyAvatarLookAtPosition() { · 1949 unmodified lines | |||
| 4047 | } else { | 4047 | } else { |
| 4048 | // I am not looking at anyone else, so just look forward | 4048 | // I am not looking at anyone else, so just look forward |
| 4049 | if (isHMD) { | 4049 | if (isHMD) { |
| 4050 | glm::mat4 worldHMDMat = myAvatar->getSensorToWorldMatrix() * | 4050 | glm::mat4 worldHeadMat = myAvatar->getSensorToWorldMatrix() * |
| 4051 | myAvatar->getHeadControllerPoseInSensorFrame().getMatrix() * Matrices::Y_180; | 4051 | myAvatar->getHeadControllerPoseInSensorFrame().getMatrix(); |
| 4052 | lookAtSpot = transformPoint(worldHMDMat, glm::vec3(0.0f, 0.0f, -TREE_SCALE)); | 4052 | lookAtSpot = transformPoint(worldHeadMat, glm::vec3(0.0f, 0.0f, TREE_SCALE)); |
| 4053 | } else { | 4053 | } else { |
| 4054 | lookAtSpot = myAvatar->getHead()->getEyePosition() + | 4054 | lookAtSpot = myAvatar->getHead()->getEyePosition() + |
| 4055 | (myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE)); | 4055 | (myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE)); |