Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -3099,12 +3099,12 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 3098 unmodified lines | |||
| 3099 | if (billboard) { | 3099 | if (billboard) { |
| 3100 | _mirrorCamera.setFieldOfView(BILLBOARD_FIELD_OF_VIEW); // degees | 3100 | _mirrorCamera.setFieldOfView(BILLBOARD_FIELD_OF_VIEW); // degees |
| 3101 | _mirrorCamera.setPosition(_myAvatar->getPosition() + | 3101 | _mirrorCamera.setPosition(_myAvatar->getPosition() + |
| 3102 | _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, 1.0f) * BILLBOARD_DISTANCE * _myAvatar->getScale()); | 3102 | _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * BILLBOARD_DISTANCE * _myAvatar->getScale()); |
| 3103 | 3103 | ||
| 3104 | } else if (_rearMirrorTools->getZoomLevel() == BODY) { | 3104 | } else if (_rearMirrorTools->getZoomLevel() == BODY) { |
| 3105 | _mirrorCamera.setFieldOfView(MIRROR_FIELD_OF_VIEW); // degrees | 3105 | _mirrorCamera.setFieldOfView(MIRROR_FIELD_OF_VIEW); // degrees |
| 3106 | _mirrorCamera.setPosition(_myAvatar->getChestPosition() + | 3106 | _mirrorCamera.setPosition(_myAvatar->getChestPosition() + |
| 3107 | _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, 1.0f) * MIRROR_REARVIEW_BODY_DISTANCE * _myAvatar->getScale()); | 3107 | _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * MIRROR_REARVIEW_BODY_DISTANCE * _myAvatar->getScale()); |
| 3108 | 3108 | ||
| 3109 | } else { // HEAD zoom level | 3109 | } else { // HEAD zoom level |
| 3110 | _mirrorCamera.setFieldOfView(MIRROR_FIELD_OF_VIEW); // degrees | 3110 | _mirrorCamera.setFieldOfView(MIRROR_FIELD_OF_VIEW); // degrees |
| @@ -3112,11 +3112,11 @@ void Application::renderRearViewMirror(const QRect& region, bool billboard) { · 1 unmodified line | |||
| 3112 | // as a hack until we have a better way of dealing with coordinate precision issues, reposition the | 3112 | // as a hack until we have a better way of dealing with coordinate precision issues, reposition the |
| 3113 | // face/body so that the average eye position lies at the origin | 3113 | // face/body so that the average eye position lies at the origin |
| 3114 | eyeRelativeCamera = true; | 3114 | eyeRelativeCamera = true; |
| 3115 | _mirrorCamera.setPosition(glm::vec3()); | 3115 | _mirrorCamera.setPosition(_myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale()); |
| 3116 | 3116 | ||
| 3117 | } else { | 3117 | } else { |
| 3118 | _mirrorCamera.setPosition(_myAvatar->getHead()->getEyePosition() + | 3118 | _mirrorCamera.setPosition(_myAvatar->getHead()->getEyePosition() + |
| 3119 | _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, 1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale()); | 3119 | _myAvatar->getOrientation() * glm::vec3(0.f, 0.f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale()); |
| 3120 | } | 3120 | } |
| 3121 | } | 3121 | } |
| 3122 | _mirrorCamera.setAspectRatio((float)region.width() / region.height()); | 3122 | _mirrorCamera.setAspectRatio((float)region.width() / region.height()); |