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
26712671 batch.enableSkybox(true);
26722672 batch.enableStereo(_appRenderArgs._isStereo);
26732673 batch.setViewportTransform({ 0, 0, finalFramebuffer->getSize() });
2674+ batch.runLambda([] {
2675+ // update uniform values
2676+ });
26742677 procedural->render(batch, _appRenderArgs._renderArgs.getViewFrustum());
26752678 });
26762679 auto frame = _gpuContext->endFrame();
@@ -3016,7 +3019,7 @@ void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) { · 339 unmodified lines
30163019 _thirdPersonHMDCameraBoomValid = false;
30173020
30183021 _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
3019− if (Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
3022+ if (isOptionChecked(MenuOption::CenterPlayerInView)) {
30203023 _myCamera.setPosition(myAvatar->getDefaultEyePosition()
30213024 + _myCamera.getOrientation() * boomOffset);
30223025 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t