History

Fixed glow/ambient occlusion with Oculus.

Andrzej Kapolka committed 13 years ago

Commit d63bb3a1 parent f39050a9 files · +75 −49Browse files

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

Unified · Split

interface/src/Application.cpp+15−30
@@ -35,6 +35,7 @@ · 34 unmodified lines
3535 #include <QMenuBar>
3636 #include <QMouseEvent>
3737 #include <QNetworkAccessManager>
38+#include <QOpenGLFramebufferObject>
3839 #include <QWheelEvent>
3940 #include <QSettings>
4041 #include <QShortcut>
@@ -112,7 +113,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 71 unmodified lines
112113 _lookatIndicatorScale(1.0f),
113114 _perfStatsOn(false),
114115 _chatEntryOn(false),
115− _oculusTextureID(0),
116116 _oculusProgram(0),
117117 _oculusDistortionScale(1.25),
118118 #ifndef _WIN32
@@ -370,13 +370,18 @@ void Application::paintGL() { · 251 unmodified lines
370370
371371 if (OculusManager::isConnected()) {
372372 displayOculus(whichCamera);
373+
373374 } else {
375+ _glowEffect.prepare();
376+
374377 glMatrixMode(GL_MODELVIEW);
375378 glPushMatrix();
376379 glLoadIdentity();
377380 displaySide(whichCamera);
378381 glPopMatrix();
379382
383+ _glowEffect.render();
384+
380385 displayOverlay();
381386 }
382387
@@ -400,13 +405,6 @@ void Application::resizeGL(int width, int height) { · 17 unmodified lines
400405 resetCamerasOnResizeGL(_viewFrustumOffsetCamera, width, height);
401406 resetCamerasOnResizeGL(_myCamera, width, height);
402407
403− // resize the render texture
404− if (OculusManager::isConnected() && _oculusTextureID != 0) {
405− glBindTexture(GL_TEXTURE_2D, _oculusTextureID);
406− glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
407− glBindTexture(GL_TEXTURE_2D, 0);
408− }
409−
410408 // Tell our viewFrustum about this change, using the application camera
411409 loadViewFrustum(_myCamera, _viewFrustum);
412410
@@ -2056,6 +2054,8 @@ static const char* DISTORTION_FRAGMENT_SHADER = · 1643 unmodified lines
20562054 "}";
20572055
20582056 void Application::displayOculus(Camera& whichCamera) {
2057+ _glowEffect.prepare();
2058+
20592059 // magic numbers ahoy! in order to avoid pulling in the Oculus utility library that calculates
20602060 // the rendering parameters from the hardware stats, i just folded their calculations into
20612061 // constants using the stats for the current-model hardware as contained in the SDK file
@@ -2098,12 +2098,10 @@ void Application::displayOculus(Camera& whichCamera) { · 36 unmodified lines
20982098 // restore our normal viewport
20992099 glViewport(0, 0, _glWidget->width(), _glWidget->height());
21002100
2101− if (_oculusTextureID == 0) {
2102− glGenTextures(1, &_oculusTextureID);
2103− glBindTexture(GL_TEXTURE_2D, _oculusTextureID);
2104− glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _glWidget->width(), _glWidget->height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
2105− glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
2106−
2101+ QOpenGLFramebufferObject* fbo = _glowEffect.render(true);
2102+ glBindTexture(GL_TEXTURE_2D, fbo->texture());
2103+
2104+ if (_oculusProgram == 0) {
21072105 _oculusProgram = new ProgramObject();
21082106 _oculusProgram->addShaderFromSourceCode(QGLShader::Fragment, DISTORTION_FRAGMENT_SHADER);
21092107 _oculusProgram->link();
@@ -2113,18 +2111,13 @@ void Application::displayOculus(Camera& whichCamera) { · 3 unmodified lines
21132111 _screenCenterLocation = _oculusProgram->uniformLocation("screenCenter");
21142112 _scaleLocation = _oculusProgram->uniformLocation("scale");
21152113 _scaleInLocation = _oculusProgram->uniformLocation("scaleIn");
2116− _hmdWarpParamLocation = _oculusProgram->uniformLocation("hmdWarpParam");
2117−
2118− } else {
2119− glBindTexture(GL_TEXTURE_2D, _oculusTextureID);
2114+ _hmdWarpParamLocation = _oculusProgram->uniformLocation("hmdWarpParam");
21202115 }
2121− glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, _glWidget->width(), _glWidget->height());
2122−
2116+
21232117 glMatrixMode(GL_PROJECTION);
21242118 glLoadIdentity();
21252119 gluOrtho2D(0, _glWidget->width(), 0, _glWidget->height());
21262120 glDisable(GL_DEPTH_TEST);
2127− glDisable(GL_LIGHTING);
21282121
21292122 // for reference on setting these values, see SDK file Samples/OculusRoomTiny/RenderTiny_Device.cpp
21302123
@@ -2132,7 +2125,6 @@ void Application::displayOculus(Camera& whichCamera) { · 1 unmodified line
21322125 float aspectRatio = (_glWidget->width() * 0.5) / _glWidget->height();
21332126
21342127 glDisable(GL_BLEND);
2135− glEnable(GL_TEXTURE_2D);
21362128 _oculusProgram->bind();
21372129 _oculusProgram->setUniformValue(_textureLocation, 0);
21382130 _oculusProgram->setUniformValue(_lensCenterLocation, 0.287994, 0.5); // see SDK docs, p. 29
@@ -2168,7 +2160,6 @@ void Application::displayOculus(Camera& whichCamera) { · 29 unmodified lines
21682160 glEnd();
21692161
21702162 glEnable(GL_BLEND);
2171− glDisable(GL_TEXTURE_2D);
21722163 glBindTexture(GL_TEXTURE_2D, 0);
21732164 _oculusProgram->release();
21742165
@@ -2229,9 +2220,6 @@ void Application::displaySide(Camera& whichCamera) { · 54 unmodified lines
22292220 // Setup 3D lights (after the camera transform, so that they are positioned in world space)
22302221 setupWorldLight(whichCamera);
22312222
2232− // prepare the glow effect
2233− _glowEffect.prepare();
2234−
22352223 if (Menu::getInstance()->isOptionChecked(MenuOption::Stars)) {
22362224 if (!_stars.getFileLoaded()) {
22372225 _stars.readInput(STAR_FILE, STAR_CACHE_FILE, 0);
@@ -2372,7 +2360,7 @@ void Application::displaySide(Camera& whichCamera) { · 134 unmodified lines
23722360 _myAvatar.renderScreenTint(SCREEN_TINT_AFTER_AVATARS, whichCamera);
23732361
23742362 // Render the world box
2375− if (!Menu::getInstance()->isOptionChecked(MenuOption::Mirror) && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
2363+ if (!Menu::getInstance()->isOptionChecked(MenuOption::Mirror) && Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
23762364 renderWorldBox();
23772365 }
23782366
@@ -2399,9 +2387,6 @@ void Application::displaySide(Camera& whichCamera) { · 20 unmodified lines
23992387 }
24002388
24012389 renderFollowIndicator();
2402−
2403− // render the glow effect
2404− _glowEffect.render();
24052390 }
24062391
24072392 void Application::displayOverlay() {

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