History

Merging

samcake committed 11 years ago

Commit 910038c2 parents 21f53f1 7b5cbbf46 files · +2342 −1034Browse files

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

Unified · Split

interface/src/Application.cpp+20−11
@@ -1151,14 +1151,27 @@ void Application::paintGL() { · 1150 unmodified lines
11511151 }
11521152
11531153 } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
1154− _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
1155− _myCamera.setPosition(_myAvatar->getDefaultEyePosition() +
1156− glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0) +
1157− (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
1158− glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
1154+ if (isHMDMode()) {
1155+ glm::quat hmdRotation = extractRotation(_myAvatar->getHMDSensorMatrix());
1156+ _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation()
1157+ * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)) * hmdRotation);
1158+ glm::vec3 hmdOffset = extractTranslation(_myAvatar->getHMDSensorMatrix());
1159+ _myCamera.setPosition(_myAvatar->getDefaultEyePosition()
1160+ + glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0)
1161+ + (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
1162+ glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
1163+ + (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f))) * hmdOffset);
1164+ } else {
1165+ _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation()
1166+ * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
1167+ _myCamera.setPosition(_myAvatar->getDefaultEyePosition()
1168+ + glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0)
1169+ + (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
1170+ glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
1171+ }
11591172 renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
11601173 }
1161− // Update camera position
1174+ // Update camera position
11621175 if (!isHMDMode()) {
11631176 _myCamera.update(1.0f / _fps);
11641177 }
@@ -2600,11 +2613,7 @@ void Application::updateMyAvatarLookAtPosition() { · 1435 unmodified lines
26002613 if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
26012614 // When I am in mirror mode, just look right at the camera (myself); don't switch gaze points because when physically
26022615 // looking in a mirror one's eyes appear steady.
2603− if (!isHMD) {
2604− lookAtSpot = _myCamera.getPosition();
2605− } else {
2606− lookAtSpot = _myCamera.getPosition() + transformPoint(_myAvatar->getSensorToWorldMatrix(), extractTranslation(getHMDSensorPose()));
2607− }
2616+ lookAtSpot = _myCamera.getPosition();
26082617 } else if (eyeTracker->isTracking() && (isHMD || eyeTracker->isSimulating())) {
26092618 // Look at the point that the user is looking at.
26102619 if (isHMD) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t