History

Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action

Seth Alves committed 10 years ago

Commit ea202c52 parents d7affcf 0c1ae5b17 files · +144 −119Browse files

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

Unified · Split

interface/src/Application.cpp+2−3
@@ -1260,15 +1260,14 @@ void Application::paintGL() { · 1259 unmodified lines
12601260 hmdOffset.x = -hmdOffset.x;
12611261
12621262 _myCamera.setPosition(myAvatar->getDefaultEyePosition()
1263− + glm::vec3(0, _raiseMirror * myAvatar->getAvatarScale(), 0)
1263+ + glm::vec3(0, _raiseMirror * myAvatar->getUniformScale(), 0)
12641264 + mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
12651265 + mirrorBodyOrientation * hmdOffset);
1266−
12671266 } else {
12681267 _myCamera.setRotation(myAvatar->getWorldAlignedOrientation()
12691268 * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
12701269 _myCamera.setPosition(myAvatar->getDefaultEyePosition()
1271− + glm::vec3(0, _raiseMirror * myAvatar->getAvatarScale(), 0)
1270+ + glm::vec3(0, _raiseMirror * myAvatar->getUniformScale(), 0)
12721271 + (myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
12731272 glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
12741273 }