History

Alternate shader

Bradley Austin Davis committed 8 years ago

Commit 803bd281 parent 72526782 files · +44 −31Browse files

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

Unified · Split

interface/src/Application.cpp+4−1
@@ -2671,6 +2671,9 @@ void Application::initializeDisplayPlugins() { · 2670 unmodified lines
2671 batch.enableSkybox(true);2671 batch.enableSkybox(true);
2672 batch.enableStereo(_appRenderArgs._isStereo);2672 batch.enableStereo(_appRenderArgs._isStereo);
2673 batch.setViewportTransform({ 0, 0, finalFramebuffer->getSize() });2673 batch.setViewportTransform({ 0, 0, finalFramebuffer->getSize() });
2674 batch.runLambda([] {
2675 // update uniform values
2676 });
2674 procedural->render(batch, _appRenderArgs._renderArgs.getViewFrustum());2677 procedural->render(batch, _appRenderArgs._renderArgs.getViewFrustum());
2675 });2678 });
2676 auto frame = _gpuContext->endFrame();2679 auto frame = _gpuContext->endFrame();
@@ -3016,7 +3019,7 @@ void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) { · 339 unmodified lines
3016 _thirdPersonHMDCameraBoomValid = false;3019 _thirdPersonHMDCameraBoomValid = false;
3017 3020
3018 _myCamera.setOrientation(myAvatar->getHead()->getOrientation());3021 _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
3019 if (Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {3022 if (isOptionChecked(MenuOption::CenterPlayerInView)) {
3020 _myCamera.setPosition(myAvatar->getDefaultEyePosition()3023 _myCamera.setPosition(myAvatar->getDefaultEyePosition()
3021 + _myCamera.getOrientation() * boomOffset);3024 + _myCamera.getOrientation() * boomOffset);
3022 }3025 }