Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -676,9 +676,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 675 unmodified lines | |||
| 676 | _applicationStateDevice->addInputVariant(QString("ComfortMode"), controller::StateController::ReadLambda([]() -> float { | 676 | _applicationStateDevice->addInputVariant(QString("ComfortMode"), controller::StateController::ReadLambda([]() -> float { |
| 677 | return (float)Menu::getInstance()->isOptionChecked(MenuOption::ComfortMode); | 677 | return (float)Menu::getInstance()->isOptionChecked(MenuOption::ComfortMode); |
| 678 | })); | 678 | })); |
| 679 | _applicationStateDevice->addInputVariant(QString("Grounded"), controller::StateController::ReadLambda([]() -> float { | 679 | _applicationStateDevice->addInputVariant(QString("Grounded"), controller::StateController::ReadLambda([]() -> float { |
| 680 | return (float)qApp->getMyAvatar()->getCharacterController()->onGround(); | 680 | return (float)qApp->getMyAvatar()->getCharacterController()->onGround(); |
| 681 | })); | 681 | })); |
| 682 | 682 | ||
| 683 | userInputMapper->registerDevice(_applicationStateDevice); | 683 | userInputMapper->registerDevice(_applicationStateDevice); |
| 684 | 684 | ||
| @@ -1347,7 +1347,7 @@ void Application::paintGL() { · 662 unmodified lines | |||
| 1347 | { | 1347 | { |
| 1348 | PROFILE_RANGE(__FUNCTION__ "/compositor"); | 1348 | PROFILE_RANGE(__FUNCTION__ "/compositor"); |
| 1349 | PerformanceTimer perfTimer("compositor"); | 1349 | PerformanceTimer perfTimer("compositor"); |
| 1350 | auto primaryFbo = framebufferCache->getPrimaryFramebuffer(); | 1350 | auto primaryFbo = framebufferCache->getPrimaryFramebufferDepthColor(); |
| 1351 | glBindFramebuffer(GL_DRAW_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(primaryFbo)); | 1351 | glBindFramebuffer(GL_DRAW_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(primaryFbo)); |
| 1352 | if (displayPlugin->isStereo()) { | 1352 | if (displayPlugin->isStereo()) { |
| 1353 | QRect currentViewport(QPoint(0, 0), QSize(size.width() / 2, size.height())); | 1353 | QRect currentViewport(QPoint(0, 0), QSize(size.width() / 2, size.height())); |
| @@ -1372,7 +1372,7 @@ void Application::paintGL() { · 18 unmodified lines | |||
| 1372 | { | 1372 | { |
| 1373 | PROFILE_RANGE(__FUNCTION__ "/pluginOutput"); | 1373 | PROFILE_RANGE(__FUNCTION__ "/pluginOutput"); |
| 1374 | PerformanceTimer perfTimer("pluginOutput"); | 1374 | PerformanceTimer perfTimer("pluginOutput"); |
| 1375 | auto primaryFbo = framebufferCache->getPrimaryFramebuffer(); | 1375 | auto primaryFbo = framebufferCache->getPrimaryFramebufferDepthColor(); |
| 1376 | GLuint finalTexture = gpu::GLBackend::getTextureID(primaryFbo->getRenderBuffer(0)); | 1376 | GLuint finalTexture = gpu::GLBackend::getTextureID(primaryFbo->getRenderBuffer(0)); |
| 1377 | // Ensure the rendering context commands are completed when rendering | 1377 | // Ensure the rendering context commands are completed when rendering |
| 1378 | GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); | 1378 | GLsync sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); |