Showing the changes to interface/src/Application.cpp (1 of 65 files). Show all
Unified · Split
| @@ -829,8 +829,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 828 unmodified lines | |||
| 829 | _applicationStateDevice->addInputVariant(QString("InHMD"), controller::StateController::ReadLambda([]() -> float { | 829 | _applicationStateDevice->addInputVariant(QString("InHMD"), controller::StateController::ReadLambda([]() -> float { |
| 830 | return (float)qApp->getAvatarUpdater()->isHMDMode(); | 830 | return (float)qApp->getAvatarUpdater()->isHMDMode(); |
| 831 | })); | 831 | })); |
| 832 | _applicationStateDevice->addInputVariant(QString("ComfortMode"), controller::StateController::ReadLambda([]() -> float { | 832 | _applicationStateDevice->addInputVariant(QString("SnapTurn"), controller::StateController::ReadLambda([]() -> float { |
| 833 | return (float)Menu::getInstance()->isOptionChecked(MenuOption::ComfortMode); | 833 | return (float)qApp->getMyAvatar()->getSnapTurn(); |
| 834 | })); | 834 | })); |
| 835 | _applicationStateDevice->addInputVariant(QString("Grounded"), controller::StateController::ReadLambda([]() -> float { | 835 | _applicationStateDevice->addInputVariant(QString("Grounded"), controller::StateController::ReadLambda([]() -> float { |
| 836 | return (float)qApp->getMyAvatar()->getCharacterController()->onGround(); | 836 | return (float)qApp->getMyAvatar()->getCharacterController()->onGround(); |
| @@ -1515,7 +1515,7 @@ void Application::paintGL() { · 678 unmodified lines | |||
| 1515 | // just relying on the left FOV in each case and hoping that the | 1515 | // just relying on the left FOV in each case and hoping that the |
| 1516 | // overall culling margin of error doesn't cause popping in the | 1516 | // overall culling margin of error doesn't cause popping in the |
| 1517 | // right eye. There are FIXMEs in the relevant plugins | 1517 | // right eye. There are FIXMEs in the relevant plugins |
| 1518 | _myCamera.setProjection(displayPlugin->getProjection(Mono, _myCamera.getProjection())); | 1518 | _myCamera.setProjection(displayPlugin->getCullingProjection(_myCamera.getProjection())); |
| 1519 | renderArgs._context->enableStereo(true); | 1519 | renderArgs._context->enableStereo(true); |
| 1520 | mat4 eyeOffsets[2]; | 1520 | mat4 eyeOffsets[2]; |
| 1521 | mat4 eyeProjections[2]; | 1521 | mat4 eyeProjections[2]; |
| @@ -1546,7 +1546,7 @@ void Application::paintGL() { · 24 unmodified lines | |||
| 1546 | 1546 | ||
| 1547 | displayPlugin->setEyeRenderPose(_frameCount, eye, headPose); | 1547 | displayPlugin->setEyeRenderPose(_frameCount, eye, headPose); |
| 1548 | 1548 | ||
| 1549 | eyeProjections[eye] = displayPlugin->getProjection(eye, baseProjection); | 1549 | eyeProjections[eye] = displayPlugin->getEyeProjection(eye, baseProjection); |
| 1550 | }); | 1550 | }); |
| 1551 | renderArgs._context->setStereoProjections(eyeProjections); | 1551 | renderArgs._context->setStereoProjections(eyeProjections); |
| 1552 | renderArgs._context->setStereoViews(eyeOffsets); | 1552 | renderArgs._context->setStereoViews(eyeOffsets); |
| @@ -5042,7 +5042,7 @@ void Application::updateInputModes() { · 3489 unmodified lines | |||
| 5042 | 5042 | ||
| 5043 | mat4 Application::getEyeProjection(int eye) const { | 5043 | mat4 Application::getEyeProjection(int eye) const { |
| 5044 | if (isHMDMode()) { | 5044 | if (isHMDMode()) { |
| 5045 | return getActiveDisplayPlugin()->getProjection((Eye)eye, _viewFrustum.getProjection()); | 5045 | return getActiveDisplayPlugin()->getEyeProjection((Eye)eye, _viewFrustum.getProjection()); |
| 5046 | } | 5046 | } |
| 5047 | 5047 | ||
| 5048 | return _viewFrustum.getProjection(); | 5048 | return _viewFrustum.getProjection(); |