History

Merge pull request #3034 from Barnold1953/OculusOverlay

New Oculus Magnification Windows

Brad Hefta-Gaub committed 12 years ago

Commit dead4742 parents cee6f1b 64725dd4 files · +281 −59Browse files

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

Unified · Split

interface/src/Application.cpp+8−1
@@ -655,7 +655,14 @@ void Application::paintGL() { · 654 unmodified lines
655655
656656 {
657657 PerformanceTimer perfTimer("paintGL/renderOverlay");
658− _applicationOverlay.renderOverlay();
658+ //If alpha is 1, we can render directly to the screen.
659+ if (_applicationOverlay.getAlpha() == 1.0f) {
660+ _applicationOverlay.renderOverlay();
661+ } else {
662+ //Render to to texture so we can fade it
663+ _applicationOverlay.renderOverlay(true);
664+ _applicationOverlay.displayOverlayTexture();
665+ }
659666 }
660667 }
661668