From ebfb11c1ce601c15499d5178ea30fdb8ba89ad5a Mon Sep 17 00:00:00 2001 From: barnold1953 Date: Wed, 28 May 2014 10:46:46 -0700 Subject: [PATCH] Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory --- interface/src/Application.cpp | 4 +- interface/src/Application.h | 6 +-- interface/src/devices/OculusManager.cpp | 8 ++-- ...layRenderer.cpp => ApplicationOverlay.cpp} | 40 +++++++++---------- ...OverlayRenderer.h => ApplicationOverlay.h} | 16 ++++---- 5 files changed, 37 insertions(+), 37 deletions(-) rename interface/src/ui/{overlays/OverlayRenderer.cpp => ApplicationOverlay.cpp} (92%) rename interface/src/ui/{overlays/OverlayRenderer.h => ApplicationOverlay.h} (71%) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e8fc1b0d34..fac0ef154f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -165,7 +165,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _runningScriptsWidget(new RunningScriptsWidget(_window)), _runningScriptsWidgetWasVisible(false), _trayIcon(new QSystemTrayIcon(_window)), - _overlayRenderer() + _applicationOverlay() { // read the ApplicationInfo.ini file for Name/Version/Domain information QSettings applicationInfo(Application::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); @@ -646,7 +646,7 @@ void Application::paintGL() { _rearMirrorTools->render(true); } - _overlayRenderer.renderOverlay(); + _applicationOverlay.renderOverlay(); } _frameCount++; diff --git a/interface/src/Application.h b/interface/src/Application.h index 8b40ad522e..0065944611 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -83,7 +83,7 @@ #include "ui/LogDialog.h" #include "ui/UpdateDialog.h" #include "ui/overlays/Overlays.h" -#include "ui/overlays/OverlayRenderer.h" +#include "ui/ApplicationOverlay.h" #include "ui/RunningScriptsWidget.h" #include "voxels/VoxelFade.h" #include "voxels/VoxelHideShowThread.h" @@ -216,7 +216,7 @@ public: BandwidthMeter* getBandwidthMeter() { return &_bandwidthMeter; } QUndoStack* getUndoStack() { return &_undoStack; } QSystemTrayIcon* getTrayIcon() { return _trayIcon; } - OverlayRenderer& getOverlayRenderer() { return _overlayRenderer; } + ApplicationOverlay& getApplicationOverlay() { return _applicationOverlay; } Overlays& getOverlays() { return _overlays; } float getFps() const { return _fps; } @@ -569,7 +569,7 @@ private: TouchEvent _lastTouchEvent; Overlays _overlays; - OverlayRenderer _overlayRenderer; + ApplicationOverlay _applicationOverlay; AudioReflector _audioReflector; RunningScriptsWidget* _runningScriptsWidget; diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp index f7a61c2034..8f71d38bdb 100644 --- a/interface/src/devices/OculusManager.cpp +++ b/interface/src/devices/OculusManager.cpp @@ -81,9 +81,9 @@ void OculusManager::configureCamera(Camera& camera, int screenWidth, int screenH void OculusManager::display(Camera& whichCamera) { #ifdef HAVE_LIBOVR - OverlayRenderer& overlayRenderer = Application::getInstance()->getOverlayRenderer(); + ApplicationOverlay& applicationOverlay = Application::getInstance()->getApplicationOverlay(); // We only need to render the overlays to a texture once, then we just render the texture as a quad - overlayRenderer.renderOverlay(true); + applicationOverlay.renderOverlay(true); Application::getInstance()->getGlowEffect()->prepare(); @@ -104,7 +104,7 @@ void OculusManager::display(Camera& whichCamera) { Application::getInstance()->displaySide(whichCamera); - overlayRenderer.displayOverlayTextureOculus(whichCamera); + applicationOverlay.displayOverlayTextureOculus(whichCamera); // and the right eye to the right side const StereoEyeParams& rightEyeParams = _stereoConfig.GetEyeRenderParams(StereoEye_Right); @@ -121,7 +121,7 @@ void OculusManager::display(Camera& whichCamera) { Application::getInstance()->displaySide(whichCamera); - overlayRenderer.displayOverlayTextureOculus(whichCamera); + applicationOverlay.displayOverlayTextureOculus(whichCamera); glPopMatrix(); diff --git a/interface/src/ui/overlays/OverlayRenderer.cpp b/interface/src/ui/ApplicationOverlay.cpp similarity index 92% rename from interface/src/ui/overlays/OverlayRenderer.cpp rename to interface/src/ui/ApplicationOverlay.cpp index c8fdc4972f..740b310ff2 100644 --- a/interface/src/ui/overlays/OverlayRenderer.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -1,5 +1,5 @@ // -// OverlayRenderer.cpp +// ApplicationOverlay.cpp // interface/src/ui/overlays // // Created by Benjamin Arnold on 5/27/14. @@ -15,15 +15,15 @@ #include #include "Application.h" -#include "OverlayRenderer.h" +#include "ApplicationOverlay.h" #include "ui/Stats.h" -OverlayRenderer::OverlayRenderer() : _framebufferObject(NULL) { +ApplicationOverlay::ApplicationOverlay() : _framebufferObject(NULL) { } -OverlayRenderer::~OverlayRenderer() { +ApplicationOverlay::~ApplicationOverlay() { if (_framebufferObject != NULL) { delete _framebufferObject; } @@ -32,8 +32,8 @@ OverlayRenderer::~OverlayRenderer() { const float WHITE_TEXT[] = { 0.93f, 0.93f, 0.93f }; // Renders the overlays either to a texture or to the screen -void OverlayRenderer::renderOverlay(bool renderToTexture) { - PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "OverlayRenderer::displayOverlay()"); +void ApplicationOverlay::renderOverlay(bool renderToTexture) { + PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "ApplicationOverlay::displayOverlay()"); Application* application = Application::getInstance(); @@ -226,7 +226,7 @@ void OverlayRenderer::renderOverlay(bool renderToTexture) { glEnable(GL_DEPTH_TEST); glEnable(GL_LIGHTING); glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE); - + if (renderToTexture) { getFramebufferObject()->release(); @@ -234,7 +234,7 @@ void OverlayRenderer::renderOverlay(bool renderToTexture) { } // Draws the FBO texture for the screen -void OverlayRenderer::displayOverlayTexture(Camera& whichCamera) { +void ApplicationOverlay::displayOverlayTexture(Camera& whichCamera) { Application* application = Application::getInstance(); QGLWidget* glWidget = application->getGLWidget(); @@ -252,10 +252,10 @@ void OverlayRenderer::displayOverlayTexture(Camera& whichCamera) { glDisable(GL_LIGHTING); glBegin(GL_QUADS); - glTexCoord2f(0, 0); glVertex2i(0, glWidget->height()); - glTexCoord2f(1, 0); glVertex2i(glWidget->width(), glWidget->height()); - glTexCoord2f(1, 1); glVertex2i(glWidget->width(), 0); - glTexCoord2f(0, 1); glVertex2i(0, 0); + glTexCoord2f(0, 0); glVertex2i(0, glWidget->height()); + glTexCoord2f(1, 0); glVertex2i(glWidget->width(), glWidget->height()); + glTexCoord2f(1, 1); glVertex2i(glWidget->width(), 0); + glTexCoord2f(0, 1); glVertex2i(0, 0); glEnd(); glPopMatrix(); @@ -263,7 +263,7 @@ void OverlayRenderer::displayOverlayTexture(Camera& whichCamera) { } // Draws the FBO texture for Oculus rift. TODO: Draw a curved texture instead of plane. -void OverlayRenderer::displayOverlayTextureOculus(Camera& whichCamera) { +void ApplicationOverlay::displayOverlayTextureOculus(Camera& whichCamera) { Application* application = Application::getInstance(); @@ -311,10 +311,10 @@ void OverlayRenderer::displayOverlayTextureOculus(Camera& whichCamera) { glRotatef(glm::degrees(glm::angle(rot)), axis.x, axis.y, axis.z); glBegin(GL_QUADS); - glTexCoord2f(1, 0); glVertex3f(-halfOverlayWidth, halfOverlayHeight, 0); - glTexCoord2f(0, 0); glVertex3f(halfOverlayWidth, halfOverlayHeight, 0); - glTexCoord2f(0, 1); glVertex3f(halfOverlayWidth, -halfOverlayHeight, 0); - glTexCoord2f(1, 1); glVertex3f(-halfOverlayWidth, -halfOverlayHeight, 0); + glTexCoord2f(1, 0); glVertex3f(-halfOverlayWidth, halfOverlayHeight, 0); + glTexCoord2f(0, 0); glVertex3f(halfOverlayWidth, halfOverlayHeight, 0); + glTexCoord2f(0, 1); glVertex3f(halfOverlayWidth, -halfOverlayHeight, 0); + glTexCoord2f(1, 1); glVertex3f(-halfOverlayWidth, -halfOverlayHeight, 0); glEnd(); glPopMatrix(); @@ -326,13 +326,13 @@ void OverlayRenderer::displayOverlayTextureOculus(Camera& whichCamera) { glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_CONSTANT_ALPHA, GL_ONE); glEnable(GL_LIGHTING); - + } -QOpenGLFramebufferObject* OverlayRenderer::getFramebufferObject() { +QOpenGLFramebufferObject* ApplicationOverlay::getFramebufferObject() { if (!_framebufferObject) { _framebufferObject = new QOpenGLFramebufferObject(Application::getInstance()->getGLWidget()->size()); - + glBindTexture(GL_TEXTURE_2D, _framebufferObject->texture()); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); diff --git a/interface/src/ui/overlays/OverlayRenderer.h b/interface/src/ui/ApplicationOverlay.h similarity index 71% rename from interface/src/ui/overlays/OverlayRenderer.h rename to interface/src/ui/ApplicationOverlay.h index b09626fbfa..cdc4065f45 100644 --- a/interface/src/ui/overlays/OverlayRenderer.h +++ b/interface/src/ui/ApplicationOverlay.h @@ -1,5 +1,5 @@ // -// OverlayRenderer.h +// ApplicationOverlay.h // interface/src/ui/overlays // // Created by Benjamin Arnold on 5/27/14. @@ -9,25 +9,25 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef hifi_OverlayRenderer_h -#define hifi_OverlayRenderer_h +#ifndef hifi_ApplicationOverlay_h +#define hifi_ApplicationOverlay_h class Overlays; class QOpenGLFramebufferObject; // Handles the drawing of the overlays to the scree -class OverlayRenderer { +class ApplicationOverlay { public: - OverlayRenderer(); - ~OverlayRenderer(); + ApplicationOverlay(); + ~ApplicationOverlay(); void renderOverlay(bool renderToTexture = false); void displayOverlayTexture(Camera& whichCamera); void displayOverlayTextureOculus(Camera& whichCamera); // Getters - QOpenGLFramebufferObject* getFramebufferObject(); + QOpenGLFramebufferObject* getFramebufferObject(); private: @@ -35,4 +35,4 @@ private: float _trailingAudioLoudness; }; -#endif // hifi_OverlayRenderer_h \ No newline at end of file +#endif // hifi_ApplicationOverlay_h \ No newline at end of file