move GlowEffect to libraries

interface/src/Application.cpp

@@ -57,6 +57,7 @@
 #include <AudioInjector.h>
 #include <DependencyManager.h>
 #include <EntityScriptingInterface.h>
+#include <GlowEffect.h>
 #include <HFActionEvent.h>
 #include <HFBackEvent.h>
 #include <LocalVoxelsList.h>
@@ -90,7 +91,6 @@
 #include "gpu/Batch.h"
 #include "gpu/GLBackend.h"
 
-#include "renderer/GlowEffect.h"
 
 #include "scripting/AccountScriptingInterface.h"
 #include "scripting/AudioDeviceScriptingInterface.h"

interface/src/Menu.cpp

@@ -32,6 +32,7 @@
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <DependencyManager.h>
+#include <GlowEffect.h>
 #include <PathUtils.h>
 #include <UUID.h>
 #include <UserActivityLogger.h>
@@ -54,8 +55,6 @@
 #include "ui/ModelsBrowser.h"
 #include "ui/LoginDialog.h"
 #include "ui/NodeBounds.h"
-#include "renderer/GlowEffect.h"
-
 
 Menu* Menu::_instance = NULL;
 

interface/src/avatar/Avatar.cpp

@@ -23,6 +23,7 @@
 #include <glm/gtx/vector_query.hpp>
 
 #include <GeometryUtil.h>
+#include <GlowEffect.h>
 #include <NodeList.h>
 #include <PacketHeaders.h>
 #include <PathUtils.h>
@@ -40,7 +41,6 @@
 #include "Recorder.h"
 #include "world.h"
 #include "devices/OculusManager.h"
-#include "renderer/GlowEffect.h"
 #include "ui/TextRenderer.h"
 
 using namespace std;

interface/src/avatar/AvatarManager.cpp

@@ -15,6 +15,7 @@
 
 #include <glm/gtx/string_cast.hpp>
 
+#include <GlowEffect.h>
 #include <PerfStat.h>
 #include <RegisteredMetaTypes.h>
 #include <UUID.h>
@@ -25,7 +26,6 @@
 #include "Menu.h"
 #include "MyAvatar.h"
 
-#include "renderer/GlowEffect.h"
 
 // We add _myAvatar into the hash with all the other AvatarData, and we use the default NULL QUid as the key.
 const QUuid MY_AVATAR_KEY;  // NULL key

interface/src/avatar/Head.cpp

@@ -11,8 +11,7 @@
 #include <glm/gtx/quaternion.hpp>
 
 #include <DependencyManager.h>
-#include <devices/Faceshift.h>
-#include <devices/DdeFaceTracker.h>
+#include <GlowEffect.h>
 #include <NodeList.h>
 
 #include "Application.h"
@@ -21,8 +20,9 @@
 #include "Head.h"
 #include "Menu.h"
 #include "Util.h"
+#include "devices/DdeFaceTracker.h"
+#include "devices/Faceshift.h"
 #include "devices/OculusManager.h"
-#include "renderer/GlowEffect.h"
 
 using namespace std;
 

interface/src/devices/OculusManager.cpp

@@ -21,12 +21,12 @@
 
 #include <glm/glm.hpp>
 
+#include <GlowEffect.h>
 #include <PathUtils.h>
 #include <SharedUtil.h>
 #include <UserActivityLogger.h>
 
 #include "Application.h"
-#include "renderer/GlowEffect.h"
 
 #ifdef HAVE_LIBOVR
 

interface/src/devices/TV3DManager.cpp

@@ -15,11 +15,12 @@
 
 #include <glm/glm.hpp>
 
+#include <GlowEffect.h>
+
 #include "Application.h"
 
 #include "TV3DManager.h"
 #include "Menu.h"
-#include "renderer/GlowEffect.h"
 
 int TV3DManager::_screenWidth = 1;
 int TV3DManager::_screenHeight = 1;

interface/src/entities/EntityTreeRenderer.cpp

@@ -18,6 +18,7 @@
 #include "InterfaceConfig.h"
 
 #include <BoxEntityItem.h>
+#include <GlowEffect.h>
 #include <ModelEntityItem.h>
 #include <MouseEvent.h>
 #include <PerfStat.h>
@@ -36,15 +37,11 @@
 #include "RenderableSphereEntityItem.h"
 #include "RenderableTextEntityItem.h"
 
-#include "renderer/GlowEffect.h"
-
 
 QThread* EntityTreeRenderer::getMainThread() {
     return Application::getInstance()->getEntities()->thread();
 }
 
-
-
 EntityTreeRenderer::EntityTreeRenderer(bool wantScripts) :
     OctreeRenderer(),
     _wantScripts(wantScripts),

interface/src/renderer/AmbientOcclusionEffect.cpp

@@ -16,6 +16,7 @@
 
 #include <glm/gtc/random.hpp>
 
+#include <GlowEffect.h>
 #include <PathUtils.h>
 #include <ProgramObject.h>
 #include <RenderUtil.h>
@@ -24,7 +25,6 @@
 #include "Application.h"
 
 #include "AmbientOcclusionEffect.h"
-#include "renderer/GlowEffect.h"
 
 const int ROTATION_WIDTH = 4;
 const int ROTATION_HEIGHT = 4;

interface/src/renderer/DeferredLightingEffect.cpp

@@ -14,12 +14,12 @@
 
 #include <QOpenGLFramebufferObject>
 
+#include <GlowEffect.h>
 #include <PathUtils.h>
 #include <RenderUtil.h>
 
 #include "Application.h"
 #include "DeferredLightingEffect.h"
-#include "renderer/GlowEffect.h"
 
 void DeferredLightingEffect::init() {
     _simpleProgram.addShaderFromSourceFile(QGLShader::Vertex, PathUtils::resourcesPath() + "shaders/simple.vert");

interface/src/renderer/Model.cpp

@@ -18,6 +18,7 @@
 
 #include <CapsuleShape.h>
 #include <GeometryUtil.h>
+#include <GlowEffect.h>
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <PhysicsEntity.h>
@@ -33,8 +34,6 @@
 #define GLBATCH( call ) batch._##call
 //#define GLBATCH( call ) call
 
-#include "renderer/GlowEffect.h"
-
 using namespace std;
 
 static int modelPointerTypeId = qRegisterMetaType<QPointer<Model> >();

interface/src/ui/overlays/Circle3DOverlay.cpp

@@ -12,11 +12,11 @@
 #include "InterfaceConfig.h"
 
 #include <QGLWidget>
+#include <GlowEffect.h>
 #include <SharedUtil.h>
 #include <StreamUtils.h>
 
 #include "Circle3DOverlay.h"
-#include "renderer/GlowEffect.h"
 
 Circle3DOverlay::Circle3DOverlay() :
     _startAt(0.0f),

interface/src/ui/overlays/Cube3DOverlay.cpp

@@ -12,12 +12,13 @@
 #include "InterfaceConfig.h"
 
 #include <QGLWidget>
+
+#include <GlowEffect.h>
 #include <SharedUtil.h>
 #include <StreamUtils.h>
 
 #include "Application.h"
 #include "Cube3DOverlay.h"
-#include "renderer/GlowEffect.h"
 
 Cube3DOverlay::Cube3DOverlay() : _borderSize(0) {
 }

interface/src/ui/overlays/Line3DOverlay.cpp

@@ -11,8 +11,9 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
 
+#include <GlowEffect.h>
+
 #include "Line3DOverlay.h"
-#include "renderer/GlowEffect.h"
 
 
 Line3DOverlay::Line3DOverlay() {

interface/src/ui/overlays/LocalModelsOverlay.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <GlowEffect.h>
+
 #include "Application.h"
 
 #include "LocalModelsOverlay.h"
-#include "renderer/GlowEffect.h"
 
 LocalModelsOverlay::LocalModelsOverlay(EntityTreeRenderer* entityTreeRenderer) :
     Volume3DOverlay(),

interface/src/ui/overlays/LocalVoxelsOverlay.cpp

@@ -15,10 +15,10 @@
 #include <QGLWidget>
 #include <QScriptValue>
 
-#include <Application.h>
+#include <GlowEffect.h>
 
+#include "Application.h"
 #include "LocalVoxelsOverlay.h"
-#include "renderer/GlowEffect.h"
 #include "voxels/VoxelSystem.h"
 
 QMap<QString, WeakVoxelSystemPointer> LocalVoxelsOverlay::_voxelSystemMap;

interface/src/ui/overlays/ModelOverlay.cpp

@@ -8,10 +8,12 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
+
+#include <GlowEffect.h>
+
 #include "../../Menu.h"
 
 #include "ModelOverlay.h"
-#include "renderer/GlowEffect.h"
 
 ModelOverlay::ModelOverlay()
     : _model(),

interface/src/ui/overlays/Rectangle3DOverlay.cpp

@@ -12,10 +12,11 @@
 #include "InterfaceConfig.h"
 
 #include <QGLWidget>
+
+#include <GlowEffect.h>
 #include <SharedUtil.h>
 
 #include "Rectangle3DOverlay.h"
-#include "renderer/GlowEffect.h"
 
 Rectangle3DOverlay::Rectangle3DOverlay() {
 }

interface/src/ui/overlays/Sphere3DOverlay.cpp

@@ -12,11 +12,12 @@
 #include "InterfaceConfig.h"
 
 #include <QGLWidget>
+
+#include <GlowEffect.h>
 #include <SharedUtil.h>
 
 #include "Sphere3DOverlay.h"
 #include "Application.h"
-#include "renderer/GlowEffect.h"
 
 Sphere3DOverlay::Sphere3DOverlay() {
 }

interface/src/voxels/VoxelFade.cpp

@@ -11,11 +11,11 @@
 
 #include "InterfaceConfig.h"
 
+#include <GlowEffect.h>
 #include <VoxelConstants.h>
 
 #include "Application.h"
 #include "VoxelFade.h"
-#include "renderer/GlowEffect.h"
 
 const float VoxelFade::FADE_OUT_START =  0.5f;
 const float VoxelFade::FADE_OUT_END   =  0.05f;

libraries/render-utils/src/GlowEffect.cpp

@@ -12,16 +12,18 @@
 // include this before QOpenGLFramebufferObject, which includes an earlier version of OpenGL
 #include <gpu/GPUConfig.h>
 
+#include <QGLWidget>
 #include <QOpenGLFramebufferObject>
 #include <QWindow>
 
 #include <PathUtils.h>
 #include <PerfStat.h>
-#include <ProgramObject.h>
-#include <RenderUtil.h>
-#include <TextureCache.h>
 
 #include "GlowEffect.h"
+#include "ProgramObject.h"
+#include "RenderUtil.h"
+#include "TextureCache.h"
+
 
 GlowEffect::GlowEffect()
     : _initialized(false),

libraries/render-utils/src/GlowEffect.h

@@ -13,6 +13,7 @@
 #define hifi_GlowEffect_h
 
 #include <QObject>
+#include <QGLWidget>
 #include <QStack>
 
 #include <DependencyManager.h>