Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -3953,6 +3953,7 @@ void Application::updateMyAvatarLookAtPosition() { · 3952 unmodified lines | |||
| 3953 | lookAtPosition.x = -lookAtPosition.x; | 3953 | lookAtPosition.x = -lookAtPosition.x; |
| 3954 | } | 3954 | } |
| 3955 | if (isHMD) { | 3955 | if (isHMD) { |
| 3956 | // TODO -- this code is probably wrong, getHeadPose() returns something in sensor frame, not avatar | ||
| 3956 | glm::mat4 headPose = getActiveDisplayPlugin()->getHeadPose(); | 3957 | glm::mat4 headPose = getActiveDisplayPlugin()->getHeadPose(); |
| 3957 | glm::quat hmdRotation = glm::quat_cast(headPose); | 3958 | glm::quat hmdRotation = glm::quat_cast(headPose); |
| 3958 | lookAtSpot = _myCamera.getPosition() + myAvatar->getOrientation() * (hmdRotation * lookAtPosition); | 3959 | lookAtSpot = _myCamera.getPosition() + myAvatar->getOrientation() * (hmdRotation * lookAtPosition); |
| @@ -3995,7 +3996,8 @@ void Application::updateMyAvatarLookAtPosition() { · 36 unmodified lines | |||
| 3995 | } else { | 3996 | } else { |
| 3996 | // I am not looking at anyone else, so just look forward | 3997 | // I am not looking at anyone else, so just look forward |
| 3997 | if (isHMD) { | 3998 | if (isHMD) { |
| 3998 | glm::mat4 worldHMDMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix(); | 3999 | glm::mat4 worldHMDMat = myAvatar->getSensorToWorldMatrix() * |
| 4000 | (glm::mat4)myAvatar->getHeadControllerPoseInSensorFrame(); | ||
| 3999 | lookAtSpot = transformPoint(worldHMDMat, glm::vec3(0.0f, 0.0f, -TREE_SCALE)); | 4001 | lookAtSpot = transformPoint(worldHMDMat, glm::vec3(0.0f, 0.0f, -TREE_SCALE)); |
| 4000 | } else { | 4002 | } else { |
| 4001 | lookAtSpot = myAvatar->getHead()->getEyePosition() + | 4003 | lookAtSpot = myAvatar->getHead()->getEyePosition() + |