History

Merge pull request #11036 from AndrewMeadows/walkabout

fix bugs preventing avatar from walking on spherical planet

Anthony Thibault committed 9 years ago

Commit 8a87ebd2 parents b9456ab 3ec964012 files · +68 −84Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -2323,7 +2323,7 @@ void Application::paintGL() { · 2322 unmodified lines
23232323 }
23242324 } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
23252325 if (isHMDMode()) {
2326− auto mirrorBodyOrientation = myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f));
2326+ auto mirrorBodyOrientation = myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f));
23272327
23282328 glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
23292329 // Mirror HMD yaw and roll
@@ -2345,7 +2345,7 @@ void Application::paintGL() { · 15 unmodified lines
23452345 + mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
23462346 + mirrorBodyOrientation * hmdOffset);
23472347 } else {
2348− _myCamera.setOrientation(myAvatar->getWorldAlignedOrientation()
2348+ _myCamera.setOrientation(myAvatar->getOrientation()
23492349 * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
23502350 _myCamera.setPosition(myAvatar->getDefaultEyePosition()
23512351 + glm::vec3(0, _raiseMirror * myAvatar->getUniformScale(), 0)