move TextRender to libraries/render-utils

interface/src/Application.cpp

@@ -73,6 +73,7 @@
 #include <ProgramObject.h>
 #include <ResourceCache.h>
 #include <SoundCache.h>
+#include <TextRenderer.h>
 #include <UserActivityLogger.h>
 #include <UUID.h>
 
@@ -109,7 +110,6 @@
 #include "ui/InfoView.h"
 #include "ui/Snapshot.h"
 #include "ui/Stats.h"
-#include "ui/TextRenderer.h"
 
 
 

interface/src/Util.cpp

@@ -19,12 +19,12 @@
 #include <glm/gtx/quaternion.hpp>
 #include <glm/detail/func_common.hpp>
 
-#include <SharedUtil.h>
-
 #include <QThread>
 
+#include <SharedUtil.h>
+#include <TextRenderer.h>
+
 #include "InterfaceConfig.h"
-#include "ui/TextRenderer.h"
 #include "VoxelConstants.h"
 #include "world.h"
 #include "Application.h"

interface/src/avatar/Avatar.cpp

@@ -30,6 +30,7 @@
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <SharedUtil.h>
+#include <TextRenderer.h>
 #include <TextureCache.h>
 
 #include "Application.h"
@@ -42,7 +43,6 @@
 #include "Recorder.h"
 #include "world.h"
 #include "devices/OculusManager.h"
-#include "ui/TextRenderer.h"
 
 using namespace std;
 

interface/src/avatar/MyAvatar.cpp

@@ -30,6 +30,7 @@
 #include <PerfStat.h>
 #include <ShapeCollider.h>
 #include <SharedUtil.h>
+#include <TextRenderer.h>
 
 #include "Application.h"
 #include "Audio.h"
@@ -41,7 +42,6 @@
 #include "Recorder.h"
 #include "devices/Faceshift.h"
 #include "devices/OculusManager.h"
-#include "ui/TextRenderer.h"
 
 using namespace std;
 

interface/src/devices/PrioVR.cpp

@@ -14,11 +14,11 @@
 
 #include <FBXReader.h>
 #include <PerfStat.h>
+#include <TextRenderer.h>
 
 #include "Application.h"
 #include "PrioVR.h"
 #include "scripting/JoystickScriptingInterface.h"
-#include "ui/TextRenderer.h"
 
 #ifdef HAVE_PRIOVR
 const unsigned int SERIAL_LIST[] = { 0x00000001, 0x00000000, 0x00000008, 0x00000009, 0x0000000A,

interface/src/entities/RenderableTextEntityItem.cpp

@@ -13,9 +13,9 @@
 
 #include <gpu/GPUConfig.h>
 #include <PerfStat.h>
+#include <TextRenderer.h>
 
 #include "RenderableTextEntityItem.h"
-#include "ui/TextRenderer.h"
 
 const int FIXED_FONT_POINT_SIZE = 40;
 const float LINE_SCALE_RATIO = 1.2f;

interface/src/ui/BandwidthMeter.h

@@ -16,7 +16,7 @@
 
 #include <glm/glm.hpp>
 
-#include "ui/TextRenderer.h"
+#include <TextRenderer.h>
 
 
 class BandwidthMeter {

interface/src/ui/overlays/Text3DOverlay.cpp

@@ -11,9 +11,10 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"
 
+#include <TextRenderer.h>
+
 #include "Application.h"
 #include "Text3DOverlay.h"
-#include "ui/TextRenderer.h"
 
 const xColor DEFAULT_BACKGROUND_COLOR = { 0, 0, 0 };
 const float DEFAULT_BACKGROUND_ALPHA = 0.7f;

interface/src/ui/overlays/TextOverlay.cpp

@@ -13,9 +13,9 @@
 
 #include <QGLWidget>
 #include <SharedUtil.h>
+#include <TextRenderer.h>
 
 #include "TextOverlay.h"
-#include "ui/TextRenderer.h"
 
 TextOverlay::TextOverlay() :
     _backgroundColor(DEFAULT_BACKGROUND_COLOR),

libraries/render-utils/src/TextRenderer.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <gpu/GPUConfig.h>
+
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QFont>
@@ -18,7 +20,6 @@
 #include <QStringList>
 #include <QWindow>
 
-#include "InterfaceConfig.h"
 #include "TextRenderer.h"
 
 #include "glm/glm.hpp"

libraries/render-utils/src/TextRenderer.h

@@ -12,6 +12,8 @@
 #ifndef hifi_TextRenderer_h
 #define hifi_TextRenderer_h
 
+#include <gpu/GPUConfig.h>
+
 #include <QColor>
 #include <QFont>
 #include <QFontMetrics>
@@ -19,11 +21,10 @@
 #include <QImage>
 #include <QVector>
 
-#include "gpu/Resource.h"
+#include <gpu/Resource.h>
-#include "gpu/Stream.h"
+#include <gpu/Stream.h>
 
 
-#include "InterfaceConfig.h"
 
 // a special "character" that renders as a solid block
 const char SOLID_BLOCK_CHAR = 127;