History

Revert "Merge pull request #5106 from jherico/render_cursor"

This reverts commit 4d18bd7cec710b5188d1f6ad5c58010117d7a77d, reversing changes made to 24fda9a7336e4eff1d1310dd3359dd6cbbb6acb5.

ZappoMan committed 11 years ago

Commit 0cdc2b51 parent a5b286610 files · +467 −325Browse files

Showing the changes to interface/src/devices/OculusManager.cpp (1 of 10 files). Show all

Unified · Split

interface/src/devices/OculusManager.cpp+3−2
@@ -615,10 +615,12 @@ void OculusManager::display(QGLWidget * glCanvas, RenderArgs* renderArgs, const · 614 unmodified lines
615 615
616 renderArgs->_renderSide = RenderArgs::MONO;616 renderArgs->_renderSide = RenderArgs::MONO;
617 qApp->displaySide(renderArgs, *_camera, false);617 qApp->displaySide(renderArgs, *_camera, false);
618 qApp->getApplicationOverlay().displayOverlayTextureHmd(renderArgs, *_camera);618 qApp->getApplicationOverlay().displayOverlayTextureHmd(*_camera);
619 });619 });
620 _activeEye = ovrEye_Count;620 _activeEye = ovrEye_Count;
621 621
622 glPopMatrix();
623
622 gpu::FramebufferPointer finalFbo;624 gpu::FramebufferPointer finalFbo;
623 //Bind the output texture from the glow shader. If glow effect is disabled, we just grab the texture625 //Bind the output texture from the glow shader. If glow effect is disabled, we just grab the texture
624 if (Menu::getInstance()->isOptionChecked(MenuOption::EnableGlowEffect)) {626 if (Menu::getInstance()->isOptionChecked(MenuOption::EnableGlowEffect)) {
@@ -629,7 +631,6 @@ void OculusManager::display(QGLWidget * glCanvas, RenderArgs* renderArgs, const · 4 unmodified lines
629 finalFbo = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer(); 631 finalFbo = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer();
630 glBindFramebuffer(GL_FRAMEBUFFER, 0);632 glBindFramebuffer(GL_FRAMEBUFFER, 0);
631 }633 }
632 glPopMatrix();
633 634
634 glMatrixMode(GL_PROJECTION);635 glMatrixMode(GL_PROJECTION);
635 glPopMatrix();636 glPopMatrix();