Added OverlayRenderer class and moved displayOverlay from Application to

OverlayRenderer.

interface/src/Application.cpp

@@ -102,15 +102,6 @@ const int STARTUP_JITTER_SAMPLES = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL / 2
                                                  //  Startup optimistically with small jitter buffer that
                                                  //  will start playback on the second received audio packet.
 
-const int MIRROR_VIEW_TOP_PADDING = 5;
-const int MIRROR_VIEW_LEFT_PADDING = 10;
-const int MIRROR_VIEW_WIDTH = 265;
-const int MIRROR_VIEW_HEIGHT = 215;
-const float MIRROR_FULLSCREEN_DISTANCE = 0.35f;
-const float MIRROR_REARVIEW_DISTANCE = 0.65f;
-const float MIRROR_REARVIEW_BODY_DISTANCE = 2.3f;
-const float MIRROR_FIELD_OF_VIEW = 30.0f;
-
 const QString CHECK_VERSION_URL = "https://highfidelity.io/latestVersion.xml";
 const QString SKIP_FILENAME = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/hifi.skipversion";
 
@@ -172,7 +163,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         _nodeBoundsDisplay(this),
         _previousScriptLocation(),
         _runningScriptsWidget(new RunningScriptsWidget(_window)),
-        _runningScriptsWidgetWasVisible(false)
+        _runningScriptsWidgetWasVisible(false),
+        _overlayRenderer()
 {
     // read the ApplicationInfo.ini file for Name/Version/Domain information
     QSettings applicationInfo(Application::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
@@ -627,10 +619,12 @@ void Application::paintGL() {
 
     if (OculusManager::isConnected()) {
         OculusManager::display(whichCamera);
+
     } else if (TV3DManager::isConnected()) {
         _glowEffect.prepare();
         TV3DManager::display(whichCamera);
         _glowEffect.render();
+
     } else {
         _glowEffect.prepare();
 
@@ -649,7 +643,7 @@ void Application::paintGL() {
             _rearMirrorTools->render(true);
         }
 
-        displayOverlay();
+        _overlayRenderer.displayOverlay(&_overlays);
     }
 
     _frameCount++;
@@ -2578,183 +2572,6 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom
     _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
 }
 
-const float WHITE_TEXT[] = { 0.93f, 0.93f, 0.93f };
-
-void Application::displayOverlay() {
-    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displayOverlay()");
-
-    //  Render 2D overlay:  I/O level bar graphs and text
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-
-    glLoadIdentity();
-    gluOrtho2D(0, _glWidget->width(), _glWidget->height(), 0);
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_LIGHTING);
-
-    //  Display a single screen-size quad to create an alpha blended 'collision' flash
-    if (_audio.getCollisionFlashesScreen()) {
-        float collisionSoundMagnitude = _audio.getCollisionSoundMagnitude();
-        const float VISIBLE_COLLISION_SOUND_MAGNITUDE = 0.5f;
-        if (collisionSoundMagnitude > VISIBLE_COLLISION_SOUND_MAGNITUDE) {
-                renderCollisionOverlay(_glWidget->width(), _glWidget->height(), _audio.getCollisionSoundMagnitude());
-        }
-    }
-
-    //  Audio VU Meter and Mute Icon
-    const int MUTE_ICON_SIZE = 24;
-    const int AUDIO_METER_INSET = 2;
-    const int MUTE_ICON_PADDING = 10;
-    const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE - AUDIO_METER_INSET - MUTE_ICON_PADDING;
-    const int AUDIO_METER_SCALE_WIDTH = AUDIO_METER_WIDTH - 2 * AUDIO_METER_INSET;
-    const int AUDIO_METER_HEIGHT = 8;
-    const int AUDIO_METER_GAP = 5;
-    const int AUDIO_METER_X = MIRROR_VIEW_LEFT_PADDING + MUTE_ICON_SIZE + AUDIO_METER_INSET + AUDIO_METER_GAP;
-
-    int audioMeterY;
-    if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
-        audioMeterY = MIRROR_VIEW_HEIGHT + AUDIO_METER_GAP + MUTE_ICON_PADDING;
-    } else {
-        audioMeterY = AUDIO_METER_GAP + MUTE_ICON_PADDING;
-    }
-
-    const float AUDIO_METER_BLUE[] = {0.0, 0.0, 1.0};
-    const float AUDIO_METER_GREEN[] = {0.0, 1.0, 0.0};
-    const float AUDIO_METER_RED[] = {1.0, 0.0, 0.0};
-    const float AUDIO_GREEN_START = 0.25 * AUDIO_METER_SCALE_WIDTH;
-    const float AUDIO_RED_START = 0.80 * AUDIO_METER_SCALE_WIDTH;
-    const float CLIPPING_INDICATOR_TIME = 1.0f;
-    const float AUDIO_METER_AVERAGING = 0.5;
-    const float LOG2 = log(2.f);
-    const float METER_LOUDNESS_SCALE = 2.8f / 5.f;
-    const float LOG2_LOUDNESS_FLOOR = 11.f;
-    float audioLevel = 0.f;
-    float loudness = _audio.getLastInputLoudness() + 1.f;
-
-    _trailingAudioLoudness = AUDIO_METER_AVERAGING * _trailingAudioLoudness + (1.f - AUDIO_METER_AVERAGING) * loudness;
-    float log2loudness = log(_trailingAudioLoudness) / LOG2;
-
-    if (log2loudness <= LOG2_LOUDNESS_FLOOR) {
-        audioLevel = (log2loudness / LOG2_LOUDNESS_FLOOR) * METER_LOUDNESS_SCALE * AUDIO_METER_SCALE_WIDTH;
-    } else {
-        audioLevel = (log2loudness - (LOG2_LOUDNESS_FLOOR - 1.f)) * METER_LOUDNESS_SCALE * AUDIO_METER_SCALE_WIDTH;
-    }
-    if (audioLevel > AUDIO_METER_SCALE_WIDTH) {
-        audioLevel = AUDIO_METER_SCALE_WIDTH;
-    }
-    bool isClipping = ((_audio.getTimeSinceLastClip() > 0.f) && (_audio.getTimeSinceLastClip() < CLIPPING_INDICATOR_TIME));
-
-    if ((_audio.getTimeSinceLastClip() > 0.f) && (_audio.getTimeSinceLastClip() < CLIPPING_INDICATOR_TIME)) {
-        const float MAX_MAGNITUDE = 0.7f;
-        float magnitude = MAX_MAGNITUDE * (1 - _audio.getTimeSinceLastClip() / CLIPPING_INDICATOR_TIME);
-        renderCollisionOverlay(_glWidget->width(), _glWidget->height(), magnitude, 1.0f);
-    }
-
-    _audio.renderToolBox(MIRROR_VIEW_LEFT_PADDING + AUDIO_METER_GAP,
-                         audioMeterY,
-                         Menu::getInstance()->isOptionChecked(MenuOption::Mirror));
-
-    _audio.renderScope(_glWidget->width(), _glWidget->height());
-
-    glBegin(GL_QUADS);
-    if (isClipping) {
-        glColor3f(1, 0, 0);
-    } else {
-        glColor3f(0.475f, 0.475f, 0.475f);
-    }
-
-    audioMeterY += AUDIO_METER_HEIGHT;
-
-    glColor3f(0, 0, 0);
-    //  Draw audio meter background Quad
-    glVertex2i(AUDIO_METER_X, audioMeterY);
-    glVertex2i(AUDIO_METER_X + AUDIO_METER_WIDTH, audioMeterY);
-    glVertex2i(AUDIO_METER_X + AUDIO_METER_WIDTH, audioMeterY + AUDIO_METER_HEIGHT);
-    glVertex2i(AUDIO_METER_X, audioMeterY + AUDIO_METER_HEIGHT);
-
-
-    if (audioLevel > AUDIO_RED_START) {
-        if (!isClipping) {
-            glColor3fv(AUDIO_METER_RED);
-        } else {
-            glColor3f(1, 1, 1);
-        }
-        // Draw Red Quad
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_RED_START, audioMeterY + AUDIO_METER_INSET);
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_INSET);
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_RED_START, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
-        audioLevel = AUDIO_RED_START;
-    }
-    if (audioLevel > AUDIO_GREEN_START) {
-        if (!isClipping) {
-            glColor3fv(AUDIO_METER_GREEN);
-        } else {
-            glColor3f(1, 1, 1);
-        }
-        // Draw Green Quad
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_GREEN_START, audioMeterY + AUDIO_METER_INSET);
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_INSET);
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
-        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_GREEN_START, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
-        audioLevel = AUDIO_GREEN_START;
-    }
-    //   Draw Blue Quad
-    if (!isClipping) {
-        glColor3fv(AUDIO_METER_BLUE);
-    } else {
-        glColor3f(1, 1, 1);
-    }
-    // Draw Blue (low level) quad
-    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET, audioMeterY + AUDIO_METER_INSET);
-    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_INSET);
-    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
-    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
-    glEnd();
-
-
-    if (Menu::getInstance()->isOptionChecked(MenuOption::HeadMouse)) {
-        _myAvatar->renderHeadMouse(_glWidget->width(), _glWidget->height());
-    }
-
-    //  Display stats and log text onscreen
-    glLineWidth(1.0f);
-    glPointSize(1.0f);
-
-    if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
-        // let's set horizontal offset to give stats some margin to mirror
-        int horizontalOffset = MIRROR_VIEW_WIDTH + MIRROR_VIEW_LEFT_PADDING * 2;
-        int voxelPacketsToProcess = _voxelProcessor.packetsToProcessCount();
-        //  Onscreen text about position, servers, etc
-        Stats::getInstance()->display(WHITE_TEXT, horizontalOffset, _fps, _packetsPerSecond, _bytesPerSecond, voxelPacketsToProcess);
-        //  Bandwidth meter
-        if (Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth)) {
-            Stats::drawBackground(0x33333399, _glWidget->width() - 296, _glWidget->height() - 68, 296, 68);
-            _bandwidthMeter.render(_glWidget->width(), _glWidget->height());
-        }
-    }
-
-    //  Show on-screen msec timer
-    if (Menu::getInstance()->isOptionChecked(MenuOption::FrameTimer)) {
-        char frameTimer[10];
-        quint64 mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5);
-        sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000));
-        int timerBottom =
-            (Menu::getInstance()->isOptionChecked(MenuOption::Stats) &&
-            Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth))
-                ? 80 : 20;
-        drawText(_glWidget->width() - 100, _glWidget->height() - timerBottom, 0.30f, 0.0f, 0, frameTimer, WHITE_TEXT);
-    }
-    _nodeBoundsDisplay.drawOverlay();
-
-    // give external parties a change to hook in
-    emit renderingOverlay();
-
-    _overlays.render2D();
-
-    glPopMatrix();
-}
-
 glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) {
     float horizontalScale = _glWidget->width() / 2.0f;
     float verticalScale   = _glWidget->height() / 2.0f;

interface/src/Application.h

@@ -82,6 +82,7 @@
 #include "ui/LogDialog.h"
 #include "ui/UpdateDialog.h"
 #include "ui/overlays/Overlays.h"
+#include "ui/overlays/OverlayRenderer.h"
 #include "ui/RunningScriptsWidget.h"
 #include "voxels/VoxelFade.h"
 #include "voxels/VoxelHideShowThread.h"
@@ -115,6 +116,15 @@ static const QString CUSTOM_URL_SCHEME = "hifi:";
 static const float BILLBOARD_FIELD_OF_VIEW = 30.0f; // degrees
 static const float BILLBOARD_DISTANCE = 5.0f;       // meters
 
+static const int MIRROR_VIEW_TOP_PADDING = 5;
+static const int MIRROR_VIEW_LEFT_PADDING = 10;
+static const int MIRROR_VIEW_WIDTH = 265;
+static const int MIRROR_VIEW_HEIGHT = 215;
+static const float MIRROR_FULLSCREEN_DISTANCE = 0.35f;
+static const float MIRROR_REARVIEW_DISTANCE = 0.65f;
+static const float MIRROR_REARVIEW_BODY_DISTANCE = 2.3f;
+static const float MIRROR_FIELD_OF_VIEW = 30.0f;
+
 class Application : public QApplication {
     Q_OBJECT
 
@@ -181,6 +191,7 @@ public:
     ViewFrustum* getShadowViewFrustum() { return &_shadowViewFrustum; }
     VoxelSystem* getVoxels() { return &_voxels; }
     VoxelTree* getVoxelTree() { return _voxels.getTree(); }
+    const VoxelPacketProcessor& getVoxelPacketProcessor() const { return _voxelProcessor; }
     ParticleTreeRenderer* getParticles() { return &_particles; }
     MetavoxelSystem* getMetavoxels() { return &_metavoxels; }
     ModelTreeRenderer* getModels() { return &_models; }
@@ -204,6 +215,10 @@ public:
     BandwidthMeter* getBandwidthMeter() { return &_bandwidthMeter; }
     QUndoStack* getUndoStack() { return &_undoStack; }
 
+    float getFps() const { return _fps; }
+    float getPacketsPerSecond() const { return _packetsPerSecond; }
+    float getBytesPerSecond() const { return _bytesPerSecond; }
+
     /// if you need to access the application settings, use lockSettings()/unlockSettings()
     QSettings* lockSettings() { _settingsMutex.lock(); return _settings; }
     void unlockSettings() { _settingsMutex.unlock(); }
@@ -375,7 +390,6 @@ private:
     glm::vec3 getSunDirection();
 
     void updateShadowMap();
-    void displayOverlay();
     void renderRearViewMirror(const QRect& region, bool billboard = false);
     void renderViewFrustum(ViewFrustum& viewFrustum);
 
@@ -549,6 +563,7 @@ private:
     TouchEvent _lastTouchEvent;
 
     Overlays _overlays;
+    OverlayRenderer _overlayRenderer;
 
     AudioReflector _audioReflector;
     RunningScriptsWidget* _runningScriptsWidget;

interface/src/renderer/GlowEffect.cpp

@@ -139,8 +139,7 @@ QOpenGLFramebufferObject* GlowEffect::render(bool toTexture) {
     if (_isEmpty && _renderMode != DIFFUSE_ADD_MODE) {
         // copy the primary to the screen
         if (QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()) {
-            QOpenGLFramebufferObject::blitFramebuffer(destFBO, primaryFBO);
+            QOpenGLFramebufferObject::blitFramebuffer(destFBO, primaryFBO);          
-                
         } else {
             maybeBind(destFBO);
             glEnable(GL_TEXTURE_2D);

interface/src/ui/overlays/OverlayRenderer.cpp

@@ -0,0 +1,231 @@
+//
+//  OverlayRenderer.cpp
+//  interface/src/ui/overlays
+//
+//  Created by Benjamin Arnold on 5/27/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <PerfStat.h>
+
+#include "OverlayRenderer.h"
+
+
+#include "InterfaceVersion.h"
+#include "Menu.h"
+#include "ModelUploader.h"
+#include "Util.h"
+#include "devices/OculusManager.h"
+#include "devices/TV3DManager.h"
+#include "renderer/ProgramObject.h"
+
+#include "scripting/AudioDeviceScriptingInterface.h"
+#include "scripting/ClipboardScriptingInterface.h"
+#include "scripting/MenuScriptingInterface.h"
+#include "scripting/SettingsScriptingInterface.h"
+#include "scripting/WindowScriptingInterface.h"
+#include "scripting/LocationScriptingInterface.h"
+
+#include "ui/InfoView.h"
+#include "ui/OAuthWebViewHandler.h"
+#include "ui/Snapshot.h"
+#include "ui/Stats.h"
+#include "ui/TextRenderer.h"
+
+
+
+OverlayRenderer::OverlayRenderer() {
+
+}
+
+OverlayRenderer::~OverlayRenderer() {
+
+}
+
+const float WHITE_TEXT[] = { 0.93f, 0.93f, 0.93f };
+
+void OverlayRenderer::displayOverlay(Overlays* overlays) {
+    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "OverlayRenderer::displayOverlay()");
+
+    Application* application = Application::getInstance();
+
+    QGLWidget* glWidget = application->getGLWidget();
+    MyAvatar* myAvatar = application->getAvatar();
+    Audio* audio = application->getAudio();
+    const VoxelPacketProcessor& voxelPacketProcessor = application->getVoxelPacketProcessor();
+    BandwidthMeter* bandwidthMeter = application->getBandwidthMeter();
+    NodeBounds& nodeBoundsDisplay = application->getNodeBoundsDisplay();
+    //  Render 2D overlay:  I/O level bar graphs and text
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+
+    glLoadIdentity();
+    gluOrtho2D(0, glWidget->width(), glWidget->height(), 0);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_LIGHTING);
+
+    //  Display a single screen-size quad to create an alpha blended 'collision' flash
+    if (audio->getCollisionFlashesScreen()) {
+        float collisionSoundMagnitude = audio->getCollisionSoundMagnitude();
+        const float VISIBLE_COLLISION_SOUND_MAGNITUDE = 0.5f;
+        if (collisionSoundMagnitude > VISIBLE_COLLISION_SOUND_MAGNITUDE) {
+            renderCollisionOverlay(glWidget->width(), glWidget->height(), audio->getCollisionSoundMagnitude());
+        }
+    }
+
+    //  Audio VU Meter and Mute Icon
+    const int MUTE_ICON_SIZE = 24;
+    const int AUDIO_METER_INSET = 2;
+    const int MUTE_ICON_PADDING = 10;
+    const int AUDIO_METER_WIDTH = MIRROR_VIEW_WIDTH - MUTE_ICON_SIZE - AUDIO_METER_INSET - MUTE_ICON_PADDING;
+    const int AUDIO_METER_SCALE_WIDTH = AUDIO_METER_WIDTH - 2 * AUDIO_METER_INSET;
+    const int AUDIO_METER_HEIGHT = 8;
+    const int AUDIO_METER_GAP = 5;
+    const int AUDIO_METER_X = MIRROR_VIEW_LEFT_PADDING + MUTE_ICON_SIZE + AUDIO_METER_INSET + AUDIO_METER_GAP;
+
+    int audioMeterY;
+    if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
+        audioMeterY = MIRROR_VIEW_HEIGHT + AUDIO_METER_GAP + MUTE_ICON_PADDING;
+    } else {
+        audioMeterY = AUDIO_METER_GAP + MUTE_ICON_PADDING;
+    }
+
+    const float AUDIO_METER_BLUE[] = { 0.0, 0.0, 1.0 };
+    const float AUDIO_METER_GREEN[] = { 0.0, 1.0, 0.0 };
+    const float AUDIO_METER_RED[] = { 1.0, 0.0, 0.0 };
+    const float AUDIO_GREEN_START = 0.25 * AUDIO_METER_SCALE_WIDTH;
+    const float AUDIO_RED_START = 0.80 * AUDIO_METER_SCALE_WIDTH;
+    const float CLIPPING_INDICATOR_TIME = 1.0f;
+    const float AUDIO_METER_AVERAGING = 0.5;
+    const float LOG2 = log(2.f);
+    const float METER_LOUDNESS_SCALE = 2.8f / 5.f;
+    const float LOG2_LOUDNESS_FLOOR = 11.f;
+    float audioLevel = 0.f;
+    float loudness = audio->getLastInputLoudness() + 1.f;
+
+    _trailingAudioLoudness = AUDIO_METER_AVERAGING * _trailingAudioLoudness + (1.f - AUDIO_METER_AVERAGING) * loudness;
+    float log2loudness = log(_trailingAudioLoudness) / LOG2;
+
+    if (log2loudness <= LOG2_LOUDNESS_FLOOR) {
+        audioLevel = (log2loudness / LOG2_LOUDNESS_FLOOR) * METER_LOUDNESS_SCALE * AUDIO_METER_SCALE_WIDTH;
+    } else {
+        audioLevel = (log2loudness - (LOG2_LOUDNESS_FLOOR - 1.f)) * METER_LOUDNESS_SCALE * AUDIO_METER_SCALE_WIDTH;
+    }
+    if (audioLevel > AUDIO_METER_SCALE_WIDTH) {
+        audioLevel = AUDIO_METER_SCALE_WIDTH;
+    }
+    bool isClipping = ((audio->getTimeSinceLastClip() > 0.f) && (audio->getTimeSinceLastClip() < CLIPPING_INDICATOR_TIME));
+
+    if ((audio->getTimeSinceLastClip() > 0.f) && (audio->getTimeSinceLastClip() < CLIPPING_INDICATOR_TIME)) {
+        const float MAX_MAGNITUDE = 0.7f;
+        float magnitude = MAX_MAGNITUDE * (1 - audio->getTimeSinceLastClip() / CLIPPING_INDICATOR_TIME);
+        renderCollisionOverlay(glWidget->width(), glWidget->height(), magnitude, 1.0f);
+    }
+
+    audio->renderToolBox(MIRROR_VIEW_LEFT_PADDING + AUDIO_METER_GAP,
+                         audioMeterY,
+                         Menu::getInstance()->isOptionChecked(MenuOption::Mirror));
+
+    audio->renderScope(glWidget->width(), glWidget->height());
+
+    glBegin(GL_QUADS);
+    if (isClipping) {
+        glColor3f(1, 0, 0);
+    } else {
+        glColor3f(0.475f, 0.475f, 0.475f);
+    }
+
+    audioMeterY += AUDIO_METER_HEIGHT;
+
+    glColor3f(0, 0, 0);
+    //  Draw audio meter background Quad
+    glVertex2i(AUDIO_METER_X, audioMeterY);
+    glVertex2i(AUDIO_METER_X + AUDIO_METER_WIDTH, audioMeterY);
+    glVertex2i(AUDIO_METER_X + AUDIO_METER_WIDTH, audioMeterY + AUDIO_METER_HEIGHT);
+    glVertex2i(AUDIO_METER_X, audioMeterY + AUDIO_METER_HEIGHT);
+
+
+    if (audioLevel > AUDIO_RED_START) {
+        if (!isClipping) {
+            glColor3fv(AUDIO_METER_RED);
+        } else {
+            glColor3f(1, 1, 1);
+        }
+        // Draw Red Quad
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_RED_START, audioMeterY + AUDIO_METER_INSET);
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_INSET);
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_RED_START, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
+        audioLevel = AUDIO_RED_START;
+    }
+    if (audioLevel > AUDIO_GREEN_START) {
+        if (!isClipping) {
+            glColor3fv(AUDIO_METER_GREEN);
+        } else {
+            glColor3f(1, 1, 1);
+        }
+        // Draw Green Quad
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_GREEN_START, audioMeterY + AUDIO_METER_INSET);
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_INSET);
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
+        glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + AUDIO_GREEN_START, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
+        audioLevel = AUDIO_GREEN_START;
+    }
+    //   Draw Blue Quad
+    if (!isClipping) {
+        glColor3fv(AUDIO_METER_BLUE);
+    } else {
+        glColor3f(1, 1, 1);
+    }
+    // Draw Blue (low level) quad
+    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET, audioMeterY + AUDIO_METER_INSET);
+    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_INSET);
+    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET + audioLevel, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
+    glVertex2i(AUDIO_METER_X + AUDIO_METER_INSET, audioMeterY + AUDIO_METER_HEIGHT - AUDIO_METER_INSET);
+    glEnd();
+
+
+    if (Menu::getInstance()->isOptionChecked(MenuOption::HeadMouse)) {
+        myAvatar->renderHeadMouse(glWidget->width(), glWidget->height());
+    }
+
+    //  Display stats and log text onscreen
+    glLineWidth(1.0f);
+    glPointSize(1.0f);
+
+    if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
+        // let's set horizontal offset to give stats some margin to mirror
+        int horizontalOffset = MIRROR_VIEW_WIDTH + MIRROR_VIEW_LEFT_PADDING * 2;
+        int voxelPacketsToProcess = voxelPacketProcessor.packetsToProcessCount();
+        //  Onscreen text about position, servers, etc
+        Stats::getInstance()->display(WHITE_TEXT, horizontalOffset, application->getFps(), application->getPacketsPerSecond(), application->getBytesPerSecond(), voxelPacketsToProcess);
+        //  Bandwidth meter
+        if (Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth)) {
+            Stats::drawBackground(0x33333399, glWidget->width() - 296, glWidget->height() - 68, 296, 68);
+            bandwidthMeter->render(glWidget->width(), glWidget->height());
+        }
+    }
+
+    //  Show on-screen msec timer
+    if (Menu::getInstance()->isOptionChecked(MenuOption::FrameTimer)) {
+        char frameTimer[10];
+        quint64 mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5);
+        sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000));
+        int timerBottom =
+            (Menu::getInstance()->isOptionChecked(MenuOption::Stats) &&
+            Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth))
+            ? 80 : 20;
+        drawText(glWidget->width() - 100, glWidget->height() - timerBottom, 0.30f, 0.0f, 0, frameTimer, WHITE_TEXT);
+    }
+    nodeBoundsDisplay.drawOverlay();
+
+    // give external parties a change to hook in
+    emit application->renderingOverlay();
+
+    overlays->render2D();
+
+    glPopMatrix();
+}

interface/src/ui/overlays/OverlayRenderer.h

@@ -0,0 +1,28 @@
+//
+//  OverlayRenderer.h
+//  interface/src/ui/overlays
+//
+//  Created by Benjamin Arnold on 5/27/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_OverlayRenderer_h
+#define hifi_OverlayRenderer_h
+
+// Handles the drawing of the overlays to the scree
+class OverlayRenderer {
+public:
+
+    OverlayRenderer();
+    ~OverlayRenderer();
+    void displayOverlay(class Overlays* overlays);
+
+private:
+
+    float _trailingAudioLoudness;
+};
+
+#endif // hifi_OverlayRenderer_h